From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 May 2013 20:30:19 +0000 (-0700)
Subject: Merge branch 'mv/sequencer-pick-error-diag'
X-Git-Tag: v1.8.3-rc2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/faf8fde514df5b5ddd529ec5a89973f1961c5281?ds=inline;hp=-c

Merge branch 'mv/sequencer-pick-error-diag'

Fix "git cherry-pick $annotated_tag", which was mistakenly rejected.

* mv/sequencer-pick-error-diag:
cherry-pick: picking a tag that resolves to a commit is OK
---

faf8fde514df5b5ddd529ec5a89973f1961c5281
diff --combined sequencer.c
index cf8fbeb8d5,f2c9d98f8f..ab6f8a722d
--- a/sequencer.c
+++ b/sequencer.c
@@@ -216,7 -216,7 +216,7 @@@ static void print_advice(int show_hint
  	if (msg) {
  		fprintf(stderr, "%s\n", msg);
  		/*
 -		 * A conflict has occured but the porcelain
 +		 * A conflict has occurred but the porcelain
  		 * (typically rebase --interactive) wants to take care
  		 * of the commit itself so remove CHERRY_PICK_HEAD
  		 */
@@@ -1077,10 -1077,10 +1077,10 @@@ int sequencer_pick_revisions(struct rep
  			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);
  	}