Allow git commit --interactive with paths

Make git commit --interactive feel more like git add --interactive by
allowing the user to restrict the list of files they have to deal with.

A test in t7501 used to ensure that this is not allowed; no need for that
anymore.

Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index 636aea6d6259b6151670fa6259b2eb59509a80b2..7707af884494cfe68d9c781efb7ef4c532614874 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1084,8 +1084,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
 
        if (all && argc > 0)
                die(_("Paths with -a does not make sense."));
 
        if (all && argc > 0)
                die(_("Paths with -a does not make sense."));

-       else if (interactive && argc > 0)
-               die(_("Paths with --interactive does not make sense."));

 
        if (null_termination && status_format == STATUS_FORMAT_LONG)
                status_format = STATUS_FORMAT_PORCELAIN;
 
        if (null_termination && status_format == STATUS_FORMAT_LONG)
                status_format = STATUS_FORMAT_PORCELAIN;

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 3d2b14d3035e02e14696f64edd0ddabca204f576..c2fd116d633351eeaa75cc4040f6e4a73670975b 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -41,11 +41,12 @@ test_expect_success \
        "echo King of the bongo >file &&
        test_must_fail git commit -m foo -a file"
 
        "echo King of the bongo >file &&
        test_must_fail git commit -m foo -a file"
 

-test_expect_success PERL 'cannot use paths with --interactive' '
+test_expect_success PERL 'can use paths with --interactive' '

        echo bong-o-bong >file &&
        # 2: update, 1:st path, that is all, 7: quit
        ( echo 2; echo 1; echo; echo 7 ) |
        echo bong-o-bong >file &&
        # 2: update, 1:st path, that is all, 7: quit
        ( echo 2; echo 1; echo; echo 7 ) |

-       test_must_fail git commit -m foo --interactive file
+       git commit -m foo --interactive file &&
+       git reset --hard HEAD^

 '
 
 test_expect_success \
 '
 
 test_expect_success \