diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:58 -0700 |
| commit | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch) | |
| tree | 0091b831de88064187f0ddfd637b8ff93883eded /t/t3600-rm.sh | |
| parent | 6c252ef79e314eef8fca862cca8a63329fa7591c (diff) | |
| parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff) | |
| download | git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.gz | |
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/t3600-rm.sh')
| -rwxr-xr-x | t/t3600-rm.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index cd093bd347..9fd28bcf34 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -240,11 +240,10 @@ test_expect_success 'refresh index before checking if it is up-to-date' ' test_expect_success 'choking "git rm" should not let it die with cruft' ' git reset -q --hard && - H=0000000000000000000000000000000000000000 && i=0 && while test $i -lt 12000 do - echo "100644 $H 0 some-file-$i" + echo "100644 $_z40 0 some-file-$i" i=$(( $i + 1 )) done | git update-index --index-info && git rm -n "some-file-*" | :; |