bash: teach __git_ps1 about REVERT_HEAD

diff --git a/bundle.c b/bundle.c
index 6d21c77421767161d26a86f744d71b5752e1be76..6210a6be894fb3f5538eb2939c6dc4212382ae2d 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -183,17 +183,21 @@ int verify_bundle(struct bundle_header *header, int verbose)
                struct ref_list *r;
 
                r = &header->references;
-               printf_ln(Q_("The bundle contains %d ref",
-                            "The bundle contains %d refs",
+               printf_ln(Q_("The bundle contains this ref:",
+                            "The bundle contains these %d refs:",
                             r->nr),
                          r->nr);
                list_refs(r, 0, NULL);
                r = &header->prerequisites;
-               printf_ln(Q_("The bundle requires this ref",
-                            "The bundle requires these %d refs",
-                            r->nr),
-                         r->nr);
-               list_refs(r, 0, NULL);
+               if (!r->nr) {
+                       printf_ln(_("The bundle records a complete history."));
+               } else {
+                       printf_ln(Q_("The bundle requires this ref:",
+                                    "The bundle requires these %d refs:",
+                                    r->nr),
+                                 r->nr);
+                       list_refs(r, 0, NULL);
+               }
        }
        return ret;
 }
@@ -293,7 +297,7 @@ int create_bundle(struct bundle_header *header, const char *path,
        argc = setup_revisions(argc, argv, &revs, NULL);
 
        if (argc > 1)
-               return error(_("unrecognized argument: %s'"), argv[1]);
+               return error(_("unrecognized argument: %s"), argv[1]);
 
        object_array_remove_duplicates(&revs.pending);