Thread (4 messages) 4 messages, 2 authors, 2016-06-15

[PATCH 2/2] Loop index increases monotonically when reading unmerged entries

flat view
DORMANTno replies

From: Jaime Soriano Pastor <hidden>
Date: 2016-06-15 23:02:20
Subsystem: the rest · Maintainer: Linus Torvalds

Possibly related (same subject, not in this thread)

Signed-off-by: Jaime Soriano Pastor <redacted>
---
 read-cache.c | 1 -
 1 file changed, 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index c1a9619..3d70386 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1971,7 +1971,6 @@ int read_index_unmerged(struct index_state *istate)
 		if (add_index_entry(istate, new_ce, 0))
 			return error("%s: cannot drop to stage #0",
 				     new_ce->name);
-		i = index_name_pos(istate, new_ce->name, len);
 	}
 	return unmerged;
 }
-- 
2.0.4.1.g0b8a4f9.dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help