From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/4] create_symref: use existing ref-lock code
Date: Mon, 21 Dec 2015 19:58:24 -0500 [thread overview]
Message-ID: <20151222005824.GB6901@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq8u4nfrvv.fsf@gitster.mtv.corp.google.com>
On Mon, Dec 21, 2015 at 12:50:28PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > #ifndef NO_SYMLINK_HEAD
> > - if (prefer_symlink_refs) {
> > - unlink(ref_path);
> > - if (!symlink(target, ref_path))
> > - goto done;
>
> I see that the original was sloppy (most certainly my bad) ...
>
> > + char *ref_path = get_locked_file_path(lock->lk);
> > + unlink(ref_path);
>
> ... and you inherited that. I see a few seemingly related helpers
> in wrapper.c, but none looks useful in this context X-<.
>
> if (unlink_or_warn(ref_path))
> return -1;
>
> is close enough, but it still lets the caller fallback to textual
> symref.
I don't think the original is _wrong_; it's meant to be "unlink if
needed", and the symlink call is what we really care about (if our
unlink failed for anything but ENOENT, the symlink will, too). But I
agree unlink_or_warn should do that and give us a nice warning (and
cover up ENOENT). To fall through, I think we just want (in the
original):
if (!unlink_or_warn(ref_path) && !symlink(target, ref_path))
goto done;
and in mine that becomes:
int ret = -1;
...
if (!unlink_or_warn(ref_path) && !symlink(target, ref_path))
ret = 0;
I must confess I considered a follow-on patch to drop the
prefer_symlink_refs code path completely. I'm surprised it all still
works with packed-refs, etc, but resolve_ref does take special care to
use readlink().
-Peff
next prev parent reply other threads:[~2015-12-22 0:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 7:26 [PATCH 0/4] improve symbolic-ref robustness Jeff King
2015-12-20 7:27 ` [PATCH 1/4] symbolic-ref: propagate error code from create_symref() Jeff King
2015-12-20 7:27 ` [PATCH 2/4] t1401: test reflog creation for git-symbolic-ref Jeff King
2015-12-20 7:29 ` [PATCH 3/4] create_symref: modernize variable names Jeff King
2015-12-28 8:20 ` Michael Haggerty
2015-12-29 5:02 ` Jeff King
2015-12-20 7:34 ` [PATCH 4/4] create_symref: use existing ref-lock code Jeff King
2015-12-21 20:50 ` Junio C Hamano
2015-12-22 0:58 ` Jeff King [this message]
2015-12-28 9:45 ` Michael Haggerty
2015-12-29 5:02 ` Jeff King
2015-12-29 5:41 ` Jeff King
2015-12-29 5:55 ` [PATCH v2 0/3] improve symbolic-ref robustness Jeff King
2015-12-29 5:56 ` [PATCH 1/3] create_symref: modernize variable names Jeff King
2015-12-29 5:57 ` [PATCH 2/3] create_symref: use existing ref-lock code Jeff King
2015-12-29 5:57 ` [PATCH 3/3] create_symref: write reflog while holding lock Jeff King
2015-12-29 6:00 ` [RFC/PATCH 4/3] create_symref: drop support for writing symbolic links Jeff King
2015-12-29 6:03 ` Jeff King
2015-12-29 18:32 ` Junio C Hamano
2015-12-30 6:53 ` Jeff King
2015-12-30 6:56 ` Jeff King
2015-12-29 8:25 ` [PATCH v2 0/3] improve symbolic-ref robustness Michael Haggerty
2015-12-29 18:35 ` Junio C Hamano
2015-12-29 21:24 ` Junio C Hamano
2015-12-30 6:57 ` Jeff King
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=20151222005824.GB6901@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).