From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:15 +0000 (-0700)
Subject: Merge branch 'cb/fsmonitor-intfix' into maint
X-Git-Tag: v2.23.0-rc0~1^2~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea219657a3a3bc10058a8fc623056fa83e231d03

Merge branch 'cb/fsmonitor-intfix' into maint

Variable type fix.

* cb/fsmonitor-intfix:
fsmonitor: avoid signed integer overflow / infinite loop
---

ea219657a3a3bc10058a8fc623056fa83e231d03
diff --cc fsmonitor.c
index 1dee0aded1,df55d9dc22..231e83a94d
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@@ -134,11 -135,11 +134,11 @@@ void refresh_fsmonitor(struct index_sta
  	size_t bol; /* beginning of line */
  	uint64_t last_update;
  	char *buf;
- 	int i;
+ 	unsigned int i;
  
 -	if (!core_fsmonitor || has_run_once)
 +	if (!core_fsmonitor || istate->fsmonitor_has_run_once)
  		return;
 -	has_run_once = 1;
 +	istate->fsmonitor_has_run_once = 1;
  
  	trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
  	/*