git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Riedy <jason@acm.org>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: Managing websites with git
Date: Tue, 02 Dec 2008 10:55:34 -0500	[thread overview]
Message-ID: <87vdu2po5l.fsf@sparse.dyndns.org> (raw)
In-Reply-To: <20081202011154.GA6390@coredump.intra.peff.net> (Jeff King's message of "Mon, 1 Dec 2008 20:11:54 -0500")

And Jeff King writes:
> To clarify: one should not push to the _current branch_ of a
> non-bare repo...

Ah, ok, thanks!  Issuing a warning makes sense.  I'm not sure if
denying such a push by default does...

> Doing git push $remote HEAD:branch-that-is-checked-out
> has _never_ worked without further action on $remote. Now we're warning
> about it.

It works just fine.  I suspect we have different definitions of
"works".

To me, that push updates the branch's reference.  The working
copy and index now may be out of sync, but neither the working
copy nor the index is the branch's reference.  Trying to commit
from the index correctly refuses.  The warning is a nice
reminder, but I don't see why this should be denied by default.
The user (me) hasn't lost anything, and every tool does what it
is supposed to do (from my point of view).

But I'm one of those people who has always liked the three levels
of git.  And I use them all.

(And in context: I used to update the IEEE754 group's web site by
a git push to the checked-out master, with a hook to reset
everything.  Worked just fine (and very quickly) until they shut
off shell access.  There was no need for an extra branch on the
server side.)

> If you have other specific complaints about new git behavior,
> I'm sure the list would be happy to hear about it.

I'll try to find time when I encounter another.  I'm pretty sure
that switching to denying pushes to checked-out branches is the
first one that *really* will make me change how I work.

Jason

  reply	other threads:[~2008-12-02 16:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-30 16:30 Managing websites with git Felix Andersen
2008-11-30 17:07 ` David Bryson
2008-11-30 17:27   ` Jeff King
2008-12-02  0:46     ` Jason Riedy
2008-12-02  1:11       ` Jeff King
2008-12-02 15:55         ` Jason Riedy [this message]
2008-12-02 16:55           ` Jeff King
2008-12-02 19:07             ` Junio C Hamano
2008-12-02  1:36       ` Leo Razoumov
2009-01-03 21:29 ` Todd A. Jacobs

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=87vdu2po5l.fsf@sparse.dyndns.org \
    --to=jason@acm.org \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.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).