tree b7646d8a3f72d926b7a7bc2e1f72f482fc4e870b
parent 25ff4f834866921f3784e6f6f2ecc41dffa03e8c
author Haowei Wu <haowei@google.com> 1584645038 -0700
committer Haowei Wu <haowei@google.com> 1584646798 -0700

[jiri] Revise 'rebase in progress' detection.

Due to recent `keep-empty` change, the git rebase creates rebase-merge
file instead of rebase-apply file when rebase is in progress, which
makes jiri failed to do rebase-abort when rebase failed, making repo
in a weird state. This change revise the 'rebase in progress' detection
in git package to fix this issue.

Bug: 48605
Change-Id: I09a23e2c095b448aa9bc1055625e967483277c8e