From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:12 +0000 (-0800)
Subject: Merge branch 'mh/ref-remove-empty-directory'
X-Git-Tag: v2.13.0-rc0~177
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ad8b5bf26362ac67c9020bf8c30eee54a84f56d

Merge branch 'mh/ref-remove-empty-directory'

Deletion of a branch "foo/bar" could remove .git/refs/heads/foo
once there no longer is any other branch whose name begins with
"foo/", but we didn't do so so far.  Now we do.

* mh/ref-remove-empty-directory: (23 commits)
files_transaction_commit(): clean up empty directories
try_remove_empty_parents(): teach to remove parents of reflogs, too
try_remove_empty_parents(): don't trash argument contents
try_remove_empty_parents(): rename parameter "name" -> "refname"
delete_ref_loose(): inline function
delete_ref_loose(): derive loose reference path from lock
log_ref_write_1(): inline function
log_ref_setup(): manage the name of the reflog file internally
log_ref_write_1(): don't depend on logfile argument
log_ref_setup(): pass the open file descriptor back to the caller
log_ref_setup(): improve robustness against races
log_ref_setup(): separate code for create vs non-create
log_ref_write(): inline function
rename_tmp_log(): improve error reporting
rename_tmp_log(): use raceproof_create_file()
lock_ref_sha1_basic(): use raceproof_create_file()
lock_ref_sha1_basic(): inline constant
raceproof_create_file(): new function
safe_create_leading_directories(): set errno on SCLD_EXISTS
safe_create_leading_directories_const(): preserve errno
...
---

3ad8b5bf26362ac67c9020bf8c30eee54a84f56d
diff --cc refs/files-backend.c
index c041d4ba21,c426575fe9..21e116d4e6
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@@ -2828,17 -2816,17 +2816,17 @@@ static int log_ref_write_fd(int fd, con
  	return 0;
  }
  
- static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
- 			   const unsigned char *new_sha1, const char *msg,
- 			   struct strbuf *logfile, int flags,
- 			   struct strbuf *err)
+ int files_log_ref_write(const char *refname, const unsigned char *old_sha1,
+ 			const unsigned char *new_sha1, const char *msg,
+ 			int flags, struct strbuf *err)
  {
- 	int logfd, result, oflags = O_APPEND | O_WRONLY;
+ 	int logfd, result;
  
 -	if (log_all_ref_updates < 0)
 -		log_all_ref_updates = !is_bare_repository();
 +	if (log_all_ref_updates == LOG_REFS_UNSET)
 +		log_all_ref_updates = is_bare_repository() ? LOG_REFS_NONE : LOG_REFS_NORMAL;
  
- 	result = log_ref_setup(refname, logfile, err, flags & REF_FORCE_CREATE_REFLOG);
+ 	result = log_ref_setup(refname, flags & REF_FORCE_CREATE_REFLOG,
+ 			       &logfd, err);
  
  	if (result)
  		return result;