From: Johannes Sixt <johannes.sixt@telecom.at>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: j.sixt@eudaptics.com, git@vger.kernel.org,
Johannes Sixt <johannes.sixt@telecom.at>
Subject: [PATCH] Test 'git add' for unmerged entries when core.symlinks=false.
Date: Mon, 2 Jul 2007 13:28:42 +0200 [thread overview]
Message-ID: <1183375722665-git-send-email-johannes.sixt@telecom.at> (raw)
In 20314271679e169f324c118c69c8d9e0399feec9 git add was fixed if unmerged
entries are in the index and core.filemode=false. core.symlinks=false is
a similar case, which touches the same code path. Here is a test that
makes sure that the symlink property in the index is preserved, too.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
t/t3700-add.sh | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 0d80c6a..e6466d7 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -110,30 +110,37 @@ test_expect_success 'check correct prefix detection' '
git add 1/2/a 1/3/b 1/2/c
'
-test_expect_success 'git add and filemode=0 with unmerged entries' '
- echo 1 > stage1 &&
- echo 2 > stage2 &&
- echo 3 > stage3 &&
+test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
for s in 1 2 3
do
+ echo $s > stage$s
echo "100755 $(git hash-object -w stage$s) $s file"
+ echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink"
done | git update-index --index-info &&
git config core.filemode 0 &&
+ git config core.symlinks 0 &&
echo new > file &&
- git add file &&
- git ls-files --stage | grep "^100755 .* 0 file$"
+ echo new > symlink &&
+ git add file symlink &&
+ git ls-files --stage | grep "^100755 .* 0 file$" &&
+ git ls-files --stage | grep "^120000 .* 0 symlink$"
'
-test_expect_success 'git add and filemode=0 prefers stage 2 over stage 1' '
- git rm --cached -f file &&
+test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
+ git rm --cached -f file symlink &&
(
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"
) | git update-index --index-info &&
git config core.filemode 0 &&
+ git config core.symlinks 0 &&
echo new > file &&
- git add file &&
- git ls-files --stage | grep "^100755 .* 0 file$"
+ echo new > symlink &&
+ git add file symlink &&
+ git ls-files --stage | grep "^100755 .* 0 file$" &&
+ git ls-files --stage | grep "^120000 .* 0 symlink$"
'
test_done
--
1.5.2.2.555.g24e57
reply other threads:[~2007-07-02 11:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1183375722665-git-send-email-johannes.sixt@telecom.at \
--to=johannes.sixt@telecom.at \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=j.sixt@eudaptics.com \
/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).