From: Junio C Hamano Date: Tue, 19 May 2015 20:17:59 +0000 (-0700) Subject: Merge branch 'sb/ref-lock-lose-lock-fd' X-Git-Tag: v2.5.0-rc0~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4295abc04045c0bd2160bc7f6a4971abdcabf3b8;p=thirdparty%2Fgit.git Merge branch 'sb/ref-lock-lose-lock-fd' The refs API uses ref_lock struct which had its own "int fd", even though the same file descriptor was in the lock struct it contains. Clean-up the code to lose this redundant field. * sb/ref-lock-lose-lock-fd: refs.c: remove lock_fd from struct ref_lock --- 4295abc04045c0bd2160bc7f6a4971abdcabf3b8