From: Michael Haggerty <mhagger@alum.mit.edu>
To: Ronnie Sahlberg <sahlberg@google.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 0/2] add a reflog_exists and delete_reflog abstraction
Date: Wed, 07 May 2014 13:56:52 +0200 [thread overview]
Message-ID: <536A1F84.8020902@alum.mit.edu> (raw)
In-Reply-To: <1399416353-31817-1-git-send-email-sahlberg@google.com>
On 05/07/2014 12:45 AM, Ronnie Sahlberg wrote:
> This is a series adds two new functions to try to hide the reflog
> implementation details from the callers in checkout.c and reflog.c.
> It adds new functions to test if a reflog exists and to delete it, thus
> allowing checkout.c to perform this if-test-then-delete operation without
> having to know the internal implementation of reflogs (i.e. that they are files
> that live under .git/logs)
>
> Additionally we change checkout.c to use ref_exists instead of file_exists
> when checking for ref existence. This fixes a bug when checkout could delete
> a valid reflog file if the branch was a packed ref. The tests have been updated
> to test for this bug.
>
>
> Version 2:
> - Typos and fixes suggested by mhagger.
> - Break the checkout-deletes reflog bugfix out into a separate patch.
>
>
> Ronnie Sahlberg (2):
> refs.c: add new functions reflog_exists and delete_reflog
> checkout.c: use ref_exists instead of file_exist
>
> builtin/checkout.c | 8 ++------
> builtin/reflog.c | 2 +-
> refs.c | 21 +++++++++++++++------
> refs.h | 6 ++++++
> t/t1410-reflog.sh | 8 ++++++++
> 5 files changed, 32 insertions(+), 13 deletions(-)
+1 Looks good to me. Thanks!
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2014-05-07 11:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-06 22:45 [PATCH v2 0/2] add a reflog_exists and delete_reflog abstraction Ronnie Sahlberg
2014-05-06 22:45 ` [PATCH v2 1/2] refs.c: add new functions reflog_exists and delete_reflog Ronnie Sahlberg
2014-05-06 22:45 ` [PATCH v2 2/2] checkout.c: use ref_exists instead of file_exist Ronnie Sahlberg
2014-05-07 11:56 ` Michael Haggerty [this message]
2014-05-07 20:17 ` [PATCH v2 0/2] add a reflog_exists and delete_reflog abstraction Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=536A1F84.8020902@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=sahlberg@google.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.