The scripted version might not have handled this correctly
either, but the version rewritten in C definitely does not grok
this and complains $tag is not a commit object.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* This is meant for "maint" aka 1.5.4.X. Working with new
stuff may be more fun, but we would need to first stabilize
the 'maint' branch a bit further. Review comments and
similar bugfix patches meant for 'maint' branch are very much
appreciated.
builtin-commit.c | 2 +-
t/t7501-commit.sh | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c
index d8deb1a..c787bed 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -601,7 +601,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (get_sha1(use_message, sha1))
die("could not lookup commit %s", use_message);
- commit = lookup_commit(sha1);
+ commit = lookup_commit_reference(sha1);
if (!commit || parse_commit(commit))
die("could not parse commit %s", use_message);
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index d1a415a..55043d1 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -327,4 +327,22 @@ test_expect_success 'amend using the message from another commit' '
'
+test_expect_success 'amend using the message from a commit named with tag' '
+
+ git reset --hard &&
+ test_tick &&
+ git commit --allow-empty -m "old commit" &&
+ old=$(git rev-parse --verify HEAD) &&
+ git tag -a -m "tag on old" tagged-old HEAD &&
+ test_tick &&
+ git commit --allow-empty -m "new commit" &&
+ new=$(git rev-parse --verify HEAD) &&
+ test_tick &&
+ git commit --allow-empty --amend -C tagged-old &&
+ git show --pretty="format:%ad %s" "$old" >expected &&
+ git show --pretty="format:%ad %s" HEAD >actual &&
+ diff -u expected actual
+
+'
+
test_done
--
1.5.4.2.g41ac4
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
