mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 15:56:09 +02:00
Code

update-index: add test for chmod flags 

Currently there is no test checking the expected behaviour when multiple
chmod flags with different arguments are passed.  As argument handling
is not in line with other git commands it's easy to miss and
accidentally change the current behaviour.

While there, fix the argument type of chmod_path, which takes an int,
but had a char passed in.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Gummerer 2016-09-14 22:07:45 +01:00 committed by Junio C Hamano
parent 840529d52c
commit 22433ce461
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/update-index.c
View File

@ -419,7 +419,7 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
return 0;
}
static void chmod_path(int flip, const char *path)
static void chmod_path(char flip, const char *path)
{
int pos;
struct cache_entry *ce;

13
t/t2107-update-index-basic.sh
View File

@ -80,4 +80,17 @@ test_expect_success '.lock files cleaned up' '
)
'
test_expect_success '--chmod=+x and chmod=-x in the same argument list' '
>A &&
>B &&
git add A B &&
git update-index --chmod=+x A --chmod=-x B &&
cat >expect <<-\EOF &&
100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 A
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 B
EOF
git ls-files --stage A B >actual &&
test_cmp expect actual
'
test_done