From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Matthew McClintock <msm@freescale.com>
Cc: bitbake-devel@lists.openembedded.org
Subject: Re: [PATCH] Make git fetch run with -f so rebased branches don't fail
Date: Mon, 03 Oct 2011 11:47:53 +0100 [thread overview]
Message-ID: <1317638882.4454.71.camel@ted> (raw)
In-Reply-To: <1317159699-3823-1-git-send-email-msm@freescale.com>
On Tue, 2011-09-27 at 16:41 -0500, Matthew McClintock wrote:
> git fetches can fail (or at least return failed) when trying to
> fetch and prune rebased branches. This patch simply adds a -f
> to the git fetch command so these failure are ignore
>
> Generally, if some SHA was rebased away it's not coming back so
> there is no point in not doing this force
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> This seems to fix the issue when building against our internal trees
> which are constantly rebased wrt to git fetch throwing errors if a
> non fast-forward-able branch is found
>
> lib/bb/fetch2/git.py | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Merged to master, thanks.
Richard
prev parent reply other threads:[~2011-10-03 10:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-27 21:41 [PATCH] Make git fetch run with -f so rebased branches don't fail Matthew McClintock
2011-10-03 10:47 ` Richard Purdie [this message]
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=1317638882.4454.71.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=bitbake-devel@lists.openembedded.org \
--cc=msm@freescale.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