]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-add -i: update removed path correctly.
authorJunio C Hamano <junkio@cox.net>
Wed, 7 Feb 2007 18:56:38 +0000 (10:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 7 Feb 2007 18:56:38 +0000 (10:56 -0800)
Earlier, when a path that was removed from the working tree was
chosen for update subcommand, you got an error like this:

    error: git-resolve.sh: does not exist and --remove not passed
    fatal: Unable to process file git-resolve.sh

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-add--interactive.perl

index 0057f865886753afb9493a2e82b11fe14aa91529..dc3038091dd7db7dd4bb96cf8832df789b4d127f 100755 (executable)
@@ -1,6 +1,5 @@
 #!/usr/bin/perl -w
 
-
 use strict;
 
 sub run_cmd_pipe {
@@ -282,7 +281,7 @@ sub update_cmd {
                                       HEADER => $status_head, },
                                     @mods);
        if (@update) {
-               system(qw(git update-index --add --),
+               system(qw(git update-index --add --remove --),
                       map { $_->{VALUE} } @update);
                say_n_paths('updated', @update);
        }