]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/committer-date-is-author-date-fix-simplify'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Nov 2020 22:06:27 +0000 (14:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Nov 2020 22:06:28 +0000 (14:06 -0800)
Code simplification.

* jk/committer-date-is-author-date-fix-simplify:
  am, sequencer: stop parsing our own committer ident

1  2 
builtin/am.c
sequencer.c
sequencer.h

diff --cc builtin/am.c
index b727449aedac55a683960efb9919656226d92a77,b1f45eb768325f9ff82efc306a990effd488ed3f..f22c73a05b0472dcf5ee1002282bd9f0c067b53b
@@@ -173,10 -161,8 +161,8 @@@ static void am_state_release(struct am_
        free(state->author_name);
        free(state->author_email);
        free(state->author_date);
-       free(state->committer_name);
-       free(state->committer_email);
        free(state->msg);
 -      argv_array_clear(&state->git_apply_opts);
 +      strvec_clear(&state->git_apply_opts);
  }
  
  /**
diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge