From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <9front-bounces@9front.inri.net>
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI
	autolearn=ham autolearn_force=no version=3.4.4
Received: from 9front.inri.net (9front.inri.net [168.235.81.73])
	by inbox.vuxu.org (Postfix) with ESMTP id B8E262415A
	for <ml@inbox.vuxu.org>; Sun, 10 Nov 2024 02:34:00 +0100 (CET)
Received: from mimir.eigenstate.org ([206.124.132.107]) by 9front; Sat Nov  9 20:33:00 -0500 2024
Received: from mimir.eigenstate.org (localhost [127.0.0.1])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTP id 3d7115d8
	for <9front@9front.org>;
	Sat, 9 Nov 2024 17:32:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=eigenstate.org; h=
	message-id:to:subject:date:from:in-reply-to:mime-version
	:content-type:content-transfer-encoding; s=mail; bh=uJJXRqvFRe8B
	RfersIDs9L6CUl4=; b=Q08IrqenvmDZVc6jbT93uAX4fe/vNiaFItqACgqStA+6
	f4jlRlEK3oHETOKDE0MjSU8VzJIRWNdKQWyThHuOsBKjwzrs/zsYbqwaccln2OkZ
	mU0dfO/mRehfisS7biE4c4aaSlX4kZ3iPXQCL2JIQs/8i1b85PR+aYfTbTMeRRQ=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=eigenstate.org; h=message-id
	:to:subject:date:from:in-reply-to:mime-version:content-type
	:content-transfer-encoding; q=dns; s=mail; b=DDIejBbC5f2ixUvwOvD
	qfnyjjjx4EFJsWl2EYP79dDfZvQd1dxLq9TfNLmMl5/eX6/NmQWXgrxxk54cHtmU
	J6qAwiY/Amim6WJjKdxrepSDFt1XtOTmNQlVBdr4jN/sYWAU0kjQkySLz9TvEKXX
	dxs65YQWWthS7UlPmxvoMmY0=
Received: from abbatoir (pool-108-6-24-2.nycmny.fios.verizon.net [108.6.24.2])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 1f17ad78 (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO)
	for <9front@9front.org>;
	Sat, 9 Nov 2024 17:32:58 -0800 (PST)
Message-ID: <43A7D688BF1C3FD76C07A2F6588762B1@eigenstate.org>
To: 9front@9front.org
Date: Sat, 09 Nov 2024 20:32:56 -0500
From: ori@eigenstate.org
In-Reply-To: <9D728FA497A606A5E6C420C3C39E9BFA@eigenstate.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: extended rich-client ORM database-scale metadata 
Subject: Re: [9front] git crash (related to file becoming directory?)
Reply-To: 9front@9front.org
Precedence: bulk

ignore that, I suck; found and fixed.

Quoth ori@eigenstate.org:
> this doesn't seem to reproduce for me; are you running
> the most recent version of git?
> 
> if so, can you get a stack trace?
> 
> Quoth James Cook <falsifian@falsifian.org>:
> > The following steps cause git/commit to die. Specifically, git/save fails with "assert failed: s[off] != '".
> > 
> > 1. Make a copy of the 9front repo (I used commit e4373dd1038fd8e0369d595283b032d011f28e59).
> > 2. In a new branch, add a file at lib/ndb/local.
> > 3. Go back to the front branch and make any other change.
> > 3. Go back to the new branch and try to merge front.
> > 
> > I've included a script to reproduce below my signature. For it to
> > work, ./plan9front should be a freshly cloned plan9front; my script
> > starts with dircp because I don't want to clone from upstream every
> > time I test my script.
> > 
> > I am running into this because I maintain a private branch where I
> > keep things like lib/ndb/local, and I (try to) merge front into it
> > every time I update. I have been able to work around this bug with
> > dirty manual intervention. (At one point I think it was enough to
> > fudge the INDEX9 file by removing the entry claiming lib/ndb was
> > removed, but more recently I've had to fiddle with the paths passed
> > to git/save by git/commit; IIRC I moved lib/ndb/local to after
> > lib/ndb/)
> > 
> > -- 
> > James
> > 
> > 
> > #!/bin/rc -ex
> > rfork en
> > 
> > mkdir -p bug
> > dircp plan9front bug
> > cd bug
> > git/branch -n myhead
> > mkdir lib/ndb
> > touch lib/ndb/local
> > git/add lib/ndb/local
> > git/commit -m 'Add lib/ndb/local' lib/ndb/local
> > git/branch front
> > echo cromulent >> lib/words
> > git/commit -m 'Some change on front' lib/words
> > git/branch myhead
> > git/merge front
> > git/commit -m 'Merge front'
>