git/list[1] front-page[2] threads[3] people[4] search[5] about
 

different git-merge behavior with regard to submodules in 1.6.2.4 vs. 1.6.2.1

From
Tim Olsen <tim@brooklynpenguin.com>
Date
Apr 28, 2009, 17:36 UTC
Message-ID
<gt7err$3m4$1@ger.gmane.org>
Hello,

I noticed some weirdness lately when trying to merge branches in a repository containing submodules. I get the following behavior with git 1.6.2.4:

$ git merge origin/deployed fatal: cannot read object 83055ffdddde60d41d9811aae77e78be50b329f8 'rubydav': It is a submodule!

Nothing in my history suggests that rubydav was at one point not a submodule.

I looked at the 1.6.2.4 release notes and noticed the following:
  * "git-merge-recursive" was broken when a submodule entry was involved
in a criss-cross merge situation.
So then I downgraded to the last debian package of git which is 1.6.2.1.
 Now I get a result which is more approachable:

$ git merge origin/deployed Auto-merging rubydav CONFLICT (submodule): Merge conflict in rubydav - needs 167a344227c4745031d50a210869e6fb59a5ac03 Auto-merging server CONFLICT (submodule): Merge conflict in server - needs 82a74ae791c8563ca65f29187d2fe5ebfbc167ea Automatic merge failed; fix conflicts and then commit the result.

Both merges are from freshly checked out clones.

Is this a bug in 1.6.2.4? Please let me know what other information I can provide to help debug the problem.

Thanks, Tim

Next: Junio C Hamano
Message 1 of 15 in “different git-merge behavior with regard to submodules in 1.6.2.4 vs. 1.6.2.1”
  1. Tim OlsenApr 28, 2009
  2. Junio C HamanoApr 28, 2009
  3. Finn Arne GangstadApr 28, 2009
  4. Clemens BuchacherApr 29, 2009
  5. Finn Arne GangstadApr 29, 2009
  6. Teach gitlinks to combine-diffJunio C Hamano, Apr 29, 2009
  7. diff -c -p: do not die on submodulesJunio C Hamano, Apr 29, 2009
  8. Alex RiesenApr 29, 2009
  9. Johannes SchindelinApr 29, 2009
  10. Alex RiesenApr 29, 2009
  11. Johannes SchindelinApr 29, 2009
  12. Alex RiesenApr 30, 2009
  13. Finn Arne GangstadApr 30, 2009
  14. Junio C HamanoApr 29, 2009
  15. Junio C HamanoApr 29, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.