{"thread":{"id":"54253","subject":"Bug merging submodule","startedAt":"2020-09-17T22:50:29Z","lastAt":"2020-09-17T22:50:29Z","messageCount":1,"participants":["Nathan Ramsey"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"405809","messageId":"71C47B1E-863C-4A9C-AD4D-8A05AB6327B5@acmeaom.com","threadId":"54253","inReplyTo":null,"subject":"Bug merging submodule","fromName":"Nathan Ramsey","fromEmail":"nathan@acmeaom.com","sentAt":"2020-09-17T22:50:21Z","receivedAt":"2020-09-17T22:50:29Z","isPatch":false,"sender":{"key":"nathan@acmeaom.com","avatar":null},"body":"Thank you for filling out a Git bug report!\nPlease answer the following questions to help us understand your issue.\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\n\ngit rebase origin/development\n\nWhat did you expect to happen? (Expected behavior)\n\nsuccessful rebase?\n\nWhat happened instead? (Actual behavior)\n\nAn error message was displayed\n\nnmr2:MyRadar nathan$ git rebase origin/development \nFast-forwarding submodule MyRadar/Tectonic-CPP\nAuto-merging MyRadar/Tectonic-CPP\nerror: add_cacheinfo failed to refresh for path 'MyRadar/Tectonic-CPP'; merge aborting.\nhint: Could not execute the todo command\nhint: \nhint:     pick 9a864cc2da187ebc5ef9720165c0656d4f35c6fd Pick up latest for demo\nhint: \nhint: It has been rescheduled; To edit the command before continuing, please\nhint: edit the todo list first:\nhint: \nhint:     git rebase --edit-todo\nhint:     git rebase --continue\nCould not apply 9a864cc2da... Pick up latest for demo\n\n\nWhat's different between what you expected and what actually happened?\n\n\nAnything else you want to add:\n\nI recently renamed the submodule's main branch from 'master' to 'main', feels like it \ncould be related. The following also fails:\n\nnmr2:MyRadar nathan$ git submodule update --remote \nSubmodule path '../ACMEGraphics': checked out '2f07030f28a8c4f7d9e540ff455b73b7cb99d9e6'\nfatal: Needed a single revision\nUnable to find current origin/master revision in submodule path 'MyRadar/Tectonic-CPP'\n\n(I have since fixed .gitmodules to refer to the new branch name. 'git submodule update' succeeds \nnow, but rebase still fails with the error: \nadd_cacheinfo failed to refresh for path 'MyRadar/Tectonic-CPP'; merge aborting.\n..)\n\n\n\n\nPlease review the rest of the bug report below.\nYou can delete any lines you don't wish to share.\n\n\n[System Info]\ngit version:\ngit version 2.28.0\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: 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\ncompiler info: clang: 11.0.3 (clang-1103.0.32.62)\nlibc info: no libc information available\n$SHELL (typically, interactive shell): /bin/bash\n\n\n[Enabled Hooks]\n\n"}]}