From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22963 invoked by alias); 23 Jan 2015 19:47:30 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 34359 Received: (qmail 26296 invoked from network); 23 Jan 2015 19:47:26 -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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-Originating-IP: [86.6.153.127] X-Spam: 0 X-Authority: v=2.1 cv=S8BXwecP c=1 sm=1 tr=0 a=39NrsSuza2clQiZR/7fYWQ==:117 a=39NrsSuza2clQiZR/7fYWQ==:17 a=IkcTkHD0fZMA:10 a=NLZqzBF-AAAA:8 a=vaJtXVxTAAAA:8 a=q2GGsy2AAAAA:8 a=IORGFuxx9-hihfRtlyoA:9 a=QEXdDO2ut3YA:10 Date: Fri, 23 Jan 2015 19:47:19 +0000 From: Peter Stephenson To: "zsh-workers@zsh.org" Subject: Re: Anyone want to help make zsh/db/gdbm work? Message-ID: <20150123194719.229de1fb@ntlworld.com> In-Reply-To: <1300561422028154@web18g.yandex.ru> References: <150122211942.ZM28918@torch.brasslantern.com> <4302591421991433@web9g.yandex.ru> <150122215955.ZM29120@torch.brasslantern.com> <1300561422028154@web18g.yandex.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 23 Jan 2015 18:49:14 +0300 ZyX wrote: > 23.01.2015, 09:00, "Bart Schaefer" : > > On Jan 23, =C2=A08:37am, ZyX wrote: > > } It looks like if you forgot to `git add` Doc/Zsh/mod_db_gdbm.yo. I do > > } not see it in the patch, only a small reference here. > > > > Actually what I didn't realize was that one has to diff against > > origin/master for new files, rather than against the local master. >=20 > I have run into this problem a few times: by default git diffs against > index (not the current revision) and when you do `git add` then file > is added to the index as a whole making just `git diff` not present > it. The standard fix for this is "git diff --staged" (or --cached) but you have to remember --- it's particular confusing if you've got some stuff staged and some not as you only get to see diffs for one or other. I'm not sure it's quite what Bart is talking about as that seems to be about committed files. pws