git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: gapon <gapon007@gmail.com>
To: "Alex Riesen" <raa.lkml@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git bug/feature request
Date: Tue, 27 Nov 2007 12:31:51 +0100	[thread overview]
Message-ID: <200711271231.51270.gapon007@gmail.com> (raw)
In-Reply-To: <81b0412b0711270321q6f70554at177ade878448b9fc@mail.gmail.com>

as i wrote in my first email - i know that this is not "correct" scenario (i 
don't and won't use it anywhere) - but the git's behaviour is in such case 
confusing, at least for me
just for clarification - my email wasn't about how to push or create shared 
repository - it was just about what i have discovered while playing with 
different scms

gapon


Dne úterý 27 listopadu 2007 Alex Riesen napsal(a):
> On 27/11/2007, gapon <gapon007@gmail.com> wrote:
> > 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.

  reply	other threads:[~2007-11-27 11:32 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-27 10:27 git bug/feature request gapon
2007-11-27 10:57 ` Benoit Sigoure
2007-11-27 11:16   ` gapon
2007-11-27 11:51     ` Jakub Narebski
2007-11-27 12:50       ` gapon
2007-11-27 13:31         ` Jakub Narebski
2007-11-27 13:38           ` Jakub Narebski
2007-11-27 14:06           ` gapon
2007-11-27 11:21 ` Alex Riesen
2007-11-27 11:31   ` gapon [this message]
2007-11-27 13:03     ` Alex Riesen
2007-11-27 13:45       ` gapon
2007-11-27 16:36         ` Alex Riesen
2007-11-27 11:30 ` Jakub Narebski
2007-11-30 18:21   ` Jan Hudec
2007-11-27 14:35 ` Peter Karlsson
2007-11-27 14:38   ` David Kastrup
2007-11-28 13:30     ` Peter Karlsson
2007-11-27 15:13   ` Jakub Narebski
2007-11-27 19:49     ` Steven Grimm
2007-11-27 20:19       ` Daniel Barkalow
2007-11-27 20:34 ` Daniel Barkalow

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=200711271231.51270.gapon007@gmail.com \
    --to=gapon007@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=raa.lkml@gmail.com \
    /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).