mirror of
https://github.com/git/git.git
synced 2025-01-24 16:34:18 +08:00
format-patch: use stdout directly
Earlier, we freopen()ed stdout in order to write patches to files. That forced us to duplicate stdout (naming it "realstdout") because we *still* wanted to be able to report the file names. As we do not abuse stdout that way anymore, we no longer need to duplicate stdout, either. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
95235f5ba1
commit
36a4d905c3
@ -805,7 +805,6 @@ static int git_format_config(const char *var, const char *value, void *cb)
|
||||
return git_log_config(var, value, cb);
|
||||
}
|
||||
|
||||
static FILE *realstdout = NULL;
|
||||
static const char *output_directory = NULL;
|
||||
static int outdir_offset;
|
||||
|
||||
@ -831,7 +830,7 @@ static int open_next_file(struct commit *commit, const char *subject,
|
||||
fmt_output_subject(&filename, subject, rev);
|
||||
|
||||
if (!quiet)
|
||||
fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
|
||||
printf("%s\n", filename.buf + outdir_offset);
|
||||
|
||||
if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL)
|
||||
return error(_("Cannot open patch file %s"), filename.buf);
|
||||
@ -1639,9 +1638,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
||||
get_patch_ids(&rev, &ids);
|
||||
}
|
||||
|
||||
if (!use_stdout)
|
||||
realstdout = xfdopen(xdup(1), "w");
|
||||
|
||||
if (prepare_revision_walk(&rev))
|
||||
die(_("revision walk setup failed"));
|
||||
rev.boundary = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user