development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 10:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pv/maint-add-p-no-exclude' into maint

Browse source 
* pv/maint-add-p-no-exclude:
  git-add--interactive: never skip files included in index
This commit is contained in:
Junio C Hamano 2009-10-23 22:29:19 -07:00
parent 024ab976ff b145b211ba
commit 70ed433c2b
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-add--interactive.perl
View file

@ -259,7 +259,7 @@ sub list_modified {
@tracked = map {
chomp $_;
unquote_path($_);
} run_cmd_pipe(qw(git ls-files --exclude-standard --), @ARGV);
} run_cmd_pipe(qw(git ls-files --), @ARGV);
return if (!@tracked);
}

14
t/t3701-add-interactive.sh
View file

@ -138,6 +138,20 @@ test_expect_success 'real edit works' '
test_cmp expected output
'
test_expect_success 'skip files similarly as commit -a' '
git reset &&
echo file >.gitignore &&
echo changed >file &&
echo y | git add -p file &&
git diff >output &&
git reset &&
git commit -am commit &&
git diff >expected &&
test_cmp expected output &&
git reset --hard HEAD^
'
rm -f .gitignore
if test "$(git config --bool core.filemode)" = false
then
say 'skipping filemode tests (filesystem does not properly support modes)'