diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:56 -0700 |
commit | 18fd805583130862632e40e98aecc7edcd16d878 (patch) | |
tree | a72e49115b5c03f9291545f44af78394e9765198 /t/t4044-diff-index-unique-abbrev.sh | |
parent | Merge branch 'ab/maint-perl-use-instlibdir' (diff) | |
parent | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s (diff) | |
download | tgif-18fd805583130862632e40e98aecc7edcd16d878.tar.xz |
Merge branch 'jh/diff-index-line-abbrev'
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
Conflicts:
diff.c
Diffstat (limited to 't/t4044-diff-index-unique-abbrev.sh')
-rwxr-xr-x | t/t4044-diff-index-unique-abbrev.sh | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/t/t4044-diff-index-unique-abbrev.sh b/t/t4044-diff-index-unique-abbrev.sh new file mode 100755 index 0000000000..d5ce72be63 --- /dev/null +++ b/t/t4044-diff-index-unique-abbrev.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +test_description='test unique sha1 abbreviation on "index from..to" line' +. ./test-lib.sh + +cat >expect_initial <<EOF +100644 blob 51d2738463ea4ca66f8691c91e33ce64b7d41bb1 foo +EOF + +cat >expect_update <<EOF +100644 blob 51d2738efb4ad8a1e40bed839ab8e116f0a15e47 foo +EOF + +test_expect_success 'setup' ' + echo 4827 > foo && + git add foo && + git commit -m "initial" && + git cat-file -p HEAD: > actual && + test_cmp expect_initial actual && + echo 11742 > foo && + git commit -a -m "update" && + git cat-file -p HEAD: > actual && + test_cmp expect_update actual +' + +cat >expect <<EOF +index 51d27384..51d2738e 100644 +EOF + +test_expect_success 'diff does not produce ambiguous index line' ' + git diff HEAD^..HEAD | grep index > actual && + test_cmp expect actual +' + +test_done |