From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-34861-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 11736 invoked by alias); 9 Apr 2015 07:51:56 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 34861
Received: (qmail 8701 invoked from network); 9 Apr 2015 07:51:54 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham
	version=3.3.2
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=2PwdqBC5wqtnB5oczC8riaqc6zE2YQ6DUD7q4iibnZs=;
        b=sajkAHwDdcpc9b5XvhCwxpbMe6e3hf/FAKU+1Cpk/3LTPK2+882M/VNfcCjwIQ7FfR
         mScwcHOHeCKI/oYAZLnm46JJBcZiibEmtEn2jTLrMLu7Mni4IzVM+9sa/KLl/NMQ+4WW
         E/v6x8rbJWvdHwllOcbOypMPhoBp5ZxYmpbblDvc5IdxQsNmAUcnYr8QnaPnxoY4eHiX
         cY+iv7Ls+IFoUh244E6oxfFZIKayp8K7VyLQIeSnRhgs+OVviyHK5wxhSBxZG1cE8Qnp
         kpOoa4CFoya55YTt/x/VoSHYi2GmD7TgnMIFQ1FUxSb0o3IOErXS35asOE8KWG1/dQfA
         7t1w==
MIME-Version: 1.0
X-Received: by 10.50.114.4 with SMTP id jc4mr1144249igb.14.1428565909968; Thu,
 09 Apr 2015 00:51:49 -0700 (PDT)
In-Reply-To: <20150409070233.GI2805@localhost.localdomain>
References: <20150409070233.GI2805@localhost.localdomain>
Date: Thu, 9 Apr 2015 09:51:49 +0200
Message-ID: <CAHYJk3RfyGxQ5asmH45s_qBw-a6b8woh00G5NmBVa6Q2b2mf+A@mail.gmail.com>
Subject: Re: git pull failed
From: Mikael Magnusson <mikachu@gmail.com>
To: zsh workers <zsh-workers@zsh.org>, Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
Content-Type: text/plain; charset=UTF-8

On Thu, Apr 9, 2015 at 9:02 AM, Han Pingtian <hanpt@linux.vnet.ibm.com> wrote:
> Hi,
>
> Today git pull failed with those message:
>
> % git pull
> remote: Counting objects: 51, done.
> remote: Compressing objects: 100% (35/35), done.
> remote: Total 35 (delta 30), reused 0 (delta 0)
> Unpacking objects: 100% (35/35), done.
> From git://git.code.sf.net/p/zsh/code
>  + ca946b6...be5f561 master     -> origin/master  (forced update)
[...]
> What shall I do for pulling master?

I guess someone did a push -f, which they definitely should not be
doing on a public repo. You were unlucky and pulled the commit that
was since deleted. You can get back to a normal state by issuing
git reset --hard origin/master
(this will delete any committed or uncommited changes you have on the
local master branch).

-- 
Mikael Magnusson