Merge with http://members.cox.net/junkio/git-jc.git

[git.git] / update-cache.c

diff --git a/update-cache.c b/update-cache.c
index 69b1afe..2f5d620 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -369,8 +369,10 @@ int main(int argc, char **argv)
                                continue;
                        }
                        if (!strcmp(path, "--cacheinfo")) {
-                               if (i+3 >= argc || add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
+                               if (i+3 >= argc)
                                        die("update-cache: --cacheinfo <mode> <sha1> <path>");
+                               if (add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
+                                       die("update-cache: --cacheinfo cannot add %s", argv[i+3]);
                                i += 3;
                                continue;
                        }