Merge branch 'jh/diff-index-line-abbrev'

diff --git a/diff.c b/diff.c
index c82b605a942b8611c3eaf0e41a173185fdb40779..b53b6ec8e2ced8c94c0353dddf07ca5c1dd79978 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2430,9 +2430,9 @@ static void fill_metainfo(struct strbuf *msg,
                            (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
                                abbrev = 40;
                }
-               strbuf_addf(msg, "%sindex %.*s..%.*s", set,
-                           abbrev, sha1_to_hex(one->sha1),
-                           abbrev, sha1_to_hex(two->sha1));
+               strbuf_addf(msg, "%sindex %s..", set,
+                           find_unique_abbrev(one->sha1, abbrev));
+               strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
                if (one->mode == two->mode)
                        strbuf_addf(msg, " %06o", one->mode);
                strbuf_addf(msg, "%s\n", reset);