From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 2/6] t9300: correct expected object names
Date: Sun, 15 Feb 2015 15:43:40 -0800 [thread overview]
Message-ID: <1424043824-25242-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1424043824-25242-1-git-send-email-gitster@pobox.com>
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 | 4 ++--
1 file 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 \
--
2.3.0-266-g5b48884
next prev parent reply other threads:[~2015-02-15 23:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-15 23:43 [PATCH 0/6] test updates around diff Junio C Hamano
2015-02-15 23:43 ` [PATCH 1/6] t4008: correct stale comments Junio C Hamano
2015-02-15 23:43 ` Junio C Hamano [this message]
2015-02-15 23:43 ` [PATCH 3/6] t4010: correct expected object names Junio C Hamano
2015-02-15 23:43 ` [PATCH 4/6] tests: do not borrow from COPYING and README from the real source Junio C Hamano
2015-02-15 23:43 ` [PATCH 5/6] t/diff-lib: check exact object names in compare_diff_raw Junio C Hamano
2015-02-23 18:14 ` Johannes Sixt
2015-02-23 19:45 ` Junio C Hamano
2015-02-15 23:43 ` [PATCH 6/6] t4008: modernise style Junio C Hamano
2015-02-16 6:23 ` [PATCH 0/6] test updates around diff Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424043824-25242-3-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).