summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-07-18 19:05:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-18 20:32:25 (GMT)
commit3f13877595500bd54ee370167bc868f3c1eee5b7 (patch)
tree6a7940cc0ac743cc9b997cc6c6d7a4a7c41b4b68 /merge.c
parentf3da2b79be9565779e4f76dc5812c68e156afdf0 (diff)
downloadgit-3f13877595500bd54ee370167bc868f3c1eee5b7.zip
git-3f13877595500bd54ee370167bc868f3c1eee5b7.tar.gz
git-3f13877595500bd54ee370167bc868f3c1eee5b7.tar.bz2
repo_read_index: don't discard the index
Have 'repo_read_index()' behave more like the other read_index family of functions and don't discard the index if it has already been populated and instead rely on the quick return of read_index_from which has: /* istate->initialized covers both .git/index and .git/sharedindex.xxx */ if (istate->initialized) return istate->cache_nr; Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions