From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Nov 2020 21:18:39 +0000 (-0800)
Subject: Merge branch 'jc/sequencer-stopped-sha-simplify'
X-Git-Tag: v2.30.0-rc0~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b66375e6fbec4a813ed6c000f5c18fe53c1f824;p=thirdparty%2Fgit.git

Merge branch 'jc/sequencer-stopped-sha-simplify'

Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git.  Loosen
the reader side a bit (which we may want to tighten again in a year
or so).

* jc/sequencer-stopped-sha-simplify:
  sequencer: tolerate abbreviated stopped-sha file
---

7b66375e6fbec4a813ed6c000f5c18fe53c1f824