From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, sunshine@sunshineco.com,
philipoakley@iee.org, David Turner <dturner@twopensource.com>
Subject: [PATCH v3 6/6] sequencer: replace write_cherry_pick_head with update_ref
Date: Tue, 28 Jul 2015 14:12:24 -0400 [thread overview]
Message-ID: <1438107144-24293-7-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1438107144-24293-1-git-send-email-dturner@twopensource.com>
Now update_ref (via write_pseudoref) does almost exactly what
write_cherry_pick_head did, so we can remove write_cherry_pick_head
and just use update_ref.
Signed-off-by: David Turner <dturner@twopensource.com>
---
sequencer.c | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index c4f4b7d..554a704 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -158,23 +158,6 @@ static void free_message(struct commit *commit, struct commit_message *msg)
unuse_commit_buffer(commit, msg->message);
}
-static void write_cherry_pick_head(struct commit *commit, const char *pseudoref)
-{
- const char *filename;
- int fd;
- struct strbuf buf = STRBUF_INIT;
-
- strbuf_addf(&buf, "%s\n", sha1_to_hex(commit->object.sha1));
-
- filename = git_path("%s", pseudoref);
- fd = open(filename, O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
- die_errno(_("Could not open '%s' for writing"), filename);
- if (write_in_full(fd, buf.buf, buf.len) != buf.len || close(fd))
- die_errno(_("Could not write to '%s'"), filename);
- strbuf_release(&buf);
-}
-
static void print_advice(int show_hint, struct replay_opts *opts)
{
char *msg = getenv("GIT_CHERRY_PICK_HELP");
@@ -607,9 +590,11 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
* write it at all.
*/
if (opts->action == REPLAY_PICK && !opts->no_commit && (res == 0 || res == 1))
- write_cherry_pick_head(commit, "CHERRY_PICK_HEAD");
+ update_ref(NULL, "CHERRY_PICK_HEAD", commit->object.sha1, NULL,
+ REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
if (opts->action == REPLAY_REVERT && ((opts->no_commit && res == 0) || res == 1))
- write_cherry_pick_head(commit, "REVERT_HEAD");
+ update_ref(NULL, "REVERT_HEAD", commit->object.sha1, NULL,
+ REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
if (res) {
error(opts->action == REPLAY_REVERT
--
2.0.4.315.gad8727a-twtrsrc
next prev parent reply other threads:[~2015-07-28 18:13 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 18:12 [PATCH v3 0/6] pseudorefs David Turner
2015-07-28 18:12 ` [PATCH v3 1/6] refs: Introduce pseudoref and per-worktree ref concepts David Turner
2015-07-28 18:12 ` [PATCH v3 2/6] notes: replace pseudorefs with real refs David Turner
2015-07-28 19:00 ` Junio C Hamano
2015-07-28 19:24 ` David Turner
2015-07-28 19:44 ` Junio C Hamano
2015-07-28 21:23 ` [PATCH] notes: handle multiple worktrees David Turner
2015-07-28 21:42 ` David Turner
2015-07-28 22:00 ` Junio C Hamano
2015-07-28 22:12 ` Junio C Hamano
2015-07-28 22:50 ` Johan Herland
2015-08-03 13:27 ` Duy Nguyen
2015-07-28 22:17 ` Eric Sunshine
2015-07-28 22:38 ` [PATCH v3 2/6] notes: replace pseudorefs with real refs Johan Herland
2015-07-28 22:52 ` Junio C Hamano
2015-07-28 23:43 ` Johan Herland
2015-07-29 0:33 ` Junio C Hamano
2015-07-29 0:56 ` Michael Haggerty
2015-07-29 1:23 ` Jacob Keller
2015-07-29 1:24 ` Johan Herland
2015-07-29 2:25 ` Junio C Hamano
2015-07-29 2:00 ` Junio C Hamano
2015-07-29 2:53 ` Johan Herland
2015-07-29 5:00 ` Junio C Hamano
2015-07-29 2:34 ` Johan Herland
2015-07-29 5:01 ` Junio C Hamano
2015-07-29 13:19 ` Johan Herland
2015-07-29 16:37 ` Junio C Hamano
2015-07-29 16:58 ` Junio C Hamano
2015-07-30 6:05 ` Johan Herland
2015-07-30 16:24 ` Junio C Hamano
2015-07-29 2:17 ` Junio C Hamano
2015-07-29 2:37 ` Johan Herland
2015-07-28 18:12 ` [PATCH v3 3/6] refs: add ref_type function David Turner
2015-07-29 6:32 ` Eric Sunshine
2015-07-28 18:12 ` [PATCH v3 4/6] pseudorefs: create and use pseudoref update and delete functions David Turner
2015-07-29 6:38 ` Eric Sunshine
2015-07-28 18:12 ` [PATCH v3 5/6] rebase: use update_ref David Turner
2015-07-28 18:12 ` David Turner [this message]
2015-07-28 19:01 ` [PATCH v3 0/6] pseudorefs Junio C Hamano
2015-07-28 19:07 ` David Turner
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=1438107144-24293-7-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=philipoakley@iee.org \
--cc=sunshine@sunshineco.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).