test

Author: jltobler

diff.c

@@ -3534,15 +3534,6 @@ static int set_diff_algorithm(struct diff_options *opts,
 	return 0;
 }
 
-static void report_binary_file(struct strbuf *buf,
-			       struct repository *repo,
-			       struct diff_filespec *spec,
-			       const char *path)
-{
-	const char *type = diff_filespec_is_binary(repo, spec) ? "binary" : "text";
-	strbuf_addf(buf, "%s: %s\n", path, type);
-}
-
 static void builtin_diff(const char *name_a,
 			 const char *name_b,
 			 struct diff_filespec *one,
@@ -3684,10 +3675,6 @@ static void builtin_diff(const char *name_a,
 					 header.buf, header.len, 0);
 			strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
 				    diff_line_prefix(o), lbl[0], lbl[1]);
-			if (o->report_binary_files) {
-				report_binary_file(&sb, o->repo, one, lbl[0]);
-				report_binary_file(&sb, o->repo, two, lbl[1]);
-			}
 			emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
 					 sb.buf, sb.len, 0);
 			strbuf_release(&sb);
@@ -3712,10 +3699,6 @@ static void builtin_diff(const char *name_a,
 		else {
 			strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
 				    diff_line_prefix(o), lbl[0], lbl[1]);
-			if (o->report_binary_files) {
-				report_binary_file(&sb, o->repo, one, lbl[0]);
-				report_binary_file(&sb, o->repo, two, lbl[1]);
-			}
 			emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
 					 sb.buf, sb.len, 0);
 			strbuf_release(&sb);
@@ -6124,6 +6107,13 @@ static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
 		fprintf(opt->file, "%s ",
 			diff_aligned_abbrev(&p->two->oid, opt->abbrev));
 	}
+
+	if (opt->report_binary_files) {
+		char one = diff_filespec_is_binary(opt->repo, p->one) ? 'B' : 'T';
+		char two = diff_filespec_is_binary(opt->repo, p->two) ? 'B' : 'T';
+		fprintf(opt->file, "%c%c ", one, two);
+	}
+
 	if (p->score) {
 		fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
 			inter_name_termination);