From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 15:44:02 +0000 (-0700)
Subject: Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1
X-Git-Tag: v1.8.1.6~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/64379806a9adaeaaa7971b7f8411105987ea6d42?ds=inline;hp=-c

Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1

* kk/revwalk-slop-too-many-commit-within-a-second:
Fix revision walk for commits with the same dates
---

64379806a9adaeaaa7971b7f8411105987ea6d42
diff --combined revision.c
index 95d21e6472,6a9a8b3c80..59b26c7e99
--- a/revision.c
+++ b/revision.c
@@@ -708,7 -708,7 +708,7 @@@ static int still_interesting(struct com
  	 * Does the destination list contain entries with a date
  	 * before the source list? Definitely _not_ done.
  	 */
- 	if (date < src->item->date)
+ 	if (date <= src->item->date)
  		return SLOP;
  
  	/*
@@@ -1603,8 -1603,6 +1603,8 @@@ static int handle_revision_opt(struct r
  		return argcount;
  	} else if (!strcmp(arg, "--grep-debug")) {
  		revs->grep_filter.debug = 1;
 +	} else if (!strcmp(arg, "--basic-regexp")) {
 +		grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
  	} else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
  		grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
  	} else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
@@@ -1612,8 -1610,6 +1612,8 @@@
  		DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
  	} else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
  		grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
 +	} else if (!strcmp(arg, "--perl-regexp")) {
 +		grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
  	} else if (!strcmp(arg, "--all-match")) {
  		revs->grep_filter.all_match = 1;
  	} else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
@@@ -2242,7 -2238,7 +2242,7 @@@ static int commit_match(struct commit *
  		if (!buf.len)
  			strbuf_addstr(&buf, commit->buffer);
  		format_display_notes(commit->object.sha1, &buf,
 -				     get_log_output_encoding(), 0);
 +				     get_log_output_encoding(), 1);
  	}
  
  	/* Find either in the commit object, or in the temporary */