mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 00:38:50 +02:00
Code

Allow git commit --interactive with paths

Browse Source 
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>
This commit is contained in:
Conrad Irwin 2011-05-06 23:00:00 -07:00 committed by Junio C Hamano
parent 587ac8c9d4
commit e41fcfe955
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -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;

5
t/t7501-commit.sh
View File

@ -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 \