sequencer: replace write_cherry_pick_head with update_ref
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Turner committed
Jul 31, 2015 at 02:06 UTC
d96a53996b6c02b96a9a2b4eed9eac4e9d661a38
1 file changed
+4
-19
sequencer.c
+4
-19
@@ -158,23 +158,6 @@ static void free_message(struct commit *commit, struct commit_message *msg)
158
unuse_commit_buffer(commit, msg->message);
159
}
160
161
-static void write_cherry_pick_head(struct commit *commit, const char *pseudoref)
162
-{
163
- const char *filename;
164
- int fd;
165
- struct strbuf buf = STRBUF_INIT;
166
-
167
- strbuf_addf(&buf, "%s\n", sha1_to_hex(commit->object.sha1));
168
-
169
- filename = git_path("%s", pseudoref);
170
- fd = open(filename, O_WRONLY | O_CREAT, 0666);
171
- if (fd < 0)
172
- die_errno(_("Could not open '%s' for writing"), filename);
173
- if (write_in_full(fd, buf.buf, buf.len) != buf.len || close(fd))
174
- die_errno(_("Could not write to '%s'"), filename);
175
- strbuf_release(&buf);
176
-}
177
-
161
static void print_advice(int show_hint, struct replay_opts *opts)
162
{
163
char *msg = getenv("GIT_CHERRY_PICK_HELP");
@@ -607,9 +590,11 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
590
* write it at all.
591
*/
592
if (opts->action == REPLAY_PICK && !opts->no_commit && (res == 0 || res == 1))
610
- write_cherry_pick_head(commit, "CHERRY_PICK_HEAD");
593
+ update_ref(NULL, "CHERRY_PICK_HEAD", commit->object.sha1, NULL,
594
+ REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
595
if (opts->action == REPLAY_REVERT && ((opts->no_commit && res == 0) || res == 1))
612
- write_cherry_pick_head(commit, "REVERT_HEAD");
596
+ update_ref(NULL, "REVERT_HEAD", commit->object.sha1, NULL,
597
+ REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
598
599
if (res) {
600
error(opts->action == REPLAY_REVERT