From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Aug 2008 06:42:29 +0000 (-0700)
Subject: Merge branch 'pm/log-exit-code'
X-Git-Tag: v1.6.1-rc1~326
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/299c3714d433b0427a49a10977cc021c52f0aeb8?ds=inline;hp=-c

Merge branch 'pm/log-exit-code'

* pm/log-exit-code:
Teach git log --exit-code to return an appropriate exit code
Teach git log --check to return an appropriate exit code
---

299c3714d433b0427a49a10977cc021c52f0aeb8
diff --combined builtin-log.c
index 911fd65990,3a79574830..9204ffd760
--- a/builtin-log.c
+++ b/builtin-log.c
@@@ -217,6 -217,11 +217,11 @@@ static int cmd_log_walk(struct rev_inf
  	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 +232,11 @@@
  		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)
@@@ -461,7 -470,7 +470,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);