From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Wed, 1 Oct 2014 10:28:11 +0000 (+0200)
Subject: lockfile: unlock file if lockfile permissions cannot be adjusted
X-Git-Tag: v2.2.0-rc0~53^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41dd4ffaf99532d8344c90a5b1a060ac1f73b232;p=thirdparty%2Fgit.git

lockfile: unlock file if lockfile permissions cannot be adjusted

If the call to adjust_shared_perm() fails, lock_file returns -1, which
to the caller looks like any other failure to lock the file.  So in
this case, roll back the lockfile before returning so that the lock
file is deleted immediately and the lockfile object is left in a
predictable state (namely, unlocked).  Previously, the lockfile was
retained until process cleanup in this situation.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/lockfile.c b/lockfile.c
index 3df1e8306a..d74de8d329 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -153,6 +153,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 			int save_errno = errno;
 			error("cannot fix permission bits on %s",
 			      lk->filename);
+			rollback_lock_file(lk);
 			errno = save_errno;
 			return -1;
 		}