You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
291 lines
7.7 KiB
291 lines
7.7 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2006 Carl D. Worth |
|
# |
|
|
|
test_description='Test of git add, including the -- option.' |
|
|
|
. ./test-lib.sh |
|
|
|
test_expect_success \ |
|
'Test of git add' \ |
|
'touch foo && git add foo' |
|
|
|
test_expect_success \ |
|
'Post-check that foo is in the index' \ |
|
'git ls-files foo | grep foo' |
|
|
|
test_expect_success \ |
|
'Test that "git add -- -q" works' \ |
|
'touch -- -q && git add -- -q' |
|
|
|
test_expect_success \ |
|
'git add: Test that executable bit is not used if core.filemode=0' \ |
|
'git config core.filemode 0 && |
|
echo foo >xfoo1 && |
|
chmod 755 xfoo1 && |
|
git add xfoo1 && |
|
case "`git ls-files --stage xfoo1`" in |
|
100644" "*xfoo1) echo pass;; |
|
*) echo fail; git ls-files --stage xfoo1; (exit 1);; |
|
esac' |
|
|
|
test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by symlink' ' |
|
rm -f xfoo1 && |
|
ln -s foo xfoo1 && |
|
git add xfoo1 && |
|
case "`git ls-files --stage xfoo1`" in |
|
120000" "*xfoo1) echo pass;; |
|
*) echo fail; git ls-files --stage xfoo1; (exit 1);; |
|
esac |
|
' |
|
|
|
test_expect_success \ |
|
'git update-index --add: Test that executable bit is not used...' \ |
|
'git config core.filemode 0 && |
|
echo foo >xfoo2 && |
|
chmod 755 xfoo2 && |
|
git update-index --add xfoo2 && |
|
case "`git ls-files --stage xfoo2`" in |
|
100644" "*xfoo2) echo pass;; |
|
*) echo fail; git ls-files --stage xfoo2; (exit 1);; |
|
esac' |
|
|
|
test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by symlink' ' |
|
rm -f xfoo2 && |
|
ln -s foo xfoo2 && |
|
git update-index --add xfoo2 && |
|
case "`git ls-files --stage xfoo2`" in |
|
120000" "*xfoo2) echo pass;; |
|
*) echo fail; git ls-files --stage xfoo2; (exit 1);; |
|
esac |
|
' |
|
|
|
test_expect_success SYMLINKS \ |
|
'git update-index --add: Test that executable bit is not used...' \ |
|
'git config core.filemode 0 && |
|
ln -s xfoo2 xfoo3 && |
|
git update-index --add xfoo3 && |
|
case "`git ls-files --stage xfoo3`" in |
|
120000" "*xfoo3) echo pass;; |
|
*) echo fail; git ls-files --stage xfoo3; (exit 1);; |
|
esac' |
|
|
|
test_expect_success '.gitignore test setup' ' |
|
echo "*.ig" >.gitignore && |
|
mkdir c.if d.ig && |
|
>a.ig && >b.if && |
|
>c.if/c.if && >c.if/c.ig && |
|
>d.ig/d.if && >d.ig/d.ig |
|
' |
|
|
|
test_expect_success '.gitignore is honored' ' |
|
git add . && |
|
! (git ls-files | grep "\\.ig") |
|
' |
|
|
|
test_expect_success 'error out when attempting to add ignored ones without -f' ' |
|
test_must_fail git add a.?? && |
|
! (git ls-files | grep "\\.ig") |
|
' |
|
|
|
test_expect_success 'error out when attempting to add ignored ones without -f' ' |
|
test_must_fail git add d.?? && |
|
! (git ls-files | grep "\\.ig") |
|
' |
|
|
|
test_expect_success 'add ignored ones with -f' ' |
|
git add -f a.?? && |
|
git ls-files --error-unmatch a.ig |
|
' |
|
|
|
test_expect_success 'add ignored ones with -f' ' |
|
git add -f d.??/* && |
|
git ls-files --error-unmatch d.ig/d.if d.ig/d.ig |
|
' |
|
|
|
test_expect_success 'add ignored ones with -f' ' |
|
rm -f .git/index && |
|
git add -f d.?? && |
|
git ls-files --error-unmatch d.ig/d.if d.ig/d.ig |
|
' |
|
|
|
test_expect_success '.gitignore with subdirectory' ' |
|
|
|
rm -f .git/index && |
|
mkdir -p sub/dir && |
|
echo "!dir/a.*" >sub/.gitignore && |
|
>sub/a.ig && |
|
>sub/dir/a.ig && |
|
git add sub/dir && |
|
git ls-files --error-unmatch sub/dir/a.ig && |
|
rm -f .git/index && |
|
( |
|
cd sub/dir && |
|
git add . |
|
) && |
|
git ls-files --error-unmatch sub/dir/a.ig |
|
' |
|
|
|
mkdir 1 1/2 1/3 |
|
touch 1/2/a 1/3/b 1/2/c |
|
test_expect_success 'check correct prefix detection' ' |
|
rm -f .git/index && |
|
git add 1/2/a 1/3/b 1/2/c |
|
' |
|
|
|
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 && |
|
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 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 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 && |
|
echo new > 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 --refresh' ' |
|
>foo && git add foo && git commit -a -m "commit all" && |
|
test -z "`git diff-index HEAD -- foo`" && |
|
git read-tree HEAD && |
|
case "`git diff-index HEAD -- foo`" in |
|
:100644" "*"M foo") echo pass;; |
|
*) echo fail; (exit 1);; |
|
esac && |
|
git add --refresh -- foo && |
|
test -z "`git diff-index HEAD -- foo`" |
|
' |
|
|
|
test_expect_success POSIXPERM 'git add should fail atomically upon an unreadable file' ' |
|
git reset --hard && |
|
date >foo1 && |
|
date >foo2 && |
|
chmod 0 foo2 && |
|
test_must_fail git add --verbose . && |
|
! ( git ls-files foo1 | grep foo1 ) |
|
' |
|
|
|
rm -f foo2 |
|
|
|
test_expect_success POSIXPERM 'git add --ignore-errors' ' |
|
git reset --hard && |
|
date >foo1 && |
|
date >foo2 && |
|
chmod 0 foo2 && |
|
test_must_fail git add --verbose --ignore-errors . && |
|
git ls-files foo1 | grep foo1 |
|
' |
|
|
|
rm -f foo2 |
|
|
|
test_expect_success POSIXPERM 'git add (add.ignore-errors)' ' |
|
git config add.ignore-errors 1 && |
|
git reset --hard && |
|
date >foo1 && |
|
date >foo2 && |
|
chmod 0 foo2 && |
|
test_must_fail git add --verbose . && |
|
git ls-files foo1 | grep foo1 |
|
' |
|
rm -f foo2 |
|
|
|
test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' ' |
|
git config add.ignore-errors 0 && |
|
git reset --hard && |
|
date >foo1 && |
|
date >foo2 && |
|
chmod 0 foo2 && |
|
test_must_fail git add --verbose . && |
|
! ( git ls-files foo1 | grep foo1 ) |
|
' |
|
rm -f foo2 |
|
|
|
test_expect_success POSIXPERM '--no-ignore-errors overrides config' ' |
|
git config add.ignore-errors 1 && |
|
git reset --hard && |
|
date >foo1 && |
|
date >foo2 && |
|
chmod 0 foo2 && |
|
test_must_fail git add --verbose --no-ignore-errors . && |
|
! ( git ls-files foo1 | grep foo1 ) && |
|
git config add.ignore-errors 0 |
|
' |
|
rm -f foo2 |
|
|
|
test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" ' |
|
git reset --hard && |
|
touch fo\[ou\]bar foobar && |
|
git add '\''fo\[ou\]bar'\'' && |
|
git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar && |
|
! ( git ls-files foobar | grep foobar ) |
|
' |
|
|
|
test_expect_success 'git add to resolve conflicts on otherwise ignored path' ' |
|
git reset --hard && |
|
H=$(git rev-parse :1/2/a) && |
|
( |
|
echo "100644 $H 1 track-this" |
|
echo "100644 $H 3 track-this" |
|
) | git update-index --index-info && |
|
echo track-this >>.gitignore && |
|
echo resolved >track-this && |
|
git add track-this |
|
' |
|
|
|
test_expect_success '"add non-existent" should fail' ' |
|
test_must_fail git add non-existent && |
|
! (git ls-files | grep "non-existent") |
|
' |
|
|
|
test_expect_success 'git add --dry-run of existing changed file' " |
|
echo new >>track-this && |
|
git add --dry-run track-this >actual 2>&1 && |
|
echo \"add 'track-this'\" | test_cmp - actual |
|
" |
|
|
|
test_expect_success 'git add --dry-run of non-existing file' " |
|
echo ignored-file >>.gitignore && |
|
test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 && |
|
echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual |
|
" |
|
|
|
cat >expect.err <<\EOF |
|
The following paths are ignored by one of your .gitignore files: |
|
ignored-file |
|
Use -f if you really want to add them. |
|
fatal: no files added |
|
EOF |
|
cat >expect.out <<\EOF |
|
add 'track-this' |
|
EOF |
|
|
|
test_expect_success 'git add --dry-run --ignore-missing of non-existing file' ' |
|
test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err && |
|
test_cmp expect.out actual.out && |
|
test_cmp expect.err actual.err |
|
' |
|
|
|
test_done
|
|
|