Commit Diff

Commit:
8f97f26169a01f296bafca1867dbc1bb677981a7
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
show blob IDs in diffs again and make repository test pass
Actions:
Patch | Tree
commit - f6861a8122f025e3ba8dd3c13215c27b6bf184cb
commit + 8f97f26169a01f296bafca1867dbc1bb677981a7
blob - 58ae938182c6e017b5c50f1ae0d48099de6c9801
blob + 1d149da47dfe02d86a6f79ad3a35afb3c4a78a15
--- lib/diff.c
+++ lib/diff.c
@@ -101,6 +101,9 @@ diff_blobs(struct got_blob_object *blob1, struct got_b
 	args.diff_context = 3;
 	flags |= D_PROTOTYPE;
 
+	fprintf(outfile, "blob %s ---\n", idstr1);
+	fprintf(outfile, "blob %s +++\n", idstr2);
+
 	err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
 done:
 	if (f1)
blob - ed18000f24cef20a98c96ca53a1bfe44692860ed
blob + 42f3d85f687865f7cea49e4a636120c3c1e43b25
--- regress/repository/repository_test.c
+++ regress/repository/repository_test.c
@@ -312,8 +312,10 @@ repo_diff_blob(const char *repo_path)
 	size_t len;
 	const char delim[3] = {'\0', '\0', '\0'};
 	const char *expected_output[] = {
-		"--- 141f5fdc96126c1f4195558560a3c915e3d9b4c3",
-		"+++ de7eb21b21c7823a753261aadf7cba35c9580fbf",
+		"blob 141f5fdc96126c1f4195558560a3c915e3d9b4c3 ---",
+		"blob de7eb21b21c7823a753261aadf7cba35c9580fbf +++",
+		"--- regress/repository_test/Makefile",
+		"+++ regress/repository_test/Makefile",
 		"@@ -1,10 +1,10 @@",
 		" .PATH:${.CURDIR}/../../lib",
 		" ",