From: "Martin Ågren" <martin.agren@gmail.com>
To: Joel Teichroeb <joel@teichroeb.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Thomas Gummerer <t.gummerer@gmail.com>, Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 1/2] merge: close the index lock when not writing the new index
Date: Mon, 13 Nov 2017 22:12:35 +0100 [thread overview]
Message-ID: <CAN0heSrFdGQ9469ugQwmjP5ieoxb5NCR3Kpz6ZQ4J5TyarwQ6w@mail.gmail.com> (raw)
In-Reply-To: <20171110231314.30711-2-joel@teichroeb.net>
On 11 November 2017 at 00:13, Joel Teichroeb <joel@teichroeb.net> wrote:
> If the merge does not have anything to do, it does not unlock the index,
> causing any further index operations to fail. Thus, always unlock the index
> regardless of outcome.
> if (clean < 0)
> return clean;
Do we need to roll back the lock also if `clean` is negative? The
current callers are built-ins which will error out, but future callers
might be caught off guard by this.
> - 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;
> }
Looks correct. A simpler change which would still match the commit
message would be to unconditionally call `rollback_lock_file()` just
before returning. That would perhaps be slightly more future-proof,
since it will always leave the lock unlocked, even if the if-else grows
more complicated.
Well, "always" modulo returning early and forgetting to roll back the
lock. ;-) Looking at existing code, it's not obvious which way we should
prefer. Just a thought.
Thanks for spotting this. I was poking around here recently, but failed
to notice this lax lock-handling.
Martin
next prev parent reply other threads:[~2017-11-13 21:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 23:13 [PATCH 0/2] Convert some stash functionality to a builtin Joel Teichroeb
2017-11-10 23:13 ` [PATCH 1/2] merge: close the index lock when not writing the new index Joel Teichroeb
2017-11-13 21:12 ` Martin Ågren [this message]
2017-11-10 23:13 ` [PATCH 2/2] stash: implement builtin stash helper Joel Teichroeb
2017-11-12 15:27 ` Thomas Gummerer
2017-11-12 17:21 ` 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=CAN0heSrFdGQ9469ugQwmjP5ieoxb5NCR3Kpz6ZQ4J5TyarwQ6w@mail.gmail.com \
--to=martin.agren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=joel@teichroeb.net \
--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).