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

Re: Segfault on merge with 1.6.2.1

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 5, 2009, 11:50 UTC
Message-ID
<alpine.DEB.1.00.0904051350350.10279@pacific.mpi-cbg.de>
In-Reply-To
<1238892420-721-1-git-send-email-drizzd@aon.at>
Hi,
On Sun, 5 Apr 2009, Clemens Buchacher wrote:
Show 10 quoted lines
> The segmentation fault is caused by a null pointer dereference which 
> happens during recursive merge with a submodule conflict between two 
> merge bases. This is fixed by the following patches.
> 
> However, there are other problems with merging submodules. For example, 
> git diff aborts with "fatal: read error 'sub'" for conflicting 
> submodules. I have also added a test for this.
> 
> Dscho has already started working on related issues. I have therefore 
> skipped t7404, which is already used in Dscho's work.

Thanks for working on this, Dscho

Previous: Junio C HamanoNext: Michael Johnson
Message 16 of 18 in “Segfault on merge with 1.6.2.1”
  1. Michael JohnsonMar 28, 2009
  2. Miklos VajnaMar 29, 2009
  3. Michael JohnsonMar 30, 2009
  4. Johannes SchindelinMar 30, 2009
  5. Miklos VajnaMar 30, 2009
  6. Michael JohnsonMar 31, 2009
  7. Michael JohnsonApr 1, 2009
  8. Miklos VajnaApr 1, 2009
  9. Clemens BuchacherApr 1, 2009
  10. Michael JohnsonApr 2, 2009
  11. Clemens BuchacherApr 5, 2009
  12. 1/3 add tests for merging with submodulesClemens Buchacher, Apr 5, 2009
  13. 2/3 update cache for conflicting submodule entriesClemens Buchacher, Apr 5, 2009
  14. 3/3 simplify output of conflicting mergeClemens Buchacher, Apr 5, 2009
  15. Junio C HamanoApr 5, 2009
  16. Johannes SchindelinApr 5, 2009
  17. Michael JohnsonApr 6, 2009
  18. Clemens BuchacherApr 6, 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.