summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-26 16:21:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-26 16:21:08 -0700
commit304d058370a9a797c38ec739c6d39fa45d9ed8e5 (patch)
tree36488ea65db3ef57e6be9cb87c89283362fbc878 /git-add--interactive.perl
parentb8492539f9c078162ee3ae4987ceaa7e7f510c9b (diff)
parent9fe7a643fcc56ca1c17afec5d5f8adca10cabdd1 (diff)
downloadgit-304d058370a9a797c38ec739c6d39fa45d9ed8e5.tar.gz
Merge branch 'maint'
* maint: add -p: warn if only binary changes present git-archive: work in bare repos git-svn: change dashed git-config to git config
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index da768ee7ac..b0223c3419 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -811,11 +811,16 @@ EOF
}
sub patch_update_cmd {
- my @mods = grep { !($_->{BINARY}) } list_modified('file-only');
+ my @all_mods = list_modified('file-only');
+ my @mods = grep { !($_->{BINARY}) } @all_mods;
my @them;
if (!@mods) {
- print STDERR "No changes.\n";
+ if (@all_mods) {
+ print STDERR "Only binary files changed.\n";
+ } else {
+ print STDERR "No changes.\n";
+ }
return 0;
}
if ($patch_mode) {