builtin/apply: read_patch_file() return -1 instead of die()ing

diff --git a/lockfile.c b/lockfile.c
index 637b8cf74317b029d19abddd5b307321a6b6e859..9268cdf325f3881104d6d12ef31639536b15dcb2 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -149,13 +149,15 @@ static int lock_file_timeout(struct lock_file *lk, const char *path,
 void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
 {
        if (err == EEXIST) {
-               strbuf_addf(buf, "Unable to create '%s.lock': %s.\n\n"
-                   "If no other git process is currently running, this probably means a\n"
-                   "git process crashed in this repository earlier. Make sure no other git\n"
-                   "process is running and remove the file manually to continue.",
+               strbuf_addf(buf, _("Unable to create '%s.lock': %s.\n\n"
+                   "Another git process seems to be running in this repository, e.g.\n"
+                   "an editor opened by 'git commit'. Please make sure all processes\n"
+                   "are terminated then try again. If it still fails, a git process\n"
+                   "may have crashed in this repository earlier:\n"
+                   "remove the file manually to continue."),
                            absolute_path(path), strerror(err));
        } else
-               strbuf_addf(buf, "Unable to create '%s.lock': %s",
+               strbuf_addf(buf, _("Unable to create '%s.lock': %s"),
                            absolute_path(path), strerror(err));
 }
 
@@ -177,44 +179,6 @@ int hold_lock_file_for_update_timeout(struct lock_file *lk, const char *path,
        return fd;
 }
 
-int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
-{
-       int fd, orig_fd;
-
-       fd = lock_file(lk, path, flags);
-       if (fd < 0) {
-               if (flags & LOCK_DIE_ON_ERROR)
-                       unable_to_lock_die(path, errno);
-               return fd;
-       }
-
-       orig_fd = open(path, O_RDONLY);
-       if (orig_fd < 0) {
-               if (errno != ENOENT) {
-                       int save_errno = errno;
-
-                       if (flags & LOCK_DIE_ON_ERROR)
-                               die("cannot open '%s' for copying", path);
-                       rollback_lock_file(lk);
-                       error("cannot open '%s' for copying", path);
-                       errno = save_errno;
-                       return -1;
-               }
-       } else if (copy_fd(orig_fd, fd)) {
-               int save_errno = errno;
-
-               if (flags & LOCK_DIE_ON_ERROR)
-                       die("failed to prepare '%s' for appending", path);
-               close(orig_fd);
-               rollback_lock_file(lk);
-               errno = save_errno;
-               return -1;
-       } else {
-               close(orig_fd);
-       }
-       return fd;
-}
-
 char *get_locked_file_path(struct lock_file *lk)
 {
        struct strbuf ret = STRBUF_INIT;