Re: [PATCH] rerere: release lockfile in non-writing functions

Jeff King writes: > There's a bug in builtin/am.c in which we take a lock on > MERGE_RR recursively. But rather than fix am.c, this patch > fixes the confusing interface from rerere.c that caused the > bug. Read on for the gory details. > > The setup_rerere() function both reads the existing MERG

[PATCH] rerere: release lockfile in non-writing functions

There's a bug in builtin/am.c in which we take a lock on MERGE_RR recursively. But rather than fix am.c, this patch fixes the confusing interface from rerere.c that caused the bug. Read on for the gory details. The setup_rerere() function both reads the existing MERGE_RR file, and takes MERGE_RR.l