git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Bug merging submodule
@ 2020-09-17 22:50 Nathan Ramsey
  0 siblings, 0 replies; only message in thread
From: Nathan Ramsey @ 2020-09-17 22:50 UTC (permalink / raw)
  To: git

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]


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-09-17 22:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-17 22:50 Bug merging submodule Nathan Ramsey

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git