diff options
| author | Nate Case <ncase@xes-inc.com> | 2009-03-18 17:00:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-19 02:09:35 (GMT) |
| commit | ec2956df592338ccd789428e9232fe6b709dc2be (patch) | |
| tree | d3be254797114881401526a8d28cf32766e029a7 | |
| parent | e986ceb05a118944d2638fba4cd09678c1afa6b3 (diff) | |
| download | git-ec2956df592338ccd789428e9232fe6b709dc2be.zip git-ec2956df592338ccd789428e9232fe6b709dc2be.tar.gz git-ec2956df592338ccd789428e9232fe6b709dc2be.tar.bz2 | |
format-patch: Respect --quiet option
Hide the patch filename output from 'git format-patch' when --quiet
is used. The man pages suggested that this should have already worked.
Signed-off-by: Nate Case <ncase@xes-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-log.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/builtin-log.c b/builtin-log.c index 8684fcd..8af55d2 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -573,7 +573,7 @@ static FILE *realstdout = NULL; static const char *output_directory = NULL; static int outdir_offset; -static int reopen_stdout(const char *oneline, int nr, int total) +static int reopen_stdout(const char *oneline, int nr, struct rev_info *rev) { char filename[PATH_MAX]; int len = 0; @@ -598,7 +598,9 @@ static int reopen_stdout(const char *oneline, int nr, int total) strcpy(filename + len, fmt_patch_suffix); } - fprintf(realstdout, "%s\n", filename + outdir_offset); + if (!DIFF_OPT_TST(&rev->diffopt, QUIET)) + fprintf(realstdout, "%s\n", filename + outdir_offset); + if (freopen(filename, "w", stdout) == NULL) return error("Cannot open patch file %s",filename); @@ -687,7 +689,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, die("Cover letter needs email format"); if (!use_stdout && reopen_stdout(numbered_files ? - NULL : "cover-letter", 0, rev->total)) + NULL : "cover-letter", 0, rev)) return; head_sha1 = sha1_to_hex(head->object.sha1); @@ -1106,7 +1108,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) } if (!use_stdout && reopen_stdout(numbered_files ? NULL : get_oneline_for_filename(commit, keep_subject), - rev.nr, rev.total)) + rev.nr, &rev)) die("Failed to create output files"); shown = log_tree_commit(&rev, commit); free(commit->buffer); |