[PATCH v3 3/4] close the index lock when not writing the new index
Signed-off-by: Joel Teichroeb <joel@teichroeb.net>
---
builtin/add.c | 3 ++-
builtin/mv.c | 8 +++++---
builtin/rm.c | 3 ++-
merge-recursive.c | 8 +++++---
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 9f53f020d0..6b04eb2c71 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -461,7 +461,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (active_cache_changed) {
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("Unable to write new index file"));
- }
+ } else
+ rollback_lock_file(&lock_file);
return exit_status;
}
diff --git a/builtin/mv.c b/builtin/mv.c
index 61d20037ad..ccf21de17f 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -293,9 +293,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (gitmodules_modified)
stage_updated_gitmodules();
- if (active_cache_changed &&
- write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("Unable to write new index file"));
+ if (active_cache_changed) {
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+ die(_("Unable to write new index file"));
+ } else
+ rollback_lock_file(&lock_file);
return 0;
}
diff --git a/builtin/rm.c b/builtin/rm.c
index fb79dcab18..4c7a91888b 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -389,7 +389,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
if (active_cache_changed) {
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("Unable to write new index file"));
- }
+ } else
+ rollback_lock_file(&lock_file);
return 0;
}
diff --git a/merge-recursive.c b/merge-recursive.c
index 62decd51cc..db841c0d38 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2145,9 +2145,11 @@ int merge_recursive_generic(struct merge_options *o,
if (clean < 0)
return clean;
- if (active_cache_changed &&
- write_locked_index(&the_index, lock, COMMIT_LOCK))
- return err(o, _("Unable to write index."));
+ if (active_cache_changed) {
+ if (write_locked_index(&the_index, lock, COMMIT_LOCK))
+ return err(o, _("Unable to write index."));
+ } else
+ rollback_lock_file(lock);
return clean ? 0 : 1;
}
--
2.13.0
Joel Teichroeb <joel@teichroeb.net>