From: ori@eigenstate.org
To: 9fans@9fans.net
Subject: Re: [9fans] git issues
Date: Tue, 01 Apr 2025 12:48:59 -0400 [thread overview]
Message-ID: <0C1619E979D528180458BC44E448D251@eigenstate.org> (raw)
In-Reply-To: <17435238190.b2B1CE1e.70@composer.9fans.topicbox.com>
Quoth Roman Belenov <rbelenov@gmail.com>:
>
> I have some issues with git (after bind -ac /dist/plan9front)
>
> 1.git/diff -s produces a lot of messages like
>
> R lib/1oct1993/0310.ms
>
> What are these files? Is it possible to get rid of it?
This was a bug in git, where we would get confused converting
a file into a directory of the same name, and vice versa. I
think the most overkill way to get out of it is, once you have
an up to date git:
# make git9 forget this file exists, so that
# when we revert it, we don't get confused
grep -v 1oct1993 /.git/INDEX9 > /.git/INDEX9.tmp
mv /.git/INDEX9.tmp /.git/INDEX9
# remove and recreate the files
git/rm -rf /lib/1oct1993
git/revert /lib/1oct1993
I think git/rm followed by git/revert may also work, but my
memory of what to do to get past this is fading.
------------------------------------------
9fans: 9fans
Permalink: https://9fans.topicbox.com/groups/9fans/Te1af7af5b9f41987-Md94c9fa65f8cea1e6f18d659
Delivery options: https://9fans.topicbox.com/groups/9fans/subscription
next prev parent reply other threads:[~2025-04-01 16:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-01 16:10 Roman Belenov
2025-04-01 16:48 ` ori [this message]
2025-04-01 17:19 ` Roman Belenov
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=0C1619E979D528180458BC44E448D251@eigenstate.org \
--to=ori@eigenstate.org \
--cc=9fans@9fans.net \
/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).