path: root/t/
diff options
authorJunio C Hamano <>2005-10-07 10:42:00 (GMT)
committerJunio C Hamano <>2005-10-07 10:42:00 (GMT)
commitec1fcc16af94810dd822c6da533f58fa2750f14a (patch)
tree9ae8cf918f53631f4c80516861803a58a67e7a2a /t/
parent8b73edf498adf2895af7ff9c750283cf9325a632 (diff)
Show original and resulting blob object info in diff output.
This adds more cruft to diff --git header to record the blob SHA1 and the mode the patch/diff is intended to be applied against, to help the receiving end fall back on a three-way merge. The new header looks like this: diff --git a/apply.c b/apply.c index 7be5041..8366082 100644 --- a/apply.c +++ b/apply.c @@ -14,6 +14,7 @@ // files that are being modified, but doesn't apply the patch // --stat does just a diffstat, and doesn't actually apply +// --show-index-info shows the old and new index info for... ... Upon receiving such a patch, if the patch did not apply cleanly to the target tree, the recipient can try to find the matching old objects in her object database and create a temporary tree, apply the patch to that temporary tree, and attempt a 3-way merge between the patched temporary tree and the target tree using the original temporary tree as the common ancestor. The patch lifts the code to compute the hash for an on-filesystem object from update-index.c and makes it available to the diff output routine. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 2 insertions, 1 deletions
diff --git a/t/ b/t/
index be47485..2e3c20d 100755
--- a/t/
+++ b/t/
@@ -7,6 +7,7 @@ test_description='Test rename detection in diff engine.
. ./
+. ../
echo >path0 'Line 1
Line 2
@@ -61,6 +62,6 @@ EOF
test_expect_success \
'validate the output.' \
- 'diff -I "similarity.*" >/dev/null current expected'
+ 'compare_diff_patch current expected'