From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:06 +0000 (+0900)
Subject: Merge branch 'js/get-short-oid-drop-cache'
X-Git-Tag: v2.22.0-rc0~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e197980eb2446da92a4e7d835c05adbc25c17ae0;p=git

Merge branch 'js/get-short-oid-drop-cache'

A corner-case object name ambiguity while the sequencer machinery
is working (e.g. "rebase -i -x") has been (half) fixed.

* js/get-short-oid-drop-cache:
  get_oid(): when an object was not found, try harder
  sequencer: move stale comment into correct location
  sequencer: improve error message when an OID could not be parsed
  rebase -i: demonstrate obscure loose object cache bug
---

e197980eb2446da92a4e7d835c05adbc25c17ae0