On Wed, Feb 24, 2010 at 2:02 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Michael Lukashov <michael.lukashov@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html