2006-02-22 00:33:49 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Carl D. Worth
|
|
|
|
#
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
test_description='Test of git add, including the -- option.'
|
2006-02-22 00:33:49 +01:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Test of git add' \
|
|
|
|
'touch foo && git add foo'
|
2006-02-22 00:33:49 +01:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'Post-check that foo is in the index' \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git ls-files foo | grep foo'
|
2006-02-22 00:33:49 +01:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'Test that "git add -- -q" works' \
|
|
|
|
'touch -- -q && git add -- -q'
|
2006-02-22 00:33:49 +01:00
|
|
|
|
2006-09-27 07:21:19 +02:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git add: Test that executable bit is not used if core.filemode=0' \
|
2007-01-29 01:16:53 +01:00
|
|
|
'git config core.filemode 0 &&
|
2006-09-27 07:21:19 +02:00
|
|
|
echo foo >xfoo1 &&
|
|
|
|
chmod 755 xfoo1 &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git add xfoo1 &&
|
|
|
|
case "`git ls-files --stage xfoo1`" in
|
2006-09-27 07:21:19 +02:00
|
|
|
100644" "*xfoo1) echo ok;;
|
2007-07-03 07:52:14 +02:00
|
|
|
*) echo fail; git ls-files --stage xfoo1; (exit 1);;
|
2006-09-27 07:21:19 +02:00
|
|
|
esac'
|
|
|
|
|
2009-03-04 22:38:24 +01:00
|
|
|
test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by symlink' '
|
2007-02-17 07:43:48 +01:00
|
|
|
rm -f xfoo1 &&
|
|
|
|
ln -s foo xfoo1 &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git add xfoo1 &&
|
|
|
|
case "`git ls-files --stage xfoo1`" in
|
2007-02-17 07:43:48 +01:00
|
|
|
120000" "*xfoo1) echo ok;;
|
2007-07-03 07:52:14 +02:00
|
|
|
*) echo fail; git ls-files --stage xfoo1; (exit 1);;
|
2007-02-17 07:43:48 +01:00
|
|
|
esac
|
|
|
|
'
|
|
|
|
|
2006-09-27 07:21:19 +02:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git update-index --add: Test that executable bit is not used...' \
|
2007-01-29 01:16:53 +01:00
|
|
|
'git config core.filemode 0 &&
|
2006-09-27 07:21:19 +02:00
|
|
|
echo foo >xfoo2 &&
|
|
|
|
chmod 755 xfoo2 &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git update-index --add xfoo2 &&
|
|
|
|
case "`git ls-files --stage xfoo2`" in
|
2006-09-27 07:21:19 +02:00
|
|
|
100644" "*xfoo2) echo ok;;
|
2007-07-03 07:52:14 +02:00
|
|
|
*) echo fail; git ls-files --stage xfoo2; (exit 1);;
|
2006-11-23 01:33:32 +01:00
|
|
|
esac'
|
|
|
|
|
2009-03-04 22:38:24 +01:00
|
|
|
test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by symlink' '
|
2007-02-17 07:43:48 +01:00
|
|
|
rm -f xfoo2 &&
|
|
|
|
ln -s foo xfoo2 &&
|
|
|
|
git update-index --add xfoo2 &&
|
2007-07-03 07:52:14 +02:00
|
|
|
case "`git ls-files --stage xfoo2`" in
|
2007-02-17 07:43:48 +01:00
|
|
|
120000" "*xfoo2) echo ok;;
|
2007-07-03 07:52:14 +02:00
|
|
|
*) echo fail; git ls-files --stage xfoo2; (exit 1);;
|
2007-02-17 07:43:48 +01:00
|
|
|
esac
|
|
|
|
'
|
|
|
|
|
2009-03-04 22:38:24 +01:00
|
|
|
test_expect_success SYMLINKS \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git update-index --add: Test that executable bit is not used...' \
|
2007-01-29 01:16:53 +01:00
|
|
|
'git config core.filemode 0 &&
|
2006-11-23 01:33:32 +01:00
|
|
|
ln -s xfoo2 xfoo3 &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git update-index --add xfoo3 &&
|
|
|
|
case "`git ls-files --stage xfoo3`" in
|
2006-11-23 01:33:32 +01:00
|
|
|
120000" "*xfoo3) echo ok;;
|
2007-07-03 07:52:14 +02:00
|
|
|
*) echo fail; git ls-files --stage xfoo3; (exit 1);;
|
2006-09-27 07:21:19 +02:00
|
|
|
esac'
|
|
|
|
|
2006-12-29 20:01:31 +01:00
|
|
|
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' '
|
2007-07-03 07:52:14 +02:00
|
|
|
git add . &&
|
2008-05-14 06:01:22 +02:00
|
|
|
! (git ls-files | grep "\\.ig")
|
2006-12-29 20:01:31 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'error out when attempting to add ignored ones without -f' '
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git add a.?? &&
|
2008-05-14 06:01:22 +02:00
|
|
|
! (git ls-files | grep "\\.ig")
|
2006-12-29 20:01:31 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'error out when attempting to add ignored ones without -f' '
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git add d.?? &&
|
2008-05-14 06:01:22 +02:00
|
|
|
! (git ls-files | grep "\\.ig")
|
2006-12-29 20:01:31 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'add ignored ones with -f' '
|
2007-07-03 07:52:14 +02:00
|
|
|
git add -f a.?? &&
|
|
|
|
git ls-files --error-unmatch a.ig
|
2006-12-29 20:01:31 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'add ignored ones with -f' '
|
2007-07-03 07:52:14 +02:00
|
|
|
git add -f d.??/* &&
|
|
|
|
git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
|
2006-12-29 20:01:31 +01:00
|
|
|
'
|
|
|
|
|
2007-11-16 10:15:41 +01:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2007-04-23 10:21:25 +02:00
|
|
|
mkdir 1 1/2 1/3
|
|
|
|
touch 1/2/a 1/3/b 1/2/c
|
|
|
|
test_expect_success 'check correct prefix detection' '
|
2007-11-16 10:15:41 +01:00
|
|
|
rm -f .git/index &&
|
2007-04-23 10:21:25 +02:00
|
|
|
git add 1/2/a 1/3/b 1/2/c
|
|
|
|
'
|
|
|
|
|
2007-07-02 13:28:42 +02:00
|
|
|
test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
|
2007-06-29 19:32:46 +02:00
|
|
|
for s in 1 2 3
|
|
|
|
do
|
2007-07-02 13:28:42 +02:00
|
|
|
echo $s > stage$s
|
2007-06-29 19:32:46 +02:00
|
|
|
echo "100755 $(git hash-object -w stage$s) $s file"
|
2007-07-02 13:28:42 +02:00
|
|
|
echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink"
|
2007-06-29 19:32:46 +02:00
|
|
|
done | git update-index --index-info &&
|
|
|
|
git config core.filemode 0 &&
|
2007-07-02 13:28:42 +02:00
|
|
|
git config core.symlinks 0 &&
|
2007-06-29 19:32:46 +02:00
|
|
|
echo new > file &&
|
2007-07-02 13:28:42 +02:00
|
|
|
echo new > symlink &&
|
|
|
|
git add file symlink &&
|
|
|
|
git ls-files --stage | grep "^100755 .* 0 file$" &&
|
|
|
|
git ls-files --stage | grep "^120000 .* 0 symlink$"
|
2007-06-29 19:32:46 +02:00
|
|
|
'
|
|
|
|
|
2007-07-02 13:28:42 +02:00
|
|
|
test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
|
|
|
|
git rm --cached -f file symlink &&
|
2007-06-29 19:32:46 +02:00
|
|
|
(
|
|
|
|
echo "100644 $(git hash-object -w stage1) 1 file"
|
|
|
|
echo "100755 $(git hash-object -w stage2) 2 file"
|
2007-08-03 23:31:47 +02:00
|
|
|
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"
|
2007-06-29 19:32:46 +02:00
|
|
|
) | git update-index --index-info &&
|
|
|
|
git config core.filemode 0 &&
|
2007-07-02 13:28:42 +02:00
|
|
|
git config core.symlinks 0 &&
|
2007-06-29 19:32:46 +02:00
|
|
|
echo new > file &&
|
2007-07-02 13:28:42 +02:00
|
|
|
echo new > symlink &&
|
|
|
|
git add file symlink &&
|
|
|
|
git ls-files --stage | grep "^100755 .* 0 file$" &&
|
|
|
|
git ls-files --stage | grep "^120000 .* 0 symlink$"
|
2007-06-29 19:32:46 +02:00
|
|
|
'
|
|
|
|
|
2007-08-11 23:59:01 +02:00
|
|
|
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 ok;;
|
|
|
|
*) echo fail; (exit 1);;
|
|
|
|
esac &&
|
|
|
|
git add --refresh -- foo &&
|
|
|
|
test -z "`git diff-index HEAD -- foo`"
|
|
|
|
'
|
|
|
|
|
2009-03-13 22:55:27 +01:00
|
|
|
test_expect_success POSIXPERM 'git add should fail atomically upon an unreadable file' '
|
2008-05-12 19:58:48 +02:00
|
|
|
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
|
|
|
|
|
2009-03-13 22:55:27 +01:00
|
|
|
test_expect_success POSIXPERM 'git add --ignore-errors' '
|
2008-05-12 19:58:48 +02:00
|
|
|
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
|
|
|
|
|
2009-03-13 22:55:27 +01:00
|
|
|
test_expect_success POSIXPERM 'git add (add.ignore-errors)' '
|
2008-05-12 19:59:23 +02:00
|
|
|
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
|
|
|
|
|
2009-03-13 22:55:27 +01:00
|
|
|
test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' '
|
2008-05-12 19:59:23 +02:00
|
|
|
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 )
|
|
|
|
'
|
|
|
|
|
2009-03-13 23:00:15 +01:00
|
|
|
test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
|
2008-08-14 00:34:34 +02:00
|
|
|
git reset --hard &&
|
2008-08-15 09:32:30 +02:00
|
|
|
touch fo\[ou\]bar foobar &&
|
|
|
|
git add '\''fo\[ou\]bar'\'' &&
|
2008-09-30 10:03:55 +02:00
|
|
|
git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
|
2008-08-14 00:34:34 +02:00
|
|
|
! ( git ls-files foobar | grep foobar )
|
|
|
|
'
|
|
|
|
|
2006-02-22 00:33:49 +01:00
|
|
|
test_done
|