Merge branch 'np/maint-sideband-favor-status'

diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
index 58f6b8f3779e55154b3d598f39bfee32eba3c545..29446e84ccf9322e722830f5af11da0c56709fb8 100644 (file)
--- a/builtin-upload-archive.c
+++ b/builtin-upload-archive.c
@@ -35,7 +35,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
        strcpy(buf, argv[1]); /* enter-repo smudges its argument */
 
        if (!enter_repo(buf, 0))
-               die("not a git archive");
+               die("'%s' does not appear to be a git repository", buf);
 
        /* put received options in sent_argv[] */
        sent_argc = 1;