All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com, spearce@spearce.org
Subject: Re: [PATCH] fetch: refuse to fetch into the current branch in a non-bare repository
Date: Sat, 11 Oct 2008 14:44:52 -0700	[thread overview]
Message-ID: <7vprm6iz6z.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0810111336350.22125@pacific.mpi-cbg.de.mpi-cbg.de> (Johannes Schindelin's message of "Sat, 11 Oct 2008 13:38:02 +0200 (CEST)")

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Some confusing tutorials suggest that it would be a good idea to call
> something like this:
>
> 	git pull origin master:master
>
> While it might make sense to store what you want to merge, it typically
> is plain wrong.

I am somewhat confused.

This "confusion" has been there for very long time and (at least the
scripted version of) git-pull/git-fetch pair has supported a workaround in
the form of --update-head-ok option.

Have we broken the workaround ll.127..147 in git-pull.sh recently, or are
you trying to address something else?

  reply	other threads:[~2008-10-11 21:46 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-11 11:38 [PATCH] fetch: refuse to fetch into the current branch in a non-bare repository Johannes Schindelin
2008-10-11 21:44 ` Junio C Hamano [this message]
2008-10-12 18:47   ` Shawn O. Pearce
2008-10-13  9:28     ` Johannes Schindelin
2008-10-12 18:52 ` Shawn O. Pearce
2008-10-12 20:37 ` Daniel Barkalow
2008-10-13  9:36   ` [PATCH v2] Fix fetch/pull when run without --update-head-ok Johannes Schindelin
2008-10-13 14:09     ` Shawn O. Pearce
2008-10-13 17:57       ` Johannes Schindelin
2008-10-13 14:23     ` Junio C Hamano
2008-10-13 17:30       ` Junio C Hamano
2008-10-13 18:12       ` Johannes Schindelin
2008-10-13 20:05         ` Daniel Barkalow
2008-10-14  9:49           ` Johannes Schindelin
2008-10-14 15:02             ` Shawn O. Pearce
2008-10-14 16:04               ` Daniel Barkalow
2008-10-14 16:15               ` Johannes Schindelin
2008-10-14 15:57             ` Daniel Barkalow
2008-10-14 16:17               ` Johannes Schindelin
2008-10-14 16:52                 ` Daniel Barkalow
2008-10-14 17:02                   ` Daniel Barkalow
2008-10-14 22:07                     ` Junio C Hamano
2008-10-14 22:53                       ` [PATCH] pull: allow "git pull origin $something:$current_branch" into an unborn branch Junio C Hamano
2008-10-13 17:08     ` [PATCH v2] Fix fetch/pull when run without --update-head-ok 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=7vprm6iz6z.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.