Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t9300: correct expected object names
author
Junio C Hamano
<gitster@pobox.com>
Sun, 15 Feb 2015 21:35:19 +0000
(13:35 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 15 Feb 2015 23:38:09 +0000
(15:38 -0800)
The output the test #36 expects is bogus. There are no blob objects
whose names are 36a590... or
046d037
... when this test was run.
It was left unnoticed only because compare_diff_raw, which only
cares about the add/delete/rename/copy was used to check the result.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9300-fast-import.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f2b4f0a
)
diff --git
a/t/t9300-fast-import.sh
b/t/t9300-fast-import.sh
index 27263dfb80420a417bb0f33aa8731ef2fb7bc7b6..e53def226ab03e9d746899303da507d2d8b216ba 100755
(executable)
--- a/
t/t9300-fast-import.sh
+++ b/
t/t9300-fast-import.sh
@@
-582,8
+582,8
@@
test_expect_success 'D: verify pack' '
'
cat >expect <<EOF
'
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 \
EOF
git diff-tree -M -r branch^ branch >actual
test_expect_success \