lock_ref_sha1_basic(): remember the original name of a ref when resolving it

A ref might be pointing to another ref but only the name of the last ref
is remembered.  Let's remember about the first name as well.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/refs.c b/refs.c
index 3b295f380662aab7fc247b6f9fed9e4884758cf5..bd76ea65a904b098c80f6a719b28a316b79e9204 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -680,6 +680,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *ref, const unsigned char
        lock->lk = xcalloc(1, sizeof(struct lock_file));
 
        lock->ref_name = xstrdup(ref);
+       lock->orig_ref_name = xstrdup(orig_ref);
        ref_file = git_path("%s", ref);
        lock->force_write = lstat(ref_file, &st) && errno == ENOENT;
 
@@ -919,6 +920,7 @@ void unlock_ref(struct ref_lock *lock)
                        rollback_lock_file(lock->lk);
        }
        free(lock->ref_name);
+       free(lock->orig_ref_name);
        free(lock);
 }
 

diff --git a/refs.h b/refs.h
index 2d2ba149abbb69c796307113b7de917d579b5b5c..94a58b41fbf3b3de81a7133c2db404338093758d 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -3,6 +3,7 @@
 
 struct ref_lock {
        char *ref_name;
+       char *orig_ref_name;
        struct lock_file *lk;
        unsigned char old_sha1[20];
        int lock_fd;