mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: use strvec_pushf() for format-patch revisions

Browse Source 
In run_am(), a strbuf is used to create a revision argument that is then
added to the argument list for git format-patch using strvec_push().
Use strvec_pushf() to add it directly instead, simplifying the code
and plugging a small leak on the error code path.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2023-12-19 08:42:18 +01:00
committed by Junio C Hamano
parent 0d1bd1dfb3
commit 45184afb4d
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/rebase.c
View File

@ -606,7 +606,6 @@ static int run_am(struct rebase_options *opts)
{ {
struct child_process am = CHILD_PROCESS_INIT; struct child_process am = CHILD_PROCESS_INIT;
struct child_process format_patch = CHILD_PROCESS_INIT; struct child_process format_patch = CHILD_PROCESS_INIT;
struct strbuf revisions = STRBUF_INIT;
int status; int status;
char *rebased_patches; char *rebased_patches;
@ -639,13 +638,6 @@ static int run_am(struct rebase_options *opts)
return run_command(&am); return run_command(&am);
} }
strbuf_addf(&revisions, "%s...%s",
oid_to_hex(opts->root ?
/* this is now equivalent to !opts->upstream */
&opts->onto->object.oid :
&opts->upstream->object.oid),
oid_to_hex(&opts->orig_head->object.oid));
rebased_patches = xstrdup(git_path("rebased-patches")); rebased_patches = xstrdup(git_path("rebased-patches"));
format_patch.out = open(rebased_patches, format_patch.out = open(rebased_patches,
O_WRONLY | O_CREAT | O_TRUNC, 0666); O_WRONLY | O_CREAT | O_TRUNC, 0666);
@ -666,7 +658,12 @@ static int run_am(struct rebase_options *opts)
if (opts->git_format_patch_opt.len) if (opts->git_format_patch_opt.len)
strvec_split(&format_patch.args, strvec_split(&format_patch.args,
opts->git_format_patch_opt.buf); opts->git_format_patch_opt.buf);
strvec_push(&format_patch.args, revisions.buf); strvec_pushf(&format_patch.args, "%s...%s",
oid_to_hex(opts->root ?
/* this is now equivalent to !opts->upstream */
&opts->onto->object.oid :
&opts->upstream->object.oid),
oid_to_hex(&opts->orig_head->object.oid));
if (opts->restrict_revision) if (opts->restrict_revision)
strvec_pushf(&format_patch.args, "^%s", strvec_pushf(&format_patch.args, "^%s",
oid_to_hex(&opts->restrict_revision->object.oid)); oid_to_hex(&opts->restrict_revision->object.oid));
@ -689,10 +686,8 @@ static int run_am(struct rebase_options *opts)
"As a result, git cannot rebase them."), "As a result, git cannot rebase them."),
opts->revisions); opts->revisions);
strbuf_release(&revisions);
return status; return status;
} }
strbuf_release(&revisions);
am.in = open(rebased_patches, O_RDONLY); am.in = open(rebased_patches, O_RDONLY);
if (am.in < 0) { if (am.in < 0) {