On Mon, Apr 30, 2018 at 10:07:25PM +0000, Ævar Arnfjörð Bjarmason wrote:
> I started out just wanting to do 04/09 so I'd get prettier output, but
> then noticed that ^{tag}, ^{commit}< ^{blob} and ^{tree} didn't behave
> as expected with the disambiguation output, and that core.disambiguate
> had never been documented.
>
> Ævar Arnfjörð Bjarmason (9):
> sha1-name.c: remove stray newline
> sha1-array.h: align function arguments
> sha1-name.c: move around the collect_ambiguous() function
> get_short_oid: sort ambiguous objects by type, then SHA-1
> get_short_oid: learn to disambiguate by ^{tag}
> get_short_oid: learn to disambiguate by ^{blob}
> get_short_oid / peel_onion: ^{tree} should mean tree, not treeish
> get_short_oid / peel_onion: ^{tree} should mean commit, not commitish
> config doc: document core.disambiguateAs mentioned, I'm a bit unsure that patches 7 and 8 are entirely correct. I've mostly convinced myself that they are after looking at peel_onion, but I'm still harboring lingering doubts for some reason. The rest of the series looked fine to me. Thanks for cleaning up my stray newline. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204
signature.asc
Description: PGP signature
