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.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	UNPARSEABLE_RELAY 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 78DB82483A
	for <ml@inbox.vuxu.org>; Sun, 10 Nov 2024 03:14:19 +0100 (CET)
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
Received: from exoco.falsifian.org ([168.235.109.198]) by 9front; Sat Nov  9 21:10:35 -0500 2024
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2020-07-31; bh=8+hf5nejp
	FddyDgDybqq5UrudvErSypyn6FSYKVmAog=; h=in-reply-to:references:from:
	subject:to:date; d=falsifian.org; b=m0/p3opU+XmGDHtWwe8iTnxvjENH7fMqj3
	9nqEW+2yocM8FRistFS2Q1FZ0oj28vi0EY8np1yHx+JnudTf9T7rxJ6hXadXTiKZSy/QKE
	8yMtKpkqfNUgnA1jill5eLCG9lKe2CFfwegJ1Ded8dP6LfBI4Kn1joWk86SOu7ehNDF3G7
	VXr+mgfr0qBqpmR0VGhaw30M+ynSe/eJj3mvsCR0X45OEFfN/MYLPusLBOYW7Pz7smxjTU
	amaCSJrIONH9ye5866FEhbg8QC9GkfFC6I2bv3YufZXLFANK71xdLk6dkUsd5iyDnesgD5
	PQRYCDLB9R9HEVkOVQFS5XYT2a2A==
Received: from angel.falsifian.org (198-58-130-205.on.fttn.ebox.net [198.58.130.205])
	by exoco.falsifian.org (OpenSMTPD) with ESMTPSA id 5382d86f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <9front@9front.org>;
	Sun, 10 Nov 2024 02:10:34 +0000 (UTC)
Received: from localhost (angel.falsifian.org [local])
	by angel.falsifian.org (OpenSMTPD) with ESMTPA id 0d0b0aa6
	for <9front@9front.org>;
	Sun, 10 Nov 2024 02:10:34 +0000 (UTC)
Date: Sun, 10 Nov 2024 02:10:34 +0000
To: 9front@9front.org
From: James Cook <falsifian@falsifian.org>
References: <43A7D688BF1C3FD76C07A2F6588762B1@eigenstate.org>
In-Reply-To: <43A7D688BF1C3FD76C07A2F6588762B1@eigenstate.org>
Message-Id: <2YNNCA7WZEMDJ.2GLUABCN12ROA@falsifian.org>
User-Agent: mblaze/1.3
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: shared singleton lifecycle session-based controller 
Subject: Re: [9front] git crash (related to file becoming directory?)
Reply-To: 9front@9front.org
Precedence: bulk

ori@eigenstate.org wrote:
> ignore that, I suck; found and fixed.

Thanks! But there is still a bug: lib/ndb/local isn't included in
the commit. New repro script follows. The last "git/diff" shows
lib/ndb/local is missing from the merge commit.

-- 
James


#!/bin/rc -ex
rfork en

mkdir bug
dircp plan9front bug
cd bug
git/branch -n myhead
mkdir lib/ndb
echo stuff > 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'
git/diff lib/ndb/local  # should have no output