git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: branch.pu.forcefetch
Date: Wed, 27 Dec 2006 22:14:27 +0100	[thread overview]
Message-ID: <emunic$fn$1@sea.gmane.org> (raw)
In-Reply-To: 1167251519.2247.10.camel@dv

Pavel Roskin wrote:

> I'm testing the current git from the master branch, and I like the idea
> of moving the remotes to the config file, but I think there is a
> significant omission in the new syntax.  There is no way to specify that
> some branches are fast forward.
> 
> For example, I clone the git repository anew, and I try to update it by
> git-fetch a few days later.  I get an error:
> 
> * refs/remotes/origin/pu: not updating to non-fast forward branch 'pu'
> of git://www.kernel.org/pub/scm/git/git
> 
> It would be great to have a "non-fastforward" option in the config file
> for every branch. I'm thinking about something like: 
> 
> [branch "pu"]
>         forcefetch = 1

Currently the old '+' before refspec still works. So you should have
[remote "origin"]
        # ...
        fetch = +refs/heads/pu:refs/remotes/origin/pu

> It would be even better to initialize such option while cloning.

There was some talk about this, but I don't remember if there were any code.

Actually the talk was about marking branch as non-fast-forwardable (which
is meant to have rewritten history) on _server_ side, and allowing to
fetch all/parts of config while cloning to get this info.
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

  reply	other threads:[~2006-12-27 21:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-27 20:31 branch.pu.forcefetch Pavel Roskin
2006-12-27 21:14 ` Jakub Narebski [this message]
2006-12-27 21:14 ` branch.pu.forcefetch Junio C Hamano
2006-12-27 21:20   ` branch.pu.forcefetch Jakub Narebski
2006-12-28 21:29   ` branch.pu.forcefetch Pavel Roskin
2006-12-28 22:44     ` branch.pu.forcefetch Junio C Hamano
2006-12-29  0:32       ` [PATCH 1/2] core.logallrefupdates: log remotes/ tracking branches Junio C Hamano
2006-12-29  0:32       ` [PATCH 2/2] Allow non-fast-forward of remote tracking branches in default clone Junio C Hamano
2006-12-29  4:35         ` Shawn Pearce
2006-12-29 16:39         ` Johannes Schindelin
2006-12-29  1:22       ` branch.pu.forcefetch Pavel Roskin
2006-12-29  2:30         ` branch.pu.forcefetch Junio C Hamano
2006-12-29  3:34           ` branch.pu.forcefetch Pavel Roskin
2006-12-29  4:31             ` branch.pu.forcefetch Shawn Pearce

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='emunic$fn$1@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.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 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).