diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-15 21:35:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-15 23:38:09 (GMT) |
| commit | 2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74 (patch) | |
| tree | 88ab71859747aab36d6da8bd177bf49a0b6b1223 | |
| parent | f2b4f0a23b400f5760deb9251296d79eba83ab78 (diff) | |
| download | git-2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74.zip git-2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74.tar.gz git-2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74.tar.bz2 | |
t9300: correct expected object names
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>
| -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 27263df..e53def2 100755 --- 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 -: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 \ |