Re: bug in t3700-add.sh?
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · bug in t3700-add.sh? · Nguyen Thai Ngoc Duy <hidden>
- 2016-06-15 · Re: bug in t3700-add.sh? · Junio C Hamano <hidden>
"Nguyen Thai Ngoc Duy" [off-list ref] writes:
Running test 17, I got this output:
Gaah. Those $s seem completely bogus. This test only cares to see if the blob type is retained (it does "git add" to the path later to throw away the unmergedness and data at higher stage prepared by this step), so it really does not matter what is fed to hash-object. But it should be hashing a file whose contents is '1' and a symlink to '2'.
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index b52fde8..213e924 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh@@ -131,8 +131,8 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st ( echo "100644 $(git hash-object -w stage1) 1 file" echo "100755 $(git hash-object -w stage2) 2 file" - echo "100644 $(printf $s | git hash-object -w -t blob --stdin) 1 symlink" - echo "120000 $(printf $s | git hash-object -w -t blob --stdin) 2 symlink" + echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1 symlink" + echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2 symlink" ) | git update-index --index-info && git config core.filemode 0 && git config core.symlinks 0 &&