From: Conrad Irwin Date: Sat, 7 May 2011 06:00:00 +0000 (-0700) Subject: Allow git commit --interactive with paths X-Git-Tag: v1.7.6-rc0~64^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e41fcfe955cb8080bf8f0e16352d3131d1f01ac8;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/commit.c b/builtin/commit.c index 636aea6d6..7707af884 100644 --- 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.")); - 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; diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 3d2b14d30..c2fd116d6 100755 --- 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" -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 ) | - test_must_fail git commit -m foo --interactive file + git commit -m foo --interactive file && + git reset --hard HEAD^ ' test_expect_success \