From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:09 +0000 (+0900)
Subject: Merge branch 'mg/timestamp-t-fix' into maint
X-Git-Tag: v2.15.0-rc2~5^2~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0445bd7b556283339bb4f07d11114ff8e50515af?hp=-c

Merge branch 'mg/timestamp-t-fix' into maint

A mismerge fix.

* mg/timestamp-t-fix:
name-rev: change ULONG_MAX to TIME_MAX
---

0445bd7b556283339bb4f07d11114ff8e50515af
diff --combined builtin/name-rev.c
index c41ea7c2a6,fff2ea7436..598da6c8bc
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@@ -1,6 -1,5 +1,6 @@@
  #include "builtin.h"
  #include "cache.h"
 +#include "config.h"
  #include "commit.h"
  #include "tag.h"
  #include "refs.h"
@@@ -17,7 -16,7 +17,7 @@@ typedef struct rev_name 
  	int from_tag;
  } rev_name;
  
 -static long cutoff = LONG_MAX;
 +static timestamp_t cutoff = TIME_MAX;
  
  /* How many generations are maximally preferred over _one_ merge traversal? */
  #define MERGE_TRAVERSAL_WEIGHT 65535
@@@ -130,7 -129,7 +130,7 @@@ static int subpath_matches(const char *
  	const char *subpath = path;
  
  	while (subpath) {
 -		if (!wildmatch(filter, subpath, 0, NULL))
 +		if (!wildmatch(filter, subpath, 0))
  			return subpath - path;
  		subpath = strchr(subpath, '/');
  		if (subpath)
@@@ -253,7 -252,7 +253,7 @@@ static int name_ref(const char *path, c
  		struct commit *commit = (struct commit *)o;
  		int from_tag = starts_with(path, "refs/tags/");
  
- 		if (taggerdate == ULONG_MAX)
+ 		if (taggerdate == TIME_MAX)
  			taggerdate = ((struct commit *)o)->date;
  		path = name_ref_abbrev(path, can_abbreviate_output);
  		name_rev(commit, xstrdup(path), taggerdate, 0, 0,