Teach git log --exit-code to return an appropriate exit code

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

index 430d87661e37a4b08963de1ee5c31b8143ebc373..3a7957483031758af5c05afc55a499e617557f1c 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -217,6 +217,11 @@ static int cmd_log_walk(struct rev_info *rev)
         if (rev->early_output)
                 finish_early_output(rev);
  
+       /*
+        * For --check and --exit-code, the exit code is based on CHECK_FAILED
+        * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
+        * retain that state information if replacing rev->diffopt in this loop
+        */
         while ((commit = get_revision(rev)) != NULL) {
                 log_tree_commit(rev, commit);
                 if (!rev->reflog_info) {
@@ -227,7 +232,11 @@ static int cmd_log_walk(struct rev_info *rev)
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
-       return 0;
+       if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
+           DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
+               return 02;
+       }
+       return diff_result_code(&rev->diffopt, 0);
  }
  
  static int git_log_config(const char *var, const char *value, void *cb)
@@ -313,7 +322,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 +375,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;
@@ -1082,7 +1091,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;