From: Jeff King <peff@peff.net>
Date: Fri, 9 Nov 2012 17:51:06 +0000 (-0500)
Subject: Merge branch 'nd/builtin-to-libgit'
X-Git-Tag: v1.8.1-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/19fb61369583410a4f79dbc065b4dc8125236c0b?ds=inline;hp=-c

Merge branch 'nd/builtin-to-libgit'

Code cleanups so that libgit.a does not depend on anything in the
builtin/ directory.

* nd/builtin-to-libgit:
fetch-pack: move core code to libgit.a
fetch-pack: remove global (static) configuration variable "args"
send-pack: move core code to libgit.a
Move setup_diff_pager to libgit.a
Move print_commit_list to libgit.a
Move estimate_bisect_steps to libgit.a
Move try_merge_command and checkout_fast_forward to libgit.a
---

19fb61369583410a4f79dbc065b4dc8125236c0b
diff --combined diff.c
index 7fef69d85c,135ba0d654..e89a2015eb
--- a/diff.c
+++ b/diff.c
@@@ -15,7 -15,6 +15,7 @@@
  #include "sigchain.h"
  #include "submodule.h"
  #include "ll-merge.h"
 +#include "string-list.h"
  
  #ifdef NO_FAST_WORKING_DIRECTORY
  #define FAST_WORKING_DIRECTORY 0
@@@ -70,30 -69,26 +70,30 @@@ static int parse_diff_color_slot(const 
  	return -1;
  }
  
 -static int parse_dirstat_params(struct diff_options *options, const char *params,
 +static int parse_dirstat_params(struct diff_options *options, const char *params_string,
  				struct strbuf *errmsg)
  {
 -	const char *p = params;
 -	int p_len, ret = 0;
 +	char *params_copy = xstrdup(params_string);
 +	struct string_list params = STRING_LIST_INIT_NODUP;
 +	int ret = 0;
 +	int i;
  
 -	while (*p) {
 -		p_len = strchrnul(p, ',') - p;
 -		if (!memcmp(p, "changes", p_len)) {
 +	if (*params_copy)
 +		string_list_split_in_place(&params, params_copy, ',', -1);
 +	for (i = 0; i < params.nr; i++) {
 +		const char *p = params.items[i].string;
 +		if (!strcmp(p, "changes")) {
  			DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
  			DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
 -		} else if (!memcmp(p, "lines", p_len)) {
 +		} else if (!strcmp(p, "lines")) {
  			DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
  			DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
 -		} else if (!memcmp(p, "files", p_len)) {
 +		} else if (!strcmp(p, "files")) {
  			DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
  			DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
 -		} else if (!memcmp(p, "noncumulative", p_len)) {
 +		} else if (!strcmp(p, "noncumulative")) {
  			DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
 -		} else if (!memcmp(p, "cumulative", p_len)) {
 +		} else if (!strcmp(p, "cumulative")) {
  			DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
  		} else if (isdigit(*p)) {
  			char *end;
@@@ -105,21 -100,24 +105,21 @@@
  				while (isdigit(*++end))
  					; /* nothing */
  			}
 -			if (end - p == p_len)
 +			if (!*end)
  				options->dirstat_permille = permille;
  			else {
 -				strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%.*s'\n"),
 -					    p_len, p);
 +				strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%s'\n"),
 +					    p);
  				ret++;
  			}
  		} else {
 -			strbuf_addf(errmsg, _("  Unknown dirstat parameter '%.*s'\n"),
 -				    p_len, p);
 +			strbuf_addf(errmsg, _("  Unknown dirstat parameter '%s'\n"), p);
  			ret++;
  		}
  
 -		p += p_len;
 -
 -		if (*p)
 -			p++; /* more parameters, swallow separator */
  	}
 +	string_list_clear(&params, 0);
 +	free(params_copy);
  	return ret;
  }
  
@@@ -4880,3 -4878,19 +4880,19 @@@ size_t fill_textconv(struct userdiff_dr
  
  	return size;
  }
+ 
+ void setup_diff_pager(struct diff_options *opt)
+ {
+ 	/*
+ 	 * If the user asked for our exit code, then either they want --quiet
+ 	 * or --exit-code. We should definitely not bother with a pager in the
+ 	 * former case, as we will generate no output. Since we still properly
+ 	 * report our exit code even when a pager is run, we _could_ run a
+ 	 * pager with --exit-code. But since we have not done so historically,
+ 	 * and because it is easy to find people oneline advising "git diff
+ 	 * --exit-code" in hooks and other scripts, we do not do so.
+ 	 */
+ 	if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
+ 	    check_pager_config("diff") != 0)
+ 		setup_pager();
+ }