Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
is_hfs_dotgit: match other .git files
[gitweb.git]
/
rerere.c
diff --git
a/rerere.c
b/rerere.c
index 5d083ca572df0c8a2cb90c0b12c14e15b4134d48..3bd55caf3b0961888bcca06d3c54577cb25f5223 100644
(file)
--- a/
rerere.c
+++ b/
rerere.c
@@
-708,7
+708,7
@@
static void update_paths(struct string_list *update)
{
int i;
- hold_locked_index(&index_lock,
1
);
+ hold_locked_index(&index_lock,
LOCK_DIE_ON_ERROR
);
for (i = 0; i < update->nr; i++) {
struct string_list_item *item = &update->items[i];