# [PATCH] add -p: warn if only binary changes present 6 messages from 2008-10-24 to 2008-10-26. Participants: Thomas Rast, Jeff King, SZEDER Gábor. Thread: https://gitlist.dev/t/16037 ## Thomas Rast, 2008-10-24 21:48 Subject: [PATCH] add -p: warn if only binary changes present Message-ID: <1224884916-20369-1-git-send-email-trast@student.ethz.ch> URL: https://gitlist.dev/e/1224884916-20369-1-git-send-email-trast%40student.ethz.ch ``` Current 'git add -p' will say "No changes." if there are no changes to text files, which can be confusing if there _are_ changes to binary files. Add some code to distinguish the two cases, and give a different message in the latter one. Signed-off-by: Thomas Rast --- git-add--interactive.perl | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index da768ee..a560133 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 "No changes except to binary files.\n"; + } else { + print STDERR "No changes.\n"; + } return 0; } if ($patch_mode) { -- tg: (759ad19..) t/add-p-binary-warn (depends on: origin/master) ``` ## Jeff King, 2008-10-26 05:10 Subject: Re: [PATCH] add -p: warn if only binary changes present Message-ID: <20081026051013.GD21178@coredump.intra.peff.net> URL: https://gitlist.dev/e/20081026051013.GD21178%40coredump.intra.peff.net In-Reply-To: <1224884916-20369-1-git-send-email-trast@student.ethz.ch> ``` On Fri, Oct 24, 2008 at 11:48:36PM +0200, Thomas Rast wrote: > Current 'git add -p' will say "No changes." if there are no changes to > text files, which can be confusing if there _are_ changes to binary > files. Add some code to distinguish the two cases, and give a > different message in the latter one. Having just looked at this code (for potentially handling "git add -p" of new files), I think this change is sane. > + print STDERR "No changes except to binary files.\n"; This wording seems a little awkward to me, though. Maybe No changed text files. ? -Peff ``` ## Thomas Rast, 2008-10-26 10:28 Subject: Re: [PATCH] add -p: warn if only binary changes present Message-ID: <200810261128.14735.trast@student.ethz.ch> URL: https://gitlist.dev/e/200810261128.14735.trast%40student.ethz.ch In-Reply-To: <20081026051013.GD21178@coredump.intra.peff.net> ``` Jeff King wrote: > > + print STDERR "No changes except to binary files.\n"; > > This wording seems a little awkward to me, though. Maybe > > No changed text files. > > ? I tried to make a more precise statement. "No changed text files" also holds if no files at all were changed. A user can only infer that there _are_ binary changes if he knows that the message in the latter case would have been "No changes". That being said, it is somewhat awkward, I just couldn't come up with a better message with this meaning. I considered some other options, such as giving a hint to use git-add or running git-status for the user, but these would have been far more verbose. - Thomas -- Thomas Rast trast@{inf,student}.ethz.ch ``` ## SZEDER Gábor, 2008-10-26 10:40 Subject: Re: [PATCH] add -p: warn if only binary changes present Message-ID: <20081026104006.GA18969@neumann> URL: https://gitlist.dev/e/20081026104006.GA18969%40neumann In-Reply-To: <200810261128.14735.trast@student.ethz.ch> ``` On Sun, Oct 26, 2008 at 12:28:09PM +0200, Thomas Rast wrote: > Jeff King wrote: > > > + print STDERR "No changes except to binary files.\n"; > > No changed text files. > I tried to make a more precise statement. "No changed text files" > also holds if no files at all were changed. A user can only infer > that there _are_ binary changes if he knows that the message in the > latter case would have been "No changes". > > That being said, it is somewhat awkward, I just couldn't come up with > a better message with this meaning. What about Only binary files changed. or something of the sort? Gábor ``` ## Thomas Rast, 2008-10-26 19:37 Subject: [PATCH v2] add -p: warn if only binary changes present Message-ID: <1225049826-14941-1-git-send-email-trast@student.ethz.ch> URL: https://gitlist.dev/e/1225049826-14941-1-git-send-email-trast%40student.ethz.ch In-Reply-To: <20081026104006.GA18969@neumann> ``` Current 'git add -p' will say "No changes." if there are no changes to text files, which can be confusing if there _are_ changes to binary files. Add some code to distinguish the two cases, and give a different message in the latter one. Signed-off-by: Thomas Rast --- SZEDER Gábor wrote: > What about > > Only binary files changed. > > or something of the sort? Yes, why not. git-add--interactive.perl | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index da768ee..b0223c3 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) { -- tg: (759ad19..) t/add-p-binary-warn (depends on: origin/master) ``` ## Jeff King, 2008-10-26 19:38 Subject: Re: [PATCH v2] add -p: warn if only binary changes present Message-ID: <20081026193801.GA1105@coredump.intra.peff.net> URL: https://gitlist.dev/e/20081026193801.GA1105%40coredump.intra.peff.net In-Reply-To: <1225049826-14941-1-git-send-email-trast@student.ethz.ch> ``` On Sun, Oct 26, 2008 at 08:37:06PM +0100, Thomas Rast wrote: > > What about > > > > Only binary files changed. > > > > or something of the sort? > > Yes, why not. That is better, IMHO. -Peff ```