Teach git log --exit-code to return an appropriate exit code
authorPeter Valdemar Mørch <peter@morch.com>
Mon, 11 Aug 2008 06:46:25 +0000 (08:46 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Aug 2008 23:26:26 +0000 (16:26 -0700)
Signed-off-by: Peter Valdemar Mørch <peter@morch.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-log.c
log-tree.c

index ae71540..3a79574 100644 (file)
@@ -218,9 +218,9 @@ static int cmd_log_walk(struct rev_info *rev)
                finish_early_output(rev);
 
        /*
                finish_early_output(rev);
 
        /*
-        * For --check, the exit code is based on CHECK_FAILED being
-        * accumulated in rev->diffopt, so be careful to retain that state
-        * information if replacing rev->diffopt in this loop
+        * 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);
         */
        while ((commit = get_revision(rev)) != NULL) {
                log_tree_commit(rev, commit);
@@ -236,7 +236,7 @@ static int cmd_log_walk(struct rev_info *rev)
            DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
                return 02;
        }
            DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
                return 02;
        }
-       return 0;
+       return diff_result_code(&rev->diffopt, 0);
 }
 
 static int git_log_config(const char *var, const char *value, void *cb)
 }
 
 static int git_log_config(const char *var, const char *value, void *cb)
index bd8b9e4..30cd5bb 100644 (file)
@@ -432,7 +432,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
        struct commit_list *parents;
        unsigned const char *sha1 = commit->object.sha1;
 
        struct commit_list *parents;
        unsigned const char *sha1 = commit->object.sha1;
 
-       if (!opt->diff)
+       if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
                return 0;
 
        /* Root commit? */
                return 0;
 
        /* Root commit? */