diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:19 -0700 |
| commit | dce97d6ec73cdb1011589f7260e602a87088939b (patch) | |
| tree | d9bfb9d077afc3529dbc6867a3d018f9c8517b1a | |
| parent | c8386962d6590ec6f71f353bc5b1b573b1e71b16 (diff) | |
| parent | 76e368c3780810b02b91d07254762d10f20f5ed6 (diff) | |
| download | git-dce97d6ec73cdb1011589f7260e602a87088939b.tar.gz git-dce97d6ec73cdb1011589f7260e602a87088939b.tar.xz | |
Merge branch 'tg/add-chmod+x-fix' into maint
A hot-fix for a test added by a recent topic that went to both
'master' and 'maint' already.
* tg/add-chmod+x-fix:
t3700: fix broken test under !SANITY
| -rwxr-xr-x | t/t3700-add.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 924a26612..53c0cb6de 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -350,6 +350,7 @@ test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' ' ' test_expect_success 'git add --chmod=[+-]x changes index with already added file' ' + rm -f foo3 xfoo3 && echo foo >foo3 && git add foo3 && git add --chmod=+x foo3 && |