git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/6] diff: write prefix to the correct file

From
John Keeping <john@keeping.me.uk>
Date
Feb 7, 2013, 20:15 UTC
Message-ID
<c7a6fca9a3199f05281d01f9fddab18a37f28932.1360267849.git.john@keeping.me.uk>
In-Reply-To
<cover.1360267849.git.john@keeping.me.uk>

Write the prefix for an output line to the same file as the actual content.

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 diff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index 348f71b..bf95235 100644
--- a/diff.c
+++ b/diff.c
@@ -4485,7 +4485,7 @@ void diff_flush(struct diff_options *options)
 				struct strbuf *msg = NULL;
 				msg = options->output_prefix(options,
 					options->output_prefix_data);
-				fwrite(msg->buf, msg->len, 1, stdout);
+				fwrite(msg->buf, msg->len, 1, options->file);
 			}
 			putc(options->line_termination, options->file);
 			if (options->stat_sep) {
-- 
1.8.1.2
Previous: John KeepingNext: John Keeping
Message 4 of 9 in “Improve "git log --graph" output of merges”
  1. 0/6 Improve "git log --graph" output of mergesJohn Keeping, Feb 7, 2013
  2. 1/6 graph: output padding for merge subsequent parentsJohn Keeping, Feb 7, 2013
  3. John KeepingFeb 8, 2013
  4. 2/6 diff: write prefix to the correct fileJohn Keeping, Feb 7, 2013
  5. 3/6 diff.c: make constant string arguments constJohn Keeping, Feb 7, 2013
  6. 4/6 diff: add diff_line_prefix functionJohn Keeping, Feb 7, 2013
  7. 5/6 diff.c: use diff_line_prefix() where applicableJohn Keeping, Feb 7, 2013
  8. 6/6 combine-diff.c: teach combined diffs about line prefixJohn Keeping, Feb 7, 2013
  9. Junio C HamanoFeb 7, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.