Merge branch 'maint-1.7.0' into maint-1.7.1

[thirdparty/git.git] / builtin / log.c
diff --git a/builtin/log.c b/builtin/log.c

index 542ecc708bdb830bcdbbd48e3fb3d21021119630..6208703c061abb868201073795cf516bf81b2602 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -36,6 +36,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
  {
         int i;
         int decoration_style = 0;
+       struct userformat_want w;
  
         rev->abbrev = DEFAULT_ABBREV;
         rev->commit_format = CMIT_FMT_DEFAULT;
@@ -58,7 +59,10 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
                 usage(builtin_log_usage);
         argc = setup_revisions(argc, argv, rev, opt);
  
-       if (!rev->show_notes_given && !rev->pretty_given)
+       memset(&w, 0, sizeof(w));
+       userformat_find_requirements(NULL, &w);
+
+       if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
                 rev->show_notes = 1;
         if (rev->show_notes)
                 init_display_notes(&rev->notes_opt);
@@ -1303,8 +1307,11 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
         return -1;
  }
  
-static const char cherry_usage[] =
-"git cherry [-v] [<upstream> [<head> [<limit>]]]";
+static const char * const cherry_usage[] = {
+       "git cherry [-v] [<upstream> [<head> [<limit>]]]",
+       NULL
+};
+
  int cmd_cherry(int argc, const char **argv, const char *prefix)
  {
         struct rev_info revs;
@@ -1315,26 +1322,25 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
         const char *upstream;
         const char *head = "HEAD";
         const char *limit = NULL;
-       int verbose = 0;
+       int verbose = 0, abbrev = 0;
  
-       if (argc > 1 && !strcmp(argv[1], "-v")) {
-               verbose = 1;
-               argc--;
-               argv++;
-       }
+       struct option options[] = {
+               OPT__ABBREV(&abbrev),
+               OPT__VERBOSE(&verbose),
+               OPT_END()
+       };
  
-       if (argc > 1 && !strcmp(argv[1], "-h"))
-               usage(cherry_usage);
+       argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
  
         switch (argc) {
-       case 4:
-               limit = argv[3];
-               /* FALLTHROUGH */
         case 3:
-               head = argv[2];
+               limit = argv[2];
                 /* FALLTHROUGH */
         case 2:
-               upstream = argv[1];
+               head = argv[1];
+               /* FALLTHROUGH */
+       case 1:
+               upstream = argv[0];
                 break;
         default:
                 current_branch = branch_get(NULL);
@@ -1344,7 +1350,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
                         fprintf(stderr, "Could not find a tracked"
                                         " remote branch, please"
                                         " specify <upstream> manually.\n");
-                       usage(cherry_usage);
+                       usage_with_options(cherry_usage, options);
                 }
  
                 upstream = current_branch->merge[0]->dst;
@@ -1397,12 +1403,13 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
                         pretty_print_commit(CMIT_FMT_ONELINE, commit,
                                             &buf, &ctx);
                         printf("%c %s %s\n", sign,
-                              sha1_to_hex(commit->object.sha1), buf.buf);
+                              find_unique_abbrev(commit->object.sha1, abbrev),
+                              buf.buf);
                         strbuf_release(&buf);
                 }
                 else {
                         printf("%c %s\n", sign,
-                              sha1_to_hex(commit->object.sha1));
+                              find_unique_abbrev(commit->object.sha1, abbrev));
                 }
  
                 list = list->next;