rebase --apply: set ORIG_HEAD correctly

At the start of a rebase, ORIG_HEAD is updated to the tip of the
branch being rebased. Unfortunately reset_head() always uses the
current value of HEAD for this which is incorrect if the rebase is
started with "git rebase <upstream> <branch>" as in that case
ORIG_HEAD should be updated to <branch>. This only affects the "apply"
backend as the "merge" backend does not yet use reset_head() for the
initial checkout. Fix this by passing in orig_head when calling
reset_head() and add some regression tests.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/reset.h b/reset.h
index 7ef7e43..a28f818 100644
--- a/reset.h
+++ b/reset.h
@@ -23,6 +23,10 @@ struct reset_head_opts {
 	 */
 	const struct object_id *oid;
 	/*
+	 * Optional value to set ORIG_HEAD. Defaults to HEAD.
+	 */
+	const struct object_id *orig_head;
+	/*
 	 * Optional branch to switch to.
 	 */
 	const char *branch;