From: Junio C Hamano <gitster@pobox•com>
To: David Turner <dturner@twopensource•com>
Cc: git@vger•kernel.org, mhagger@alum•mit.edu
Subject: Re: [PATCH v3 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
Date: Fri, 26 Jun 2015 14:42:29 -0700 [thread overview]
Message-ID: <xmqqy4j6rvsq.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435278548-3790-2-git-send-email-dturner@twopensource.com> (David Turner's message of "Thu, 25 Jun 2015 20:29:03 -0400")
David Turner <dturner@twopensource•com> writes:
> Instead of directly writing to and reading from files in
> $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD
> and REVERT_HEAD.
> ...
> diff --git a/sequencer.c b/sequencer.c
> index f8421a8..de904aa 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -160,19 +160,20 @@ static void free_message(struct commit *commit, struct commit_message *msg)
>
> static void write_cherry_pick_head(struct commit *commit, const char *pseudoref)
I guess this is no longer "pseudoref"?
> @@ -878,8 +879,8 @@ static int rollback_single_pick(void)
> {
> unsigned char head_sha1[20];
>
> - if (!file_exists(git_path("CHERRY_PICK_HEAD")) &&
> - !file_exists(git_path("REVERT_HEAD")))
> + if (read_ref("CHERRY_PICK_HEAD", head_sha1) &&
> + read_ref("REVERT_HEAD", head_sha1))
> return error(_("no cherry-pick or revert in progress"));
> if (read_ref_full("HEAD", 0, head_sha1, NULL))
> return error(_("cannot resolve HEAD"));
I would have expected that you would use ref_exists() here; you are
not reading "HEAD" yet writing it into head_sha1[], and not using
the value of the ref.
Other than that, looked very sensible. Thanks.
next prev parent reply other threads:[~2015-06-26 21:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 0:29 [PATCH v3 1/7] refs.c: add err arguments to reflog functions David Turner
2015-06-26 0:29 ` [PATCH v3 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs David Turner
2015-06-26 21:42 ` Junio C Hamano [this message]
2015-06-26 0:29 ` [PATCH v3 3/7] bisect: treat BISECT_HEAD as a ref David Turner
2015-06-26 21:46 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 4/7] refs: Break out check for reflog autocreation David Turner
2015-06-26 22:01 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 5/7] refs: add safe_create_reflog function David Turner
2015-06-26 22:12 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 6/7] git-reflog: add create and exists functions David Turner
2015-06-26 0:29 ` [PATCH v3 7/7] git-stash: use git-reflog instead of creating files David Turner
2015-06-26 22:14 ` 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=xmqqy4j6rvsq.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox