From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:38 +0000 (-0700)
Subject: Merge branch 'cb/fsmonitor-intfix'
X-Git-Tag: v2.23.0-rc0~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ceca45541d0046544cc95acb6b849c14637e0e3e?hp=-c

Merge branch 'cb/fsmonitor-intfix'

Variable type fix.

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

ceca45541d0046544cc95acb6b849c14637e0e3e
diff --combined fsmonitor.c
index 1dee0aded1,df55d9dc22..231e83a94d
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@@ -56,7 -56,7 +56,7 @@@ int read_fsmonitor_extension(struct ind
  
  void fill_fsmonitor_bitmap(struct index_state *istate)
  {
- 	int i;
+ 	unsigned int i;
  	istate->fsmonitor_dirty = ewah_new();
  	for (i = 0; i < istate->cache_nr; i++)
  		if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
@@@ -129,16 -129,17 +129,16 @@@ static void fsmonitor_refresh_callback(
  
  void refresh_fsmonitor(struct index_state *istate)
  {
 -	static int has_run_once = 0;
  	struct strbuf query_result = STRBUF_INIT;
  	int query_success = 0;
  	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");
  	/*
@@@ -192,7 -193,7 +192,7 @@@
  
  void add_fsmonitor(struct index_state *istate)
  {
- 	int i;
+ 	unsigned int i;
  
  	if (!istate->fsmonitor_last_update) {
  		trace_printf_key(&trace_fsmonitor, "add fsmonitor");
@@@ -225,7 -226,7 +225,7 @@@ void remove_fsmonitor(struct index_stat
  
  void tweak_fsmonitor(struct index_state *istate)
  {
- 	int i;
+ 	unsigned int i;
  	int fsmonitor_enabled = git_config_get_fsmonitor();
  
  	if (istate->fsmonitor_dirty) {