X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=refs.c;h=d2b7b7fb56f76294bb48526496429968d86e49b2;hb=885b98107547fe3f6d17ca0af0578e040f7600d0;hp=76c08d03602554a77fcf48a488b0d7fceb41073c;hpb=dc49cd769b5fa6b7e0114b051c34a849828a7603;p=git.git

diff --git a/refs.c b/refs.c
index 76c08d036..d2b7b7fb5 100644
--- a/refs.c
+++ b/refs.c
@@ -828,16 +828,6 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)
 		goto rollback;
 	}
 
-	if (!prefixcmp(oldref, "refs/heads/") &&
-			!prefixcmp(newref, "refs/heads/")) {
-		char oldsection[1024], newsection[1024];
-
-		snprintf(oldsection, 1024, "branch.%s", oldref + 11);
-		snprintf(newsection, 1024, "branch.%s", newref + 11);
-		if (git_config_rename_section(oldsection, newsection) < 0)
-			return 1;
-	}
-
 	return 0;
 
  rollback:
@@ -921,6 +911,8 @@ static int log_ref_write(const char *ref_name, const unsigned char *old_sha1,
 				     log_file, strerror(errno));
 	}
 
+	adjust_shared_perm(log_file);
+
 	msglen = 0;
 	if (msg) {
 		/* clean up the message and make sure it is a single line */
@@ -978,6 +970,27 @@ int write_ref_sha1(struct ref_lock *lock,
 		unlock_ref(lock);
 		return -1;
 	}
+	if (strcmp(lock->orig_ref_name, "HEAD") != 0) {
+		/*
+		 * Special hack: If a branch is updated directly and HEAD
+		 * points to it (may happen on the remote side of a push
+		 * for example) then logically the HEAD reflog should be
+		 * updated too.
+		 * A generic solution implies reverse symref information,
+		 * but finding all symrefs pointing to the given branch
+		 * would be rather costly for this rare event (the direct
+		 * update of a branch) to be worth it.  So let's cheat and
+		 * check with HEAD only which should cover 99% of all usage
+		 * scenarios (even 100% of the default ones).
+		 */
+		unsigned char head_sha1[20];
+		int head_flag;
+		const char *head_ref;
+		head_ref = resolve_ref("HEAD", head_sha1, 1, &head_flag);
+		if (head_ref && (head_flag & REF_ISSYMREF) &&
+		    !strcmp(head_ref, lock->ref_name))
+			log_ref_write("HEAD", lock->old_sha1, sha1, logmsg);
+	}
 	if (commit_lock_file(lock->lk)) {
 		error("Couldn't set %s", lock->ref_name);
 		unlock_ref(lock);