summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-17 18:15:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-17 18:15:20 (GMT)
commitc1fa3e21bc3223a7b18616a374cecff70721d157 (patch)
tree3019dece133c6da34e76326ddc43f2370f8da763
parent9f55a77777a43880882bad43daa8eac076ad9c48 (diff)
parenta9c4641df7989c9adf6af471705ebf735c35a92f (diff)
downloadgit-c1fa3e21bc3223a7b18616a374cecff70721d157.zip
git-c1fa3e21bc3223a7b18616a374cecff70721d157.tar.gz
git-c1fa3e21bc3223a7b18616a374cecff70721d157.tar.bz2
Merge branch 'ak/add-i-empty-candidates'
The interactive "show a list and let the user choose from it" interface "add -i" used showed and prompted to the user even when the candidate list was empty, against which the only "choice" the user could have made was to choose nothing. * ak/add-i-empty-candidates: add -i: return from list_and_choose if there is no candidate
-rwxr-xr-xgit-add--interactive.perl5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index c725674..77876d4 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -515,6 +515,9 @@ sub error_msg {
sub list_and_choose {
my ($opts, @stuff) = @_;
my (@chosen, @return);
+ if (!@stuff) {
+ return @return;
+ }
my $i;
my @prefixes = find_unique_prefixes(@stuff) unless $opts->{LIST_ONLY};
@@ -725,6 +728,8 @@ sub add_untracked_cmd {
if (@add) {
system(qw(git update-index --add --), @add);
say_n_paths('added', @add);
+ } else {
+ print "No untracked files.\n";
}
print "\n";
}