Re: [PATCH] add -p: skip conflicted paths
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 28, 2012, 19:28 UTC
- Message-ID
- <7viphov839.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1332962282-4040-1-git-send-email-kusmabite@gmail.com>
Erik Faye-Lund <kusmabite@gmail.com> writes:
Show 15 quoted lines
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index 8f0839d..a52507f 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -1259,6 +1259,13 @@ sub patch_update_file {
> my $quit = 0;
> my ($ix, $num);
> my $path = shift;
> +
> + # skip conflicted paths
> + if (run_cmd_pipe(qw(git ls-files -u --), $path)) {
> + print colored $error_color, "Warning: $path is in conflicted state, skipping.\n";
> + return 0;
> + }
> +Thanks.
I have to wonder if the filtering should go to much higher level in the callchain.
Perhaps teach list_modified(), which currently takes 'file-only' and 'index-only', to also take an option to omit (and warn if it is appropriate) unmerged paths?