From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:15:58 +0000 (-0800)
Subject: Merge branch 'jc/peace-with-crlf'
X-Git-Tag: v2.8.0-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/017565525f969c26c43443d998a1283cac843d10?ds=inline;hp=-c

Merge branch 'jc/peace-with-crlf'

Many commands that read files that are expected to contain text
that is generated (or can be edited) by the end user to control
their behaviour (e.g. "git grep -f <filename>") have been updated
to be more tolerant to lines that are terminated with CRLF (they
used to treat such a line to contain payload that ends with CR,
which is usually not what the users expect).

* jc/peace-with-crlf:
test-sha1-array: read command stream with strbuf_getline()
grep: read -f file with strbuf_getline()
send-pack: read list of refs with strbuf_getline()
column: read lines with strbuf_getline()
cat-file: read batch stream with strbuf_getline()
transport-helper: read helper response with strbuf_getline()
clone/sha1_file: read info/alternates with strbuf_getline()
remote.c: read $GIT_DIR/remotes/* with strbuf_getline()
ident.c: read /etc/mailname with strbuf_getline()
rev-parse: read parseopt spec with strbuf_getline()
revision: read --stdin with strbuf_getline()
hash-object: read --stdin-paths with strbuf_getline()
---

017565525f969c26c43443d998a1283cac843d10
diff --combined builtin/clone.c
index 81e238f738,43b4c99b67..bcba0805e1
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@@ -339,7 -339,7 +339,7 @@@ static void copy_alternates(struct strb
  	FILE *in = fopen(src->buf, "r");
  	struct strbuf line = STRBUF_INIT;
  
- 	while (strbuf_getline_lf(&line, in) != EOF) {
+ 	while (strbuf_getline(&line, in) != EOF) {
  		char *abs_path;
  		if (!line.len || line.buf[0] == '#')
  			continue;
@@@ -636,11 -636,9 +636,11 @@@ static void update_remote_refs(const st
  		struct strbuf head_ref = STRBUF_INIT;
  		strbuf_addstr(&head_ref, branch_top);
  		strbuf_addstr(&head_ref, "HEAD");
 -		create_symref(head_ref.buf,
 -			      remote_head_points_at->peer_ref->name,
 -			      msg);
 +		if (create_symref(head_ref.buf,
 +				  remote_head_points_at->peer_ref->name,
 +				  msg) < 0)
 +			die("unable to update %s", head_ref.buf);
 +		strbuf_release(&head_ref);
  	}
  }
  
@@@ -650,8 -648,7 +650,8 @@@ static void update_head(const struct re
  	const char *head;
  	if (our && skip_prefix(our->name, "refs/heads/", &head)) {
  		/* Local default branch link */
 -		create_symref("HEAD", our->name, NULL);
 +		if (create_symref("HEAD", our->name, NULL) < 0)
 +			die("unable to update HEAD");
  		if (!option_bare) {
  			update_ref(msg, "HEAD", our->old_oid.hash, NULL, 0,
  				   UPDATE_REFS_DIE_ON_ERR);
diff --combined builtin/grep.c
index 6c030dad6b,801ce60e48..8c516a9543
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@@ -24,11 -24,11 +24,11 @@@ static char const * const grep_usage[] 
  	NULL
  };
  
 -static int use_threads = 1;
 +#define GREP_NUM_THREADS_DEFAULT 8
 +static int num_threads;
  
  #ifndef NO_PTHREADS
 -#define THREADS 8
 -static pthread_t threads[THREADS];
 +static pthread_t *threads;
  
  /* We use one producer thread and THREADS consumer
   * threads. The producer adds struct work_items to 'todo' and the
@@@ -63,13 -63,13 +63,13 @@@ static pthread_mutex_t grep_mutex
  
  static inline void grep_lock(void)
  {
 -	if (use_threads)
 +	if (num_threads)
  		pthread_mutex_lock(&grep_mutex);
  }
  
  static inline void grep_unlock(void)
  {
 -	if (use_threads)
 +	if (num_threads)
  		pthread_mutex_unlock(&grep_mutex);
  }
  
@@@ -206,8 -206,7 +206,8 @@@ static void start_threads(struct grep_o
  		strbuf_init(&todo[i].out, 0);
  	}
  
 -	for (i = 0; i < ARRAY_SIZE(threads); i++) {
 +	threads = xcalloc(num_threads, sizeof(*threads));
 +	for (i = 0; i < num_threads; i++) {
  		int err;
  		struct grep_opt *o = grep_opt_dup(opt);
  		o->output = strbuf_out;
@@@ -239,14 -238,12 +239,14 @@@ static int wait_all(void
  	pthread_cond_broadcast(&cond_add);
  	grep_unlock();
  
 -	for (i = 0; i < ARRAY_SIZE(threads); i++) {
 +	for (i = 0; i < num_threads; i++) {
  		void *h;
  		pthread_join(threads[i], &h);
  		hit |= (int) (intptr_t) h;
  	}
  
 +	free(threads);
 +
  	pthread_mutex_destroy(&grep_mutex);
  	pthread_mutex_destroy(&grep_read_mutex);
  	pthread_mutex_destroy(&grep_attr_mutex);
@@@ -270,14 -267,6 +270,14 @@@ static int grep_cmd_config(const char *
  	int st = grep_config(var, value, cb);
  	if (git_color_default_config(var, value, cb) < 0)
  		st = -1;
 +
 +	if (!strcmp(var, "grep.threads")) {
 +		num_threads = git_config_int(var, value);
 +		if (num_threads < 0)
 +			die(_("invalid number of threads specified (%d) for %s"),
 +			    num_threads, var);
 +	}
 +
  	return st;
  }
  
@@@ -305,7 -294,7 +305,7 @@@ static int grep_sha1(struct grep_opt *o
  	}
  
  #ifndef NO_PTHREADS
 -	if (use_threads) {
 +	if (num_threads) {
  		add_work(opt, GREP_SOURCE_SHA1, pathbuf.buf, path, sha1);
  		strbuf_release(&pathbuf);
  		return 0;
@@@ -334,7 -323,7 +334,7 @@@ static int grep_file(struct grep_opt *o
  		strbuf_addstr(&buf, filename);
  
  #ifndef NO_PTHREADS
 -	if (use_threads) {
 +	if (num_threads) {
  		add_work(opt, GREP_SOURCE_FILE, buf.buf, filename, filename);
  		strbuf_release(&buf);
  		return 0;
@@@ -386,7 -375,7 +386,7 @@@ static int grep_cache(struct grep_opt *
  
  	for (nr = 0; nr < active_nr; nr++) {
  		const struct cache_entry *ce = active_cache[nr];
 -		if (!S_ISREG(ce->ce_mode))
 +		if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce))
  			continue;
  		if (!ce_path_match(ce, pathspec, NULL))
  			continue;
@@@ -573,7 -562,7 +573,7 @@@ static int file_callback(const struct o
  	patterns = from_stdin ? stdin : fopen(arg, "r");
  	if (!patterns)
  		die_errno(_("cannot open '%s'"), arg);
- 	while (strbuf_getline_lf(&sb, patterns) == 0) {
+ 	while (strbuf_getline(&sb, patterns) == 0) {
  		/* ignore empty line like grep does */
  		if (sb.len == 0)
  			continue;
@@@ -708,8 -697,6 +708,8 @@@ int cmd_grep(int argc, const char **arg
  			N_("show <n> context lines before matches")),
  		OPT_INTEGER('A', "after-context", &opt.post_context,
  			N_("show <n> context lines after matches")),
 +		OPT_INTEGER(0, "threads", &num_threads,
 +			N_("use <n> worker threads")),
  		OPT_NUMBER_CALLBACK(&opt, N_("shortcut for -C NUM"),
  			context_callback),
  		OPT_BOOL('p', "show-function", &opt.funcname,
@@@ -768,15 -755,9 +768,15 @@@
  			     PARSE_OPT_STOP_AT_NON_OPTION);
  	grep_commit_pattern_type(pattern_type_arg, &opt);
  
 -	if (use_index && !startup_info->have_repository)
 -		/* die the same way as if we did it at the beginning */
 -		setup_git_directory();
 +	if (use_index && !startup_info->have_repository) {
 +		int fallback = 0;
 +		git_config_get_bool("grep.fallbacktonoindex", &fallback);
 +		if (fallback)
 +			use_index = 0;
 +		else
 +			/* die the same way as if we did it at the beginning */
 +			setup_git_directory();
 +	}
  
  	/*
  	 * skip a -- separator; we know it cannot be
@@@ -805,6 -786,7 +805,6 @@@
  		opt.output_priv = &path_list;
  		opt.output = append_path;
  		string_list_append(&path_list, show_in_pager);
 -		use_threads = 0;
  	}
  
  	if (!opt.pattern_list)
@@@ -835,18 -817,14 +835,18 @@@
  	}
  
  #ifndef NO_PTHREADS
 -	if (list.nr || cached || online_cpus() == 1)
 -		use_threads = 0;
 +	if (list.nr || cached || show_in_pager)
 +		num_threads = 0;
 +	else if (num_threads == 0)
 +		num_threads = GREP_NUM_THREADS_DEFAULT;
 +	else if (num_threads < 0)
 +		die(_("invalid number of threads specified (%d)"), num_threads);
  #else
 -	use_threads = 0;
 +	num_threads = 0;
  #endif
  
  #ifndef NO_PTHREADS
 -	if (use_threads) {
 +	if (num_threads) {
  		if (!(opt.name_only || opt.unmatch_name_only || opt.count)
  		    && (opt.pre_context || opt.post_context ||
  			opt.file_break || opt.funcbody))
@@@ -916,7 -894,7 +916,7 @@@
  		hit = grep_objects(&opt, &pathspec, &list);
  	}
  
 -	if (use_threads)
 +	if (num_threads)
  		hit |= wait_all();
  	if (hit && show_in_pager)
  		run_pager(&opt, prefix);