summaryrefslogtreecommitdiff
path: root/builtin/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-14 12:01:03 -0700
committerJunio C Hamano <gitster@pobox.com>2018-03-14 12:01:03 -0700
commit787aa97f217eb97827205271daba6d95c80b9049 (patch)
tree5050330a38146d8ea2c39ef67852f69c08e2abe1 /builtin/notes.c
parent868f7d23384931641aa4901aab27f3f23577e63b (diff)
parent350292a1efb38bbcd6255a424df6adbfe78910ac (diff)
Merge branch 'ma/roll-back-lockfiles'
Some codepaths used to take a lockfile and did not roll it back; they are automatically rolled back at program exit, so there is no real "breakage", but it still is a good practice to roll back when you are done with a lockfile. * ma/roll-back-lockfiles: sequencer: do not roll back lockfile unnecessarily merge: always roll back lock in `checkout_fast_forward()` merge-recursive: always roll back lock in `merge_recursive_generic()` sequencer: always roll back lock in `do_recursive_merge()` sequencer: make lockfiles non-static
Diffstat (limited to 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions