From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Yann Dirson" <ydirson@altern.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".
Date: Fri, 2 Feb 2007 09:58:06 +0000 [thread overview]
Message-ID: <b0943d9e0702020158o1a07b8efu9302794c57d050e1@mail.gmail.com> (raw)
In-Reply-To: <20070201234805.3313.20525.stgit@gandelf.nowhere.earth>
On 01/02/07, Yann Dirson <ydirson@altern.org> wrote:
> Previously we were just assuming that the remote from which we
> just failed defined a local branch whose name was the same as the
> remote def, and that this branch was the parent. While this is true
> for the most common case (branch "origin" from remote "origin"), it is
> quite an unflexible assumption.
The t1200-push-modified.sh test fails after applying this patch. It
looks like the 3rd test fails to pull the changes from 'foo' into
'bar'.
Thanks.
--
Catalin
next prev parent reply other threads:[~2007-02-02 9:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-01 23:47 [PATCH 0/3] Update to stgit parent tracking Yann Dirson
2007-02-01 23:48 ` [PATCH 1/3] The user does not want to mess with the refspecs Yann Dirson
2007-02-01 23:48 ` [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull" Yann Dirson
2007-02-02 9:58 ` Catalin Marinas [this message]
2007-02-02 18:07 ` Yann Dirson
2007-02-02 22:42 ` Yann Dirson
2007-02-02 23:01 ` Catalin Marinas
2007-02-02 23:25 ` Catalin Marinas
2007-02-03 21:46 ` Yann Dirson
2007-02-03 23:01 ` Junio C Hamano
2007-02-04 0:23 ` Junio C Hamano
2007-02-04 0:24 ` Yann Dirson
2007-02-04 1:49 ` Jeff King
2007-02-04 2:10 ` Junio C Hamano
2007-02-04 2:38 ` Jeff King
2007-02-02 23:56 ` git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) Yann Dirson
2007-02-03 0:14 ` Yann Dirson
2007-02-03 0:17 ` Jakub Narebski
2007-02-03 12:16 ` Catalin Marinas
2007-02-03 14:47 ` Yann Dirson
2007-02-01 23:48 ` [PATCH 3/3] Do not return 'origin' as parent remote when there is no such remote Yann Dirson
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=b0943d9e0702020158o1a07b8efu9302794c57d050e1@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=ydirson@altern.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).