undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: rewrite init_basic_state() in C

Browse Source 
This rewrites init_basic_state() from shell to C.  The call to
write_basic_state() in cmd_rebase__helper() is replaced by a call to the
new function.

The shell version is then stripped from git-rebase--interactive.sh.

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alban Gruin 2018-08-28 14:10:41 +02:00 committed by Junio C Hamano
parent 65850686cf
commit d59cd14de8
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/rebase--helper.c
View File

@ -5,10 +5,13 @@
#include "sequencer.h" #include "sequencer.h"
#include "rebase-interactive.h" #include "rebase-interactive.h"
#include "argv-array.h" #include "argv-array.h"
#include "refs.h"
#include "rerere.h" #include "rerere.h"
#include "alias.h" #include "alias.h"
static GIT_PATH_FUNC(path_state_dir, "rebase-merge/")
static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto") static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive")
static int get_revision_ranges(const char *upstream, const char *onto, static int get_revision_ranges(const char *upstream, const char *onto,
const char **head_hash, const char **head_hash,
@ -44,6 +47,24 @@ static int get_revision_ranges(const char *upstream, const char *onto,
return 0; return 0;
} }
static int init_basic_state(struct replay_opts *opts, const char *head_name,
const char *onto, const char *orig_head)
{
FILE *interactive;
if (!is_directory(path_state_dir()) && mkdir_in_gitdir(path_state_dir()))
return error_errno(_("could not create temporary %s"), path_state_dir());
delete_reflog("REBASE_HEAD");
interactive = fopen(path_interactive(), "w");
if (!interactive)
return error_errno(_("could not mark as interactive"));
fclose(interactive);
return write_basic_state(opts, head_name, onto, orig_head);
}
static const char * const builtin_rebase_helper_usage[] = { static const char * const builtin_rebase_helper_usage[] = {
N_("git rebase--helper [<options>]"), N_("git rebase--helper [<options>]"),
NULL NULL
@ -198,7 +219,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
if (ret) if (ret)
return ret; return ret;
return !!write_basic_state(&opts, head_name, onto, head_hash); return !!init_basic_state(&opts, head_name, onto, head_hash);
} }
usage_with_options(builtin_rebase_helper_usage, options); usage_with_options(builtin_rebase_helper_usage, options);

9
git-rebase--interactive.sh
View File

@ -51,14 +51,6 @@ initiate_action () {
esac esac
} }
init_basic_state () {
orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
rm -f "$(git rev-parse --git-path REBASE_HEAD)"
: > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
}
git_rebase__interactive () { git_rebase__interactive () {
initiate_action "$action" initiate_action "$action"
ret=$? ret=$?
@ -67,7 +59,6 @@ git_rebase__interactive () {
fi fi
git rebase--helper --prepare-branch "$switch_to" ${verbose:+--verbose} git rebase--helper --prepare-branch "$switch_to" ${verbose:+--verbose}
init_basic_state
git rebase--helper --init-basic-state ${upstream:+--upstream "$upstream"} \ git rebase--helper --init-basic-state ${upstream:+--upstream "$upstream"} \
${onto:+--onto "$onto"} ${head_name:+--head-name "$head_name"} \ ${onto:+--onto "$onto"} ${head_name:+--head-name "$head_name"} \