summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-04-07 14:28:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-10 16:28:02 (GMT)
commit0816f1dff8715e80b5fa0b73b48dd36ef9e1e381 (patch)
tree9dc6ad72d6acdb106630be4c4a9255445a7091d1 /builtin
parent9bb3dea45d69921578b1729c7dc7b12bfbe6f69e (diff)
downloadgit-0816f1dff8715e80b5fa0b73b48dd36ef9e1e381.zip
git-0816f1dff8715e80b5fa0b73b48dd36ef9e1e381.tar.gz
git-0816f1dff8715e80b5fa0b73b48dd36ef9e1e381.tar.bz2
sequencer: extract perform_autostash() from rebase
Lib-ify the autostash code by extracting perform_autostash() from rebase into sequencer. In a future commit, this will be used to implement `--autostash` in other builtins. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index ae345c9..08b8986 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1274,55 +1274,6 @@ static int check_exec_cmd(const char *cmd)
return 0;
}
-static void create_autostash(struct repository *r, const char *path,
- const char *default_reflog_action)
-{
- struct strbuf buf = STRBUF_INIT;
- struct lock_file lock_file = LOCK_INIT;
- int fd;
-
- fd = repo_hold_locked_index(r, &lock_file, 0);
- refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
- if (0 <= fd)
- repo_update_index_if_able(r, &lock_file);
- rollback_lock_file(&lock_file);
-
- if (has_unstaged_changes(r, 1) ||
- has_uncommitted_changes(r, 1)) {
- struct child_process stash = CHILD_PROCESS_INIT;
- struct object_id oid;
-
- argv_array_pushl(&stash.args,
- "stash", "create", "autostash", NULL);
- stash.git_cmd = 1;
- stash.no_stdin = 1;
- strbuf_reset(&buf);
- if (capture_command(&stash, &buf, GIT_MAX_HEXSZ))
- die(_("Cannot autostash"));
- strbuf_trim_trailing_newline(&buf);
- if (get_oid(buf.buf, &oid))
- die(_("Unexpected stash response: '%s'"),
- buf.buf);
- strbuf_reset(&buf);
- strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV);
-
- if (safe_create_leading_directories_const(path))
- die(_("Could not create directory for '%s'"),
- path);
- write_file(path, "%s", oid_to_hex(&oid));
- printf(_("Created autostash: %s\n"), buf.buf);
- if (reset_head(r, NULL, "reset --hard",
- NULL, RESET_HEAD_HARD, NULL, NULL,
- default_reflog_action) < 0)
- die(_("could not reset --hard"));
-
- if (discard_index(r->index) < 0 ||
- repo_read_index(r) < 0)
- die(_("could not read index"));
- }
- strbuf_release(&buf);
-}
-
int cmd_rebase(int argc, const char **argv, const char *prefix)
{
struct rebase_options options = REBASE_OPTIONS_INIT;