From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sun, 15 Sep 2013 15:33:22 +0000 (+0200)
Subject: repack: improve warnings about failure of renaming and removing files
X-Git-Tag: v1.8.5-rc0~37^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257

repack: improve warnings about failure of renaming and removing files

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/repack.c b/builtin/repack.c
index 9f4c782d43..a0ff5c704f 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -327,7 +327,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 				chmod(fname_old, statbuffer.st_mode);
 			}
 			if (rename(fname_old, fname))
-				exit(errno);
+				die_errno(_("renaming '%s' failed"), fname_old);
 			free(fname);
 			free(fname_old);
 		}
@@ -341,7 +341,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 					packdir,
 					item->string,
 					exts[ext]);
-			remove_path(fname);
+			if (remove_path(fname))
+				warning(_("removing '%s' failed"), fname);
 		}
 	}