projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a6f63ae) | patch
builtin-merge: release the lockfile in try_merge_strategy()
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 6 Sep 2008 16:29:49 +0000 (18:29 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Sep 2008 02:49:51 +0000 (19:49 -0700)
commit4271666046b4b3e655eab88821096539099f3b14
tree87394519648f87f4f9141867bd7d37ccd7422046tree | snapshot
parenta6f63ae002237c2eb416d4e2cb43227522e4ea9acommit | diff
builtin-merge: release the lockfile in try_merge_strategy()

Once we committed the locked index, we should release the lockfile. In
most cases this is done automatically when the process ends, but this is
not true in this case.

[jc: with additional tests from Eric Raible]

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge.c diff | blob | history
t/t6026-merge-attr.sh diff | blob | history
Git—the stupid content tracker