From: Michael Lukashov <michael.lukashov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] pull: fix 'git pull --all' when current branch is tracking remote that is not last in the list of remotes
Date: Wed, 24 Feb 2010 02:44:28 +0300 [thread overview]
Message-ID: <63cde7731002231544k4140d0d8u65e8c7250a8ff42c@mail.gmail.com> (raw)
In-Reply-To: <7vtyt75zdo.fsf@alter.siamese.dyndns.org>
On Wed, Feb 24, 2010 at 2:02 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Michael Lukashov <michael.lukashov@gmail.com> writes:
>
>> diff --git a/git-pull.sh b/git-pull.sh
>> index 38331a8..fcde096 100755
>> --- a/git-pull.sh
>> +++ b/git-pull.sh
>> @@ -214,7 +214,11 @@ test true = "$rebase" && {
>> done
>> }
>> orig_head=$(git rev-parse -q --verify HEAD)
>> -git fetch $verbosity --update-head-ok "$@" || exit 1
>> +if test -e "$GIT_DIR"/FETCH_HEAD
>> +then
>> + rm "$GIT_DIR"/FETCH_HEAD 2>/dev/null
>> +fi
>
> When is it sane to ignore an error from this "rm", especially after you
> made sure that it exists?
>
The file "$GIT_DIR"/FETCH_HEAD is rewritten
in subsequent call to 'git fetch', thus it is safe to ignore all errors.
next prev parent reply other threads:[~2010-02-23 23:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-23 22:55 [PATCH] pull: fix 'git pull --all' when current branch is tracking remote that is not last in the list of remotes Michael Lukashov
2010-02-23 23:02 ` Junio C Hamano
2010-02-23 23:44 ` Michael Lukashov [this message]
2010-02-24 0:22 ` Junio C Hamano
2010-02-24 13:07 ` [PATCH v2] " Michael Lukashov
2010-02-24 13:33 ` Paolo Bonzini
2010-02-24 17:05 ` Junio C Hamano
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=63cde7731002231544k4140d0d8u65e8c7250a8ff42c@mail.gmail.com \
--to=michael.lukashov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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;
as well as URLs for NNTP newsgroup(s).