commit - 8f97f26169a01f296bafca1867dbc1bb677981a7
commit + 3b8ef1a831c223c2baf34c97f4d4e396bb86bd4a
blob - 1d149da47dfe02d86a6f79ad3a35afb3c4a78a15
blob + e750f2fd9ab0916ec8f1fc2a475b912b12e1ae21
--- lib/diff.c
+++ lib/diff.c
args.diff_context = 3;
flags |= D_PROTOTYPE;
- fprintf(outfile, "blob %s ---\n", idstr1);
- fprintf(outfile, "blob %s +++\n", idstr2);
+ fprintf(outfile, "blob - %s\n", idstr1);
+ fprintf(outfile, "blob + %s\n", idstr2);
err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
done:
blob - 42f3d85f687865f7cea49e4a636120c3c1e43b25
blob + 7d27483bd79f843397f7c9f77dc6b621a614ce4c
--- regress/repository/repository_test.c
+++ regress/repository/repository_test.c
size_t len;
const char delim[3] = {'\0', '\0', '\0'};
const char *expected_output[] = {
- "blob 141f5fdc96126c1f4195558560a3c915e3d9b4c3 ---",
- "blob de7eb21b21c7823a753261aadf7cba35c9580fbf +++",
- "--- regress/repository_test/Makefile",
- "+++ regress/repository_test/Makefile",
+ "blob - 141f5fdc96126c1f4195558560a3c915e3d9b4c3",
+ "blob + de7eb21b21c7823a753261aadf7cba35c9580fbf",
+ "--- 141f5fdc96126c1f4195558560a3c915e3d9b4c3",
+ "+++ de7eb21b21c7823a753261aadf7cba35c9580fbf",
"@@ -1,10 +1,10 @@",
" .PATH:${.CURDIR}/../../lib",
" ",
strcmp(line, expected_output[i]) != 0) {
test_printf("diff output mismatch; expected: '%s'\n",
expected_output[i]);
+ return 0;
}
i++;
}