git-stash: do not remove a ref by hand.

diff --git a/lockfile.c b/lockfile.c
index 4824f4dc026e7b3f978fe4e9b2154335359e9d2e..920247249823b8f69524b845d6bdb0cb0b1b802b 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -4,11 +4,15 @@
 #include "cache.h"
 
 static struct lock_file *lock_file_list;
+static const char *alternate_index_output;
 
 static void remove_lock_file(void)
 {
+       pid_t me = getpid();
+
        while (lock_file_list) {
-               if (lock_file_list->filename[0])
+               if (lock_file_list->owner == me &&
+                   lock_file_list->filename[0])
                        unlink(lock_file_list->filename);
                lock_file_list = lock_file_list->next;
        }
@@ -24,18 +28,32 @@ static void remove_lock_file_on_signal(int signo)
 static int lock_file(struct lock_file *lk, const char *path)
 {
        int fd;
+       struct stat st;
+
+       if ((!lstat(path, &st)) && S_ISLNK(st.st_mode)) {
+               ssize_t sz;
+               static char target[PATH_MAX];
+               sz = readlink(path, target, sizeof(target));
+               if (sz < 0)
+                       warning("Cannot readlink %s", path);
+               else if (target[0] != '/')
+                       warning("Cannot lock target of relative symlink %s", path);
+               else
+                       path = target;
+       }
        sprintf(lk->filename, "%s.lock", path);
        fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
        if (0 <= fd) {
+               if (!lock_file_list) {
+                       signal(SIGINT, remove_lock_file_on_signal);
+                       atexit(remove_lock_file);
+               }
+               lk->owner = getpid();
                if (!lk->on_list) {
                        lk->next = lock_file_list;
                        lock_file_list = lk;
                        lk->on_list = 1;
                }
-               if (lock_file_list) {
-                       signal(SIGINT, remove_lock_file_on_signal);
-                       atexit(remove_lock_file);
-               }
                if (adjust_shared_perm(lk->filename))
                        return error("cannot fix permission bits on %s",
                                     lk->filename);
@@ -65,10 +83,30 @@ int commit_lock_file(struct lock_file *lk)
        return i;
 }
 
+int hold_locked_index(struct lock_file *lk, int die_on_error)
+{
+       return hold_lock_file_for_update(lk, get_index_file(), die_on_error);
+}
+
+void set_alternate_index_output(const char *name)
+{
+       alternate_index_output = name;
+}
+
+int commit_locked_index(struct lock_file *lk)
+{
+       if (alternate_index_output) {
+               int result = rename(lk->filename, alternate_index_output);
+               lk->filename[0] = 0;
+               return result;
+       }
+       else
+               return commit_lock_file(lk);
+}
+
 void rollback_lock_file(struct lock_file *lk)
 {
        if (lk->filename[0])
                unlink(lk->filename);
        lk->filename[0] = 0;
 }
-