diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-29 18:32:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-01 13:26:05 -0700 |
| commit | 20314271679e169f324c118c69c8d9e0399feec9 (patch) | |
| tree | 768123d50c0cd78bfaf9eaa743e5ed557cade82c /t | |
| parent | a44c4267090366c81303b964ab64f3d51b78f885 (diff) | |
| download | git-20314271679e169f324c118c69c8d9e0399feec9.tar.gz git-20314271679e169f324c118c69c8d9e0399feec9.tar.xz | |
git add: respect core.filemode with unmerged entries
When a merge left unmerged entries, git add failed to pick up the
file mode from the index, when core.filemode == 0. If more than one
unmerged entry is there, the order of stage preference is 2, 1, 3.
Noticed by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3700-add.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index ad8cc7d4a..0d80c6aea 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -110,4 +110,30 @@ 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 && + for s in 1 2 3 + do + echo "100755 $(git hash-object -w stage$s) $s file" + done | git update-index --index-info && + git config core.filemode 0 && + echo new > file && + git add file && + git ls-files --stage | grep "^100755 .* 0 file$" +' + +test_expect_success 'git add and filemode=0 prefers stage 2 over stage 1' ' + git rm --cached -f file && + ( + echo "100644 $(git hash-object -w stage1) 1 file" + echo "100755 $(git hash-object -w stage2) 2 file" + ) | git update-index --index-info && + git config core.filemode 0 && + echo new > file && + git add file && + git ls-files --stage | grep "^100755 .* 0 file$" +' + test_done |