Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:44:02 +0000 (08:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:44:02 +0000 (08:44 -0700)
* kk/revwalk-slop-too-many-commit-within-a-second:
Fix revision walk for commits with the same dates

1  2 
revision.c
diff --combined revision.c
index 95d21e6472921ab993373ef1848357379440d46e,6a9a8b3c8066cb0d3f536c1a3bf861ab16da8179..59b26c7e99724a7589bc3fcc37486ee3d1bb2ef5
@@@ -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")) {
                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 */