From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Nov 2020 21:32:53 +0000 (-0800)
Subject: Merge branch 'pw/rebase-i-orig-head'
X-Git-Tag: v2.30.0-rc0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c042c455d4ffb9b5ed0c280301b5661f3efad572;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-i-orig-head'

"git rebase -i" did not store ORIG_HEAD correctly.

* pw/rebase-i-orig-head:
  rebase -i: simplify get_revision_ranges()
  rebase -i: use struct object_id when writing state
  rebase -i: use struct object_id rather than looking up commit
  rebase -i: stop overwriting ORIG_HEAD buffer
---

c042c455d4ffb9b5ed0c280301b5661f3efad572