Merge pull request #184 from kasal/master

rebased on v1.9.3

Author: dscho

builtin/grep.c

@@ -18,7 +18,6 @@
 #include "quote.h"
 #include "dir.h"
 #include "pathspec.h"
-#include "attr.h"
 
 static char const * const grep_usage[] = {
 	N_("git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"),
@@ -164,22 +163,6 @@ static void work_done(struct work_item *w)
 	grep_unlock();
 }
 
-static int skip_binary(struct grep_opt *opt, const char *filename)
-{
-	if ((opt->binary & GREP_BINARY_NOMATCH)) {
-		static struct git_attr *attr_text;
-		struct git_attr_check check;
-
-		if (!attr_text)
-			attr_text = git_attr("text");
-		memset(&check, 0, sizeof(check));
-		check.attr = attr_text;
-		return !git_check_attr(filename, 1, &check) &&
-				ATTR_FALSE(check.value);
-	}
-	return 0;
-}
-
 static void *run(void *arg)
 {
 	int hit = 0;
@@ -190,9 +173,6 @@ static void *run(void *arg)
 		if (!w)
 			break;
 
-		if (skip_binary(opt, (const char *)w->source.identifier))
-			continue;
-
 		opt->output_priv = w;
 		hit |= grep_source(opt, &w->source);
 		grep_source_clear_data(&w->source);
@@ -401,9 +381,6 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
 			continue;
 		if (!ce_path_match(ce, pathspec, NULL))
 			continue;
-		if (skip_binary(opt, ce->name))
-			continue;
-
 		/*
 		 * If CE_VALID is on, we assume worktree file and its cache entry
 		 * are identical, even if worktree file has been modified, so use
@@ -828,8 +805,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		string_list_append(&path_list, show_in_pager);
 		use_threads = 0;
 	}
-	if ((opt.binary & GREP_BINARY_NOMATCH))
-		use_threads = 0;
 
 	if (!opt.pattern_list)
 		die(_("no pattern given."));
@@ -900,7 +875,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			pager += len - 4;
 
 		if (opt.ignore_case && !strcmp("less", pager))
-			string_list_append(&path_list, "-i");
+			string_list_append(&path_list, "-I");
 
 		if (!strcmp("less", pager) || !strcmp("vi", pager)) {
 			struct strbuf buf = STRBUF_INIT;

builtin/tag.c

@@ -73,11 +73,17 @@ static int in_commit_list(const struct commit_list *want, struct commit *c)
 	return 0;
 }
 
+enum contains_result {
+	CONTAINS_UNKNOWN = -1,
+	CONTAINS_NO = 0,
+	CONTAINS_YES = 1,
+};
+
 /*
  * Test whether the candidate or one of its parents is contained in the list.
  * Do not recurse to find out, though, but return -1 if inconclusive.
  */
-static int contains_test(struct commit *candidate,
+static enum contains_result contains_test(struct commit *candidate,
 			    const struct commit_list *want)
 {
 	/* was it previously marked as containing a want commit? */
@@ -121,12 +127,13 @@ static void push_to_stack(struct commit *candidate, struct stack *stack)
 	stack->stack[index].parents = candidate->parents;
 }
 
-static int contains(struct commit *candidate, const struct commit_list *want)
+static enum contains_result contains(struct commit *candidate,
+		const struct commit_list *want)
 {
 	struct stack stack = { 0, 0, NULL };
 	int result = contains_test(candidate, want);
 
-	if (result >= 0)
+	if (result != CONTAINS_UNKNOWN)
 		return result;
 
 	push_to_stack(candidate, &stack);
@@ -136,22 +143,22 @@ static int contains(struct commit *candidate, const struct commit_list *want)
 		struct commit_list *parents = entry->parents;
 
 		if (!parents) {
-			commit->object.flags = UNINTERESTING;
+			commit->object.flags |= UNINTERESTING;
 			stack.nr--;
 		}
 		/*
 		 * If we just popped the stack, parents->item has been marked,
 		 * therefore contains_test will return a meaningful 0 or 1.
 		 */
 		else switch (contains_test(parents->item, want)) {
-		case 1:
+		case CONTAINS_YES:
 			commit->object.flags |= TMP_MARK;
 			stack.nr--;
 			break;
-		case 0:
+		case CONTAINS_NO:
 			entry->parents = parents->next;
 			break;
-		default:
+		case CONTAINS_UNKNOWN:
 			push_to_stack(parents->item, &stack);
 			break;
 		}

compat/poll/poll.c

@@ -605,9 +605,7 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
 
   if (!rc && timeout == INFTIM)
     {
-      /* Sleep 1 millisecond to avoid busy wait */
-      SleepEx(1, TRUE);
-
+      SleepEx (1, TRUE);
       goto restart;
     }
 

t/t7004-tag.sh

@@ -1380,12 +1380,17 @@ test_expect_success 'multiple --points-at are OR-ed together' '
 	test_cmp expect actual
 '
 
->expect
-# ulimit is a bash builtin; we can rely on that in MinGW, but nowhere else
-test_expect_success MINGW '--contains works in a deep repo' '
-	ulimit -s 64
+run_with_limited_stack () {
+	(ulimit -s 64 && "$@")
+}
+
+test_lazy_prereq ULIMIT 'run_with_limited_stack true'
+
+# we require ulimit, this excludes Windows
+test_expect_success ULIMIT '--contains works in a deep repo' '
+	>expect &&
 	i=1 &&
-	while test $i -lt 1000
+	while test $i -lt 4000
 	do
 		echo "commit refs/heads/master
 committer A U Thor <[email protected]> $((1000000000 + $i * 100)) +0200
@@ -1397,7 +1402,7 @@ EOF"
 	done | git fast-import &&
 	git checkout master &&
 	git tag far-far-away HEAD^ &&
-	git tag --contains HEAD >actual &&
+	run_with_limited_stack git tag --contains HEAD >actual &&
 	test_cmp expect actual
 '