Bug merging submodule

Bug merging submodule

[Nathan Ramsey]

Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue)

git rebase origin/development

What did you expect to happen? (Expected behavior)

successful rebase?

What happened instead? (Actual behavior)

An error message was displayed

nmr2:MyRadar nathan$ git rebase origin/development 
Fast-forwarding submodule MyRadar/Tectonic-CPP
Auto-merging MyRadar/Tectonic-CPP
error: add_cacheinfo failed to refresh for path 'MyRadar/Tectonic-CPP'; merge aborting.
hint: Could not execute the todo command
hint: 
hint:     pick 9a864cc2da187ebc5ef9720165c0656d4f35c6fd Pick up latest for demo
hint: 
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint: 
hint:     git rebase --edit-todo
hint:     git rebase --continue
Could not apply 9a864cc2da... Pick up latest for demo


What's different between what you expected and what actually happened?


Anything else you want to add:

I recently renamed the submodule's main branch from 'master' to 'main', feels like it 
could be related. The following also fails:

nmr2:MyRadar nathan$ git submodule update --remote 
Submodule path '../ACMEGraphics': checked out '2f07030f28a8c4f7d9e540ff455b73b7cb99d9e6'
fatal: Needed a single revision
Unable to find current origin/master revision in submodule path 'MyRadar/Tectonic-CPP'

(I have since fixed .gitmodules to refer to the new branch name. 'git submodule update' succeeds 
now, but rebase still fails with the error: 
add_cacheinfo failed to refresh for path 'MyRadar/Tectonic-CPP'; merge aborting.
..)




Please review the rest of the bug report below.
You can delete any lines you don't wish to share.


[System Info]
git version:
git version 2.28.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Darwin 19.6.0 Darwin Kernel Version 19.6.0: Thu Jun 18 20:49:00 PDT 2020; root:xnu-6153.141.1~1/RELEASE_X86_64 x86_64
compiler info: clang: 11.0.3 (clang-1103.0.32.62)
libc info: no libc information available
$SHELL (typically, interactive shell): /bin/bash


[Enabled Hooks]