[9fans] git issues

[9fans] git issues

[Roman Belenov]

[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

Hello,

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?

2. I've created new branch "local", made some changes in /sys/src and committed them. I had no errors, but "git/merge front" now emits "/bin/git/merge: dirty work tree, refusing to merge". Any suggestions? Is it related to first issue?

Regards, Roman
------------------------------------------
9fans: 9fans
Permalink: https://9fans.topicbox.com/groups/9fans/Te1af7af5b9f41987-M705ca314b29d12950384282b
Delivery options: https://9fans.topicbox.com/groups/9fans/subscription

[-- Attachment #2: Type: text/html, Size: 1385 bytes --]

Re: [9fans] git issues

[ori]

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

Re: [9fans] git issues

[Roman Belenov]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

Thank you, that did the trick!
"git/merge front" also works now. However, "git/diff -c front" produces huge diffs, looks like front is not interpreted as a branch name. How to compare two branches with 9front git?
------------------------------------------
9fans: 9fans
Permalink: https://9fans.topicbox.com/groups/9fans/Te1af7af5b9f41987-Mc780f63fa35b0bf451b271f0
Delivery options: https://9fans.topicbox.com/groups/9fans/subscription

[-- Attachment #2: Type: text/html, Size: 965 bytes --]