summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-08 23:21:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-08 23:26:39 (GMT)
commit77c29b4acae2f129f71e4856b8d0518982802d83 (patch)
tree66f13b19e29f04f2a87cc5727b3ad8f613f1aa7e
parentf9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d (diff)
downloadgit-77c29b4acae2f129f71e4856b8d0518982802d83.zip
git-77c29b4acae2f129f71e4856b8d0518982802d83.tar.gz
git-77c29b4acae2f129f71e4856b8d0518982802d83.tar.bz2
Revert recent "git merge <msg> HEAD <commit>..." deprecation
This reverts commit c0ecb07048ce2123589a2f077d296e8cf29a9570 "git-pull.sh: Fix call to git-merge for new command format" and commit b81e00a965c62ca72a4b9db425ee173de147808d "git-merge: a deprecation notice of the ancient command line syntax". They caused a "git pull" (without any arguments, and without any local commits---only to update to the other side) to warn that commit log message is ignored because the merge resulted in a fast-forward. Another possible solution is to add an extra option to "git merge" so that "git pull" can tell it that the message given is not coming from the end user (the canned message is passed just in case the merge resulted in a non-ff and caused commit), but I think it is easier _not_ to deprecate the old syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-merge.c6
-rwxr-xr-xgit-pull.sh6
2 files changed, 3 insertions, 9 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index 56a1bb6..f1c84d7 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -796,11 +796,6 @@ static int suggest_conflicts(void)
return 1;
}
-static const char deprecation_warning[] =
- "'git merge <msg> HEAD <commit>' is deprecated. Please update\n"
- "your script to use 'git merge -m <msg> <commit>' instead.\n"
- "In future versions of git, this syntax will be removed.";
-
static struct commit *is_old_style_invocation(int argc, const char **argv)
{
struct commit *second_token = NULL;
@@ -814,7 +809,6 @@ static struct commit *is_old_style_invocation(int argc, const char **argv)
die("'%s' is not a commit", argv[1]);
if (hashcmp(second_token->object.sha1, head))
return NULL;
- warning(deprecation_warning);
}
return second_token;
}
diff --git a/git-pull.sh b/git-pull.sh
index 502af1a..bfeb4a0 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -216,7 +216,7 @@ fi
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
test true = "$rebase" &&
- exec git rebase $diffstat $strategy_args --onto $merge_head \
+ exec git-rebase $diffstat $strategy_args --onto $merge_head \
${oldremoteref:-$merge_head}
-exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
- -m "$merge_name" $merge_head
+exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
+ "$merge_name" HEAD $merge_head $verbosity