Re: [PATCH v4 4/4] builtin/rebase: support running "git rebase <upstream>"
Hi Pratik,
On Sun, 8 Jul 2018, Pratik Karki wrote:
> + strbuf_addf(&script_snippet,
> + ". git-rebase--common && . %s && %s",
> + backend, backend_func);
In my quick test (on top of `wip-rebase`), this line needed this change:
-- snip --
@@ -269,7 +279,8 @@ static int run_specific_rebase(struct rebase_options *opts)
}
strbuf_addf(&script_snippet,
- "set -x && . git-rebase--common && . %s && %s",
+ "set -x && "
+ ". git-sh-setup && . git-rebase--common && . %s && %s",
backend, backend_func);
argv[0] = script_snippet.buf;
-- snap --
Obviously, the `set -x && ` part was not part of the patches you sent to
the Git mailing list, so please do not let that distract you from the fact
that I had to source also `git-sh-setup` (it implies `git-sh-i18n`, and
the `eval_gettext` function is defined there and used in the
`move_to_original_branch` fnuction).
With this (and the REF_NO_DEREF change), t3404-rebase-skip.sh passes,
which is pretty cool.
Ciao,
Dscho
Johannes Schindelin <johannes.schindelin@gmx.de>