From: Joel Teichroeb <joel@teichroeb.net>
To: git@vger.kernel.org, t.gummerer@gmail.com, peff@peff.net,
Johannes.Schindelin@gmx.de
Cc: Joel Teichroeb <joel@teichroeb.net>
Subject: [PATCH v3 3/4] close the index lock when not writing the new index
Date: Sun, 28 May 2017 09:56:41 -0700 [thread overview]
Message-ID: <20170528165642.14699-4-joel@teichroeb.net> (raw)
In-Reply-To: <20170528165642.14699-1-joel@teichroeb.net>
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
next prev parent reply other threads:[~2017-05-28 16:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-28 16:56 [PATCH v3 0/4] Implement git stash as a builtin command Joel Teichroeb
2017-05-28 16:56 ` [PATCH v3 1/4] stash: add test for stash create with no files Joel Teichroeb
2017-05-28 17:45 ` Ævar Arnfjörð Bjarmason
2017-05-29 6:35 ` Junio C Hamano
2017-05-28 16:56 ` [PATCH v3 2/4] stash: add test for stashing in a detached state Joel Teichroeb
2017-05-28 17:57 ` Ævar Arnfjörð Bjarmason
2017-05-29 6:41 ` Junio C Hamano
2017-05-28 16:56 ` Joel Teichroeb [this message]
2017-05-28 17:46 ` [PATCH v3 3/4] close the index lock when not writing the new index Ævar Arnfjörð Bjarmason
2017-05-29 6:46 ` Junio C Hamano
2017-05-28 16:56 ` [PATCH v3 4/4] stash: implement builtin stash Joel Teichroeb
2017-05-28 17:56 ` Christian Couder
2017-05-28 18:26 ` Ævar Arnfjörð Bjarmason
2017-05-28 18:31 ` Joel Teichroeb
2017-05-28 19:26 ` Jeff King
2017-05-28 18:51 ` Ævar Arnfjörð Bjarmason
2017-05-28 19:21 ` Jeff King
2017-05-29 18:18 ` Joel Teichroeb
2017-05-29 18:26 ` Ævar Arnfjörð Bjarmason
2017-06-01 3:29 ` Joel Teichroeb
2017-06-01 4:07 ` Jeff King
2017-05-29 7:16 ` Junio C Hamano
2017-05-28 19:08 ` [PATCH v3 0/4] Implement git stash as a builtin command Ævar Arnfjörð Bjarmason
2017-10-23 11:09 ` Johannes Schindelin
2017-10-23 18:35 ` Joel Teichroeb
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170528165642.14699-4-joel@teichroeb.net \
--to=joel@teichroeb.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=t.gummerer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).