From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17137 invoked by alias); 23 Jan 2015 15:49:24 -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: 34358 Received: (qmail 19480 invoked from network); 23 Jan 2015 15:49:21 -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,T_FSL_HELO_BARE_IP_2 autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1422028154; bh=yQvnplJ4Vdin0eUwaW3OAddkiDUGZTgvUHTd/tK1iG4=; h=From:To:In-Reply-To:References:Subject:Date; b=ut241N3HVckJA1qrorNzz8eU56diNPWlYZfvlyCAr2PAEsSWkZS3tafmtfknelr18 RhjabXF51FL6C9QyaPsUsq8NwxfxCN+RnOov3/Vpd3B5lw7GzLtQR7uR6mQT2QIu2Y 6ZIG+sqAROI+78Yl4BBbBjq/ihXMc/NimSUsnOtA= From: ZyX To: Bart Schaefer , "zsh-workers@zsh.org" In-Reply-To: <150122215955.ZM29120@torch.brasslantern.com> References: <150122211942.ZM28918@torch.brasslantern.com> <4302591421991433@web9g.yandex.ru> <150122215955.ZM29120@torch.brasslantern.com> Subject: Re: Anyone want to help make zsh/db/gdbm work? MIME-Version: 1.0 Message-Id: <1300561422028154@web18g.yandex.ru> X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Fri, 23 Jan 2015 18:49:14 +0300 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=koi8-r 23.01.2015, 09:00, "Bart Schaefer" : > On Jan 23, š8: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. > > Thanks. š(Though it would be nice if you actually trimmed out some of > the quoted context instead of just sticking a single sentence deep in the > middle of it.) > > Actually what I didn't realize was that one has to diff against > origin/master for new files, rather than against the local master. 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. I believe this is why `git add` has `--intent-to-add` option that just adds path with an empty contents so that after `git add --intent-to-add path` `git diff` will show the full diff. I prefer to use my aurum Vim plugin though: it tries to work as if git had no index and always diffs against HEAD or some revision, mainly because it was originally developed for mercurial and I wanted uniform interface.