Re: git bug/feature request

From: Alex Riesen <raa.lkml@gmail.com>
Date: Nov 27, 2007, 11:21 UTC
Message-ID: <81b0412b0711270321q6f70554at177ade878448b9fc@mail.gmail.com>
In-Reply-To: <200711271127.41161.gapon007@gmail.com>

On 27/11/2007, gapon <gapon007@gmail.com> wrote:

Show 15 quoted lines

> hi all,
> first of all i don't know if there's a bugzilla or something similar for git -
> i have found just this email (on http://git.or.cz/ webpage).
>
> i have discovered "weird" behaviour of git in this scenario*:
> - user A is working in repo A
> - user B clones repo A
> - user B makes some changes, commits, pushes
> - user A makes some changes, git status (no info about new commit in his repo
> from user B but it's probably ok i'd say - but some of my files are marked as
> changed and already added to index  but i haven't changed them - that's
> confusing, isn't it?)
> - user A can commit his changes => shouldn't be there any info/message/warning
> displayed? it would be helpful to have here some info about "foreign commit"
> in the repo or something like this

If you share a repository with someone else, you better use different branches. What's happened is that user B changed the branch the user A was working on (strictly speaking, the B-user changed the reference A-user used as HEAD at the moment).

Just have the B-user push his/hers changes on something else, not the master of the parent repository. For instance, B-user can add a "push"-line to his origin remote which redirects its pushes somewhere else:

  git config remote.origin.push 'refs/heads/*:refs/heads/B-user/*'

Or just use a dedicated shared repo where no one works in. See also Documentation/config.txt, and the man page of git-push.