From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Mar 2019 06:16:05 +0000 (+0900)
Subject: Merge branch 'js/rebase-orig-head-fix'
X-Git-Tag: v2.22.0-rc0~142
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9fbcc3d203?hp=--cc

Merge branch 'js/rebase-orig-head-fix'

"git rebase" that was reimplemented in C did not set ORIG_HEAD
correctly, which has been corrected.

* js/rebase-orig-head-fix:
built-in rebase: set ORIG_HEAD just once, before the rebase
built-in rebase: demonstrate that ORIG_HEAD is not set correctly
built-in rebase: use the correct reflog when switching branches
built-in rebase: no need to check out `onto` twice
---

9fbcc3d2036569d501bf222e700a4c017547a267
diff --cc builtin/rebase.c
index 52114cbf0d,0f4e1ead49..77deebc65c
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -367,8 -368,8 +367,9 @@@ static void add_var(struct strbuf *buf
  
  #define RESET_HEAD_DETACH (1<<0)
  #define RESET_HEAD_HARD (1<<1)
 -#define RESET_HEAD_REFS_ONLY (1<<2)
 -#define RESET_ORIG_HEAD (1<<3)
 +#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
 +#define RESET_HEAD_REFS_ONLY (1<<3)
++#define RESET_ORIG_HEAD (1<<4)
  
  static int reset_head(struct object_id *oid, const char *action,
  		      const char *switch_to_branch, unsigned flags,
@@@ -376,8 -377,8 +377,9 @@@
  {
  	unsigned detach_head = flags & RESET_HEAD_DETACH;
  	unsigned reset_hard = flags & RESET_HEAD_HARD;
 +	unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
  	unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
+ 	unsigned update_orig_head = flags & RESET_ORIG_HEAD;
  	struct object_id head_oid;
  	struct tree_desc desc[2] = { { NULL }, { NULL } };
  	struct lock_file lock = LOCK_INIT;
@@@ -1777,8 -1730,7 +1782,9 @@@ int cmd_rebase(int argc, const char **a
  	strbuf_addf(&msg, "%s: checkout %s",
  		    getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
  	if (reset_head(&options.onto->object.oid, "checkout", NULL,
- 		       RESET_HEAD_DETACH | RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
 -		       RESET_HEAD_DETACH | RESET_ORIG_HEAD, NULL, msg.buf))
++		       RESET_HEAD_DETACH | RESET_ORIG_HEAD | 
++		       RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
 +		       NULL, msg.buf))
  		die(_("Could not detach HEAD"));
  	strbuf_release(&msg);