aboutsummaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorKyle J. McKay <mackyle@gmail.com>2013-07-18 17:16:16 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-18 20:31:43 -0700
commit9c0810732c50106d1a93866ca3fa1285e07778f1 (patch)
treeaeb18b7fcf511afbdc00817658418103a2e745d0 /merge.c
parent8ac251b66b952b0eddfa4e5bbf08a3c0ae7dbc0b (diff)
downloadgit-9c0810732c50106d1a93866ca3fa1285e07778f1.tar.gz
git-9c0810732c50106d1a93866ca3fa1285e07778f1.tar.xz
Git.pm: revert _temp_cache use of temp_is_locked
When the temp_is_locked function was introduced, there was a desire to make _temp_cache use it. Unfortunately due to the various tests and logic flow involved changing the _temp_cache function to use the new temp_is_locked function is problematic as _temp_cache needs a slightly different test than is provided by the temp_is_locked function. This change reverts use of temp_is_locked in the _temp_cache function and restores the original code that existed there before the temp_is_locked function was added. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions