On Thu, May 24 2018, Junio C Hamano wrote:
> * ab/fetch-tags-noclobber (2018-05-16) 9 commits
> - fixup! push tests: assert re-pushing annotated tags
> - fetch: stop clobbering existing tags without --force
> - fetch tests: add a test clobbering tag behavior
> - fetch tests: correct a comment "remove it" -> "remove them"
> - push doc: correct lies about how push refspecs work
> - push tests: assert re-pushing annotated tags
> - push tests: add more testing for forced tag pushing
> - push tests: fix logic error in "push" test assertion
> - push tests: remove redundant 'git push' invocation
>
> Expecting a reboot of the discussion to take it to some conclusion
> and then a reroll.
> cf. <f3b891c3-381f-de42-51d8-24fdfbca91d2@xxxxxxxxx>
> cf. <xmqq603yn50l.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>
> cf. <xmqqzi1alodz.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>
> cf. <xmqqvabylnbi.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>
I hope to follow-up with this soon. Sorry for the delay.
> * ab/get-short-oid (2018-05-11) 5 commits
> (merged to 'next' on 2018-05-23 at 07e1908439)
> + get_short_oid: sort ambiguous objects by type, then SHA-1
> + sha1-name.c: move around the collect_ambiguous() function
> + git-p4: change "commitish" typo to "committish"
> + sha1-array.h: align function arguments
> + sha1-name.c: remove stray newline
Sweet. I'll follow-up with the rest of the patches revised once that
lands now that I'm fairly sure what you and Jeff mean by $sha1^{<type>}
:)
