| commit | e197980eb2446da92a4e7d835c05adbc25c17ae0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Apr 2019 10:28:06 +0000 (16 19:28 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Apr 2019 10:28:06 +0000 (16 19:28 +0900) | ||
| tree | 91d8b4f8cf948a59ed79d7010d7ccb1e2d0bf7a7 | treesnapshot (tar.gz zip) |
| parent | 8b7150327eb5034190631eaaec1956ad84d3cad5 | commitdiff |
| parent | 6d67a993b2a7c3e1a9c3688c92f28b237144c2fd | commitdiff |
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
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