On 4/23/07, Junio C Hamano <junkio@xxxxxxx> wrote:
> but the ambiguous "git-rev-parse --verify 'mdl18-local^0'" returns the > SHA1 for a head called 'mdl18-topnz' that I am not asking for. Why? Maybe you have a branch that is exactly the same name as a tag?
Nope - none of the tags look _anything_ like mdl18-local. See http://git.catalyst.net.nz/gitweb?p=moodle-r2.git;a=tags I think mdl18-topnz was the first local branch I created in this checkout. Hmmmm. There was a .git/mdl18-local file that had the bogus SHA1 in it: a26c09be05a08e5f911ef84b5f8010ba155ea77d . I don't know how it got there and how it had the wrong sha1 in it. Removing it has fixed it. The _really_ strange bit is that it was attempting to merge 2 heads of the same name. It'd probably be something to block... cheers, martin - 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