diff options
| author | Thomas Gummerer <t.gummerer@gmail.com> | 2016-09-14 22:07:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 12:13:54 -0700 |
| commit | 610d55af0f082f6b866dc858e144c03d8ed4424c (patch) | |
| tree | 00ddc8f01e22cd000590b00952eede317562fb7b /t/t3700-add.sh | |
| parent | d9d7096662122f6b82ad6e4c08397b75906da78d (diff) | |
| download | git-610d55af0f082f6b866dc858e144c03d8ed4424c.tar.gz git-610d55af0f082f6b866dc858e144c03d8ed4424c.tar.xz | |
add: modify already added files when --chmod is given
When the chmod option was added to git add, it was hooked up to the diff
machinery, meaning that it only works when the version in the index
differs from the version on disk.
As the option was supposed to mirror the chmod option in update-index,
which always changes the mode in the index, regardless of the status of
the file, make sure the option behaves the same way in git add.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3700-add.sh')
| -rwxr-xr-x | t/t3700-add.sh | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 2978cb9d6..0a962a60f 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -349,4 +349,54 @@ test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' ' test_mode_in_index 100755 foo2 ' +test_expect_success 'git add --chmod=[+-]x changes index with already added file' ' + echo foo >foo3 && + git add foo3 && + git add --chmod=+x foo3 && + test_mode_in_index 100755 foo3 && + echo foo >xfoo3 && + chmod 755 xfoo3 && + git add xfoo3 && + git add --chmod=-x xfoo3 && + test_mode_in_index 100644 xfoo3 +' + +test_expect_success 'file status is changed after git add --chmod=+x' ' + echo "AM foo4" >expected && + echo foo >foo4 && + git add foo4 && + git add --chmod=+x foo4 && + git status -s foo4 >actual && + test_cmp expected actual +' + +test_expect_success 'no file status change if no pathspec is given' ' + >foo5 && + >foo6 && + git add foo5 foo6 && + git add --chmod=+x && + test_mode_in_index 100644 foo5 && + test_mode_in_index 100644 foo6 +' + +test_expect_success 'no file status change if no pathspec is given in subdir' ' + mkdir sub && + ( + cd sub && + >sub-foo1 && + >sub-foo2 && + git add . && + git add --chmod=+x && + test_mode_in_index 100644 sub-foo1 && + test_mode_in_index 100644 sub-foo2 + ) +' + +test_expect_success 'all statuses changed in folder if . is given' ' + git add --chmod=+x . && + test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 && + git add --chmod=-x . && + test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0 +' + test_done |