Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint

A small code clean-up. * rs/use-strbuf-add-unique-abbrev: use strbuf_add_unique_abbrev() for adding short hashes