kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sequencer: rename amend_author to author_to_rename 

The purpose of amend_author was to free() the malloc()'d string
obtained from get_author() while amending a commit. But we can
also use the variable to free() the author at our convenience.
Rename it to convey this meaning.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Rohit Ashiwal 2019-11-01 19:30:01 +05:30 committed by Junio C Hamano
parent cbd8db17ac
commit 0185c683c9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sequencer.c
View File

@ -1354,7 +1354,7 @@ static int try_to_commit(struct repository *r,
struct commit_extra_header *extra = NULL; struct commit_extra_header *extra = NULL;
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
struct strbuf commit_msg = STRBUF_INIT; struct strbuf commit_msg = STRBUF_INIT;
char *amend_author = NULL; char *author_to_free = NULL;
const char *hook_commit = NULL; const char *hook_commit = NULL;
enum commit_msg_cleanup_mode cleanup; enum commit_msg_cleanup_mode cleanup;
int res = 0; int res = 0;
@ -1375,7 +1375,7 @@ static int try_to_commit(struct repository *r,
strbuf_addstr(msg, orig_message); strbuf_addstr(msg, orig_message);
hook_commit = "HEAD"; hook_commit = "HEAD";
} }
author = amend_author = get_author(message); author = author_to_free = get_author(message);
unuse_commit_buffer(current_head, message); unuse_commit_buffer(current_head, message);
if (!author) { if (!author) {
res = error(_("unable to parse commit author")); res = error(_("unable to parse commit author"));
@ -1474,7 +1474,7 @@ out:
free_commit_extra_headers(extra); free_commit_extra_headers(extra);
strbuf_release(&err); strbuf_release(&err);
strbuf_release(&commit_msg); strbuf_release(&commit_msg);
free(amend_author); free(author_to_free);


return res; return res;
} }