Re: [PATCH] add -p: skip conflicted paths

From: Jeff King <peff@peff.net>
Date: Apr 4, 2012, 09:46 UTC
Message-ID: <20120404094618.GA13870@sigill.intra.peff.net>
In-Reply-To: <7v398mgfdu.fsf@alter.siamese.dyndns.org>

On Mon, Apr 02, 2012 at 11:25:33AM -0700, Junio C Hamano wrote:

Show 12 quoted lines

> >> I like that we are down to a single ls-files invocation here. But can't
> >> we determine from the diff-files output whether an entry is unmerged. In
> >> my simple tests, I see that --numstat will show two lines for such an
> >> entry. Is that reliable?
> >
> > Nice. I've observed the same thing (although I've seen three entries,
> > not two). I don't know about the reliability, but I think it kind of
> > makes sense; one entry for both parents, and one for the unmerged
> > working-copy version.
> 
> Should I be dissappointed, or should I be happy for seeing "division of
> labor" working?

The latter. I suspected something similar when writing my original message, but didn't think too hard about it. Thanks for clarifying.

I do still think it would be nicer to pass the information out to the caller instead of just filtering. So combining the two patches, we have something like:

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 2ee0908..0a83f56 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -292,7 +292,7 @@ sub get_empty_tree {
 # FILE_ADDDEL:	is it add/delete between index and file?
 
 sub list_modified {
-	my ($only) = @_;
+	my ($only, $note_unmerged) = @_;
 	my (%data, @return);
 	my ($add, $del, $adddel, $file);
 	my @tracked = ();
@@ -370,6 +370,18 @@ sub list_modified {
 		}
 	}
 
+	if ($note_unmerged) {
+		for (run_cmd_pipe(qw(git ls-files -u --), @ARGV)) {
+			chomp $_;
+			if (/^[0-7]+ [0-9a-f]{40} [0-3]	(.*)/) {
+				my $path = unquote_path($1);
+				if (exists($data{$path})) {
+					$data{$path}{UNMERGED} = 1;
+				}
+			}
+		}
+	}
+
 	for (sort keys %data) {
 		my $it = $data{$_};
 
@@ -1211,10 +1223,14 @@ sub apply_patch_for_checkout_commit {
 }
 
 sub patch_update_cmd {
-	my @all_mods = list_modified($patch_mode_flavour{FILTER});
+	my @all_mods = list_modified($patch_mode_flavour{FILTER}, 'note-unmerged');
 	my @mods = grep { !($_->{BINARY}) } @all_mods;
 	my @them;
 
+	print colored $error_color, "ignoring unmerged: $_->{VALUE}\n"
+		for grep { $_->{UNMERGED} } @mods;
+	@mods = grep { !$_->{UNMERGED} } @mods;
+
 	if (!@mods) {
 		if (@all_mods) {
 			print STDERR "Only binary files changed.\n";