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

Re: Segfault on merge with 1.6.2.1

From
Michael Johnson <redbeard@mdjohnson.us>
Date
Apr 2, 2009, 00:33 UTC
Message-ID
<op.urqg6bhmso3nzr@sulidor.mdjohnson.us>
In-Reply-To
<20090401180627.GA14716@localhost>

On Wed, 01 Apr 2009 13:06:27 -0500, Clemens Buchacher <drizzd@aon.at> wrote:

Show 5 quoted lines
> On Tue, Mar 31, 2009 at 02:14:21AM -0500, Michael Johnson wrote:
>> It would appear that the patch has already been applied to 1.6.2.1.
>
> I don't think it has. But judging from the stack trace this bug is  
> unrelated to the patch anyways.

When I tried to appy the patch I got a conflict (I applied it directly to Debian's source package for git-core). When I compared the code to the patch it appeared it had been applied. Of course, I'm far from an expert at applying patches, so I might have misread the direction of the patch.

> If nobody else is dealing with this I'd like to have a look at it. Could  
> you please send me a copy of the repo.

It doesn't sound like anyone else is. So I'll send you a copy shortly, off list.

Thanks for all the help, Michael

-- 
Michael D Johnson   <redbeard@mdjohnson.us>    
redbeardcreator.deviantart.com

"Marketing research...[has] shown that energy weapons that make sounds sell
  better..." - Kevin Siembieda (Rifts Game Master Guide, pg 111)
Previous: Clemens BuchacherNext: Clemens Buchacher
Message 10 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.