diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:10 -0700 |
| commit | bb8f6de064a2b92febe06c5cbfcf98c686dce8a4 (patch) | |
| tree | 8fc741454bdeaa37b211ede730c58f72bc36e5c9 /t/t9300-fast-import.sh | |
| parent | Merge branch 'jk/diffcore-rename-duplicate' into maint (diff) | |
| parent | test_ln_s_add: refresh stat info of fake symbolic links (diff) | |
| download | tgif-bb8f6de064a2b92febe06c5cbfcf98c686dce8a4.tar.xz | |
Merge branch 'jc/diff-test-updates' into maint
Test clean-up.
* jc/diff-test-updates:
test_ln_s_add: refresh stat info of fake symbolic links
t4008: modernise style
t/diff-lib: check exact object names in compare_diff_raw
tests: do not borrow from COPYING and README from the real source
t4010: correct expected object names
t9300: correct expected object names
t4008: correct stale comments
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 37c2d633f0..c538e0a4e9 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -552,8 +552,8 @@ test_expect_success 'D: verify pack' ' ' cat >expect <<EOF -:000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh -:000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting +:000000 100755 0000000000000000000000000000000000000000 e74b7d465e52746be2b4bae983670711e6e66657 A newdir/exec.sh +:000000 100644 0000000000000000000000000000000000000000 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 A newdir/interesting EOF git diff-tree -M -r branch^ branch >actual test_expect_success \ |