Merge branch 'np/verify-pack' into maint

diff --git a/builtin-log.c b/builtin-log.c

index 430d87661e37a4b08963de1ee5c31b8143ebc373..911fd659906ebe87bf0adcd17519dd97777fb948 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -313,7 +313,7 @@ static int show_object(const unsigned char *sha1, int show_tag_object,
  
  static int show_tree_object(const unsigned char *sha1,
                 const char *base, int baselen,
-               const char *pathname, unsigned mode, int stage)
+               const char *pathname, unsigned mode, int stage, void *context)
  {
         printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
         return 0;
@@ -366,7 +366,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
                                         name,
                                         diff_get_color_opt(&rev.diffopt, DIFF_RESET));
                         read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
-                                       show_tree_object);
+                                       show_tree_object, NULL);
                         break;
                 case OBJ_COMMIT:
                         rev.pending.nr = rev.pending.alloc = 0;
@@ -461,7 +461,7 @@ static int extra_cc_alloc;
  static void add_header(const char *value)
  {
         int len = strlen(value);
-       while (value[len - 1] == '\n')
+       while (len && value[len - 1] == '\n')
                 len--;
         if (!strncasecmp(value, "to: ", 4)) {
                 ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc);
@@ -1082,7 +1082,7 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
  }
  
  static const char cherry_usage[] =
-"git-cherry [-v] <upstream> [<head>] [<limit>]";
+"git cherry [-v] <upstream> [<head>] [<limit>]";
  int cmd_cherry(int argc, const char **argv, const char *prefix)
  {
         struct rev_info revs;