From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Nov 2011 00:35:53 +0000 (-0800)
Subject: Merge branch 'jc/maint-remove-renamed-ref' into maint
X-Git-Tag: v1.7.7.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/916034b93ce45bdedfb1c5cef270e6eba2a26fea?hp=1a61a9dae874cac9ea40ac63f8fd662f62eee97e

Merge branch 'jc/maint-remove-renamed-ref' into maint

* jc/maint-remove-renamed-ref:
branch -m/-M: remove undocumented RENAMED-REF

Conflicts:
refs.c
---

diff --git a/refs.c b/refs.c
index a615043b34..fb258ea992 100644
--- a/refs.c
+++ b/refs.c
@@ -1211,7 +1211,6 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
 
 int rename_ref(const char *oldref, const char *newref, const char *logmsg)
 {
-	static const char renamed_ref[] = "RENAMED-REF";
 	unsigned char sha1[20], orig_sha1[20];
 	int flag = 0, logmoved = 0;
 	struct ref_lock *lock;
@@ -1235,13 +1234,6 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)
 	if (!is_refname_available(newref, oldref, get_loose_refs(NULL), 0))
 		return 1;
 
-	lock = lock_ref_sha1_basic(renamed_ref, NULL, 0, NULL);
-	if (!lock)
-		return error("unable to lock %s", renamed_ref);
-	lock->force_write = 1;
-	if (write_ref_sha1(lock, orig_sha1, logmsg))
-		return error("unable to save current sha1 in %s", renamed_ref);
-
 	if (log && rename(git_path("logs/%s", oldref), git_path(TMP_RENAMED_LOG)))
 		return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s",
 			oldref, strerror(errno));