summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-03-13 03:16:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-14 12:46:29 +0900
commit6d67a993b2a7c3e1a9c3688c92f28b237144c2fd (patch)
tree8e48f88cb326fa6e3d6f3d5b7820463eee60e8f6 /Documentation/config/merge.txt
parentsequencer: move stale comment into correct location (diff)
downloadtgif-6d67a993b2a7c3e1a9c3688c92f28b237144c2fd.tar.xz
get_oid(): when an object was not found, try harder
It is quite possible that the loose object cache gets stale when new objects are written. In that case, get_oid() would potentially say that it cannot find a given object, even if it should find it. Let's blow away the loose object cache as well as the read packs and try again in that case. Note: this does *not* affect the code path that was introduced to help avoid looking for the same non-existing objects (which made some operations really expensive via NFS): that code path is handled by the `OBJECT_INFO_QUICK` flag (which does not even apply to `get_oid()`, which has no equivalent flag, at least at the time this patch was written). This incidentally fixes the problem identified earlier where an interactive rebase wanted to re-read (and validate) the todo list after an `exec` command modified it. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/merge.txt')
0 files changed, 0 insertions, 0 deletions