diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 17:52:58 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 17:52:58 (GMT) |
commit | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch) | |
tree | 0091b831de88064187f0ddfd637b8ff93883eded /t/t7011-skip-worktree-reading.sh | |
parent | 6c252ef79e314eef8fca862cca8a63329fa7591c (diff) | |
parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff) | |
download | git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.zip git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.gz git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.bz2 |
Merge branch 'jc/fix-diff-files-unmerged'
* jc/fix-diff-files-unmerged:
diff-files: show unmerged entries correctly
diff: remove often unused parameters from diff_unmerge()
diff.c: return filepair from diff_unmerge()
test: use $_z40 from test-lib
Diffstat (limited to 't/t7011-skip-worktree-reading.sh')
-rwxr-xr-x | t/t7011-skip-worktree-reading.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index bb4066f..8f3b54d 100755 --- a/t/t7011-skip-worktree-reading.sh +++ b/t/t7011-skip-worktree-reading.sh @@ -24,7 +24,7 @@ H sub/2 EOF NULL_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 -ZERO_SHA0=0000000000000000000000000000000000000000 + setup_absent() { test -f 1 && rm 1 git update-index --remove 1 && @@ -120,7 +120,7 @@ test_expect_success 'grep with skip-worktree file' ' test "$(git grep --no-ext-grep test)" = "1:test" ' -echo ":000000 100644 $ZERO_SHA0 $NULL_SHA1 A 1" > expected +echo ":000000 100644 $_z40 $NULL_SHA1 A 1" > expected test_expect_success 'diff-index does not examine skip-worktree absent entries' ' setup_absent && git diff-index HEAD -- 1 > result && |