Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
cherry-pick: picking a tag that resolves to a commit is OK
author
Junio C Hamano
<gitster@pobox.com>
Thu, 9 May 2013 20:27:49 +0000
(13:27 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 9 May 2013 20:29:53 +0000
(13:29 -0700)
Earlier,
21246dbb9e0a
(cherry-pick: make sure all input objects are
commits, 2013-04-11) tried to catch an unlikely "git cherry-pick $blob"
as an error, but broke a more important use case to cherry-pick a
tag that points at a commit.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
21246db
)
diff --git
a/sequencer.c
b/sequencer.c
index 61fdb6805cd85b803f2675bef0619b04bd767314..f2c9d98f8f5cd3f3ff55444a8c76a3a7f00be9ec 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-1077,10
+1077,10
@@
int sequencer_pick_revisions(struct replay_opts *opts)
continue;
if (!get_sha1(name, sha1)) {
- enum object_type type = sha1_object_info(sha1, NULL);
-
- if (type > 0 && type != OBJ_COMMIT)
+ if (!lookup_commit_reference_gently(sha1, 1)) {
+ enum object_type type = sha1_object_info(sha1, NULL);
die(_("%s: can't cherry-pick a %s"), name, typename(type));
+ }
} else
die(_("%s: bad revision"), name);
}