9front - general discussion about 9front
 help / color / mirror / Atom feed
From: James Cook <falsifian@falsifian.org>
To: 9front@9front.org
Subject: Re: [9front] git crash (related to file becoming directory?)
Date: Sun, 10 Nov 2024 02:10:34 +0000	[thread overview]
Message-ID: <2YNNCA7WZEMDJ.2GLUABCN12ROA@falsifian.org> (raw)
In-Reply-To: <43A7D688BF1C3FD76C07A2F6588762B1@eigenstate.org>

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

      reply	other threads:[~2024-11-10  2:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-09 23:47 James Cook
2024-11-10  0:00 ` ori
2024-11-10  1:32   ` ori
2024-11-10  2:10     ` James Cook [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2YNNCA7WZEMDJ.2GLUABCN12ROA@falsifian.org \
    --to=falsifian@falsifian.org \
    --cc=9front@9front.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).