[PATCH 3/3] git commit: pathspec without -i/-o implies -i semantics during a merge
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 23, 2009, 06:21 UTC
- Message-ID
- <7vy6x235ky.fsf_-_@gitster.siamese.dyndns.org>
- In-Reply-To
- <7viqo64kfo.fsf@gitster.siamese.dyndns.org>
"git commit paths..." has been a short-hand for "git commit -o paths..." since v1.3.0 and let you create a commit skipping any other updated state staged in the index. The "--only" semantics (aka "partial commit") is always wrong during a conflicted merge resolution, and we rejected both "git commit paths..." and "git commit -o paths..." forms during a merge.
On the other hand, "git commit -i paths..." (aka "an also commit", which asks to commit what you staged in the index, and also the paths you may or may not have git-add'ed) is accepted, as it is a way to register the contents you fixed up to the index and commit the result.
This makes "git commit paths..." form default to "git commit -i paths" semantics only during a merge, restoring the pre-v1.3.0 behaviour. The codepath to create a non-merge commit is not affected and still defaults to the "--only" semantics.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-commit.c | 14 ++++++++++++-- t/t7501-commit.sh | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c index d861263..4cb1985 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -74,6 +74,7 @@ static struct strbuf message; enum { MSG_AMEND_CLEVER, MSG_ASSUME_PARTIAL, + MSG_ASSUME_ALSO_DURING_MERGE }; static void set_partial_commit_message(int msgnum) @@ -87,6 +88,9 @@ static void set_partial_commit_message(int msgnum) case MSG_ASSUME_PARTIAL: msg = "Explicit paths specified without -i nor -o; assuming --only paths..."; break; + case MSG_ASSUME_ALSO_DURING_MERGE: + msg = "Paths specified without -i nor -o during a merge; assuming -i"; + break; default: die("Oops (%d) is not a valid message number", msgnum); break; @@ -812,8 +816,14 @@ static int parse_and_validate_options(int argc, const char *argv[], die("No paths with --include/--only does not make sense."); if (argc == 0 && only && amend) set_partial_commit_message(MSG_AMEND_CLEVER); - if (argc > 0 && !also && !only) - set_partial_commit_message(MSG_ASSUME_PARTIAL); + if (argc > 0 && !also && !only) { + if (!in_merge) + set_partial_commit_message(MSG_ASSUME_PARTIAL); + else { + set_partial_commit_message(MSG_ASSUME_ALSO_DURING_MERGE); + also = 1; + } + } if (!cleanup_arg || !strcmp(cleanup_arg, "default")) cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; else if (!strcmp(cleanup_arg, "verbatim")) diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 0c10105..68892de 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -399,7 +399,7 @@ test_expect_success 'allow --include during a merge' ' git reset --hard ' -test_expect_failure 'assume --include during a merge' ' +test_expect_success 'assume --include during a merge' ' git checkout HEAD^0 && git reset --hard the-other-side-says-nitfol && test_must_fail git merge one-side-says-frotz &&
-- 1.6.1.265.g9a013