diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
In the metainfo section of git diffs there's an "index" line providing abbreviated (unless --full-index is used) blob SHA1s from the pre-/post-images used to generate the diff. These provide hints that can be used to reconstruct a 3-way merge when applying the patch (see the --3way option to 'git am' for more details). In order for this to work, however, the blob SHA1s must not be abbreviated into ambiguity. This patch eliminates the possible ambiguity by using find_unique_abbrev() to produce the abbreviated SHA1s (instead of blind abbreviation by way of "%.*s"). A testcase verifying the fix is also included. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johan Herland committed
May 30, 2010 at 15:37 UTC
3e5a188f1d5b48dcc0bc73ad520925cdb846dfaf
2 files changed
+38
-3
diff.c
+3
-3
@@ -2419,9 +2419,9 @@ static void fill_metainfo(struct strbuf *msg,
2419
(!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2420
abbrev = 40;
2421
}
2422
- strbuf_addf(msg, "index %.*s..%.*s",
2423
- abbrev, sha1_to_hex(one->sha1),
2424
- abbrev, sha1_to_hex(two->sha1));
2422
+ strbuf_addf(msg, "index %s..",
2423
+ find_unique_abbrev(one->sha1, abbrev));
2424
+ strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
2425
if (one->mode == two->mode)
2426
strbuf_addf(msg, " %06o", one->mode);
2427
strbuf_addch(msg, '\n');
t/t4044-diff-index-unique-abbrev.sh
new
+35
@@ -0,0 +1,35 @@
1
+#!/bin/sh
2
+
3
+test_description='test unique sha1 abbreviation on "index from..to" line'
4
+. ./test-lib.sh
5
+
6
+cat >expect_initial <<EOF
7
+100644 blob 51d2738463ea4ca66f8691c91e33ce64b7d41bb1 foo
8
+EOF
9
+
10
+cat >expect_update <<EOF
11
+100644 blob 51d2738efb4ad8a1e40bed839ab8e116f0a15e47 foo
12
+EOF
13
+
14
+test_expect_success 'setup' '
15
+ echo 4827 > foo &&
16
+ git add foo &&
17
+ git commit -m "initial" &&
18
+ git cat-file -p HEAD: > actual &&
19
+ test_cmp expect_initial actual &&
20
+ echo 11742 > foo &&
21
+ git commit -a -m "update" &&
22
+ git cat-file -p HEAD: > actual &&
23
+ test_cmp expect_update actual
24
+'
25
+
26
+cat >expect <<EOF
27
+index 51d27384..51d2738e 100644
28
+EOF
29
+
30
+test_expect_success 'diff does not produce ambiguous index line' '
31
+ git diff HEAD^..HEAD | grep index > actual &&
32
+ test_cmp expect actual
33
+'
34
+
35
+test_done