From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35290-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 10894 invoked by alias); 25 May 2015 18:05:01 -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: 35290
Received: (qmail 13293 invoked from network); 25 May 2015 18:04:58 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU autolearn=ham autolearn_force=no version=3.4.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thequod.de; h=
	content-transfer-encoding:content-type:content-type:in-reply-to
	:references:subject:subject:mime-version:user-agent:from:from
	:date:date:message-id:received:received; s=postfix2; t=
	1432577095; bh=RQv0MPTSQjbtaKmzgPnn5uBLUosJ0jZhGiJYq7A14c4=; b=F
	eM50t1dEusDayOHbX9b/cK/4vo5rAOrkW94mCakJuvxnGHONOR4RHGDtnI4JPK8V
	ownLUjaUoN9frmQhzU7L17YdMTqDuyWSnZi4Ksymi242d6YYtZjIgy6ti/hH7FQx
	LVyiwZhwqUwdIV5SaCeHudb2EgxBJFnoLKJSHw6jVc=
Message-ID: <55636447.8000104@thequod.de>
Date: Mon, 25 May 2015 20:04:55 +0200
From: Daniel Hahler <genml+zsh-workers@thequod.de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
MIME-Version: 1.0
To: "brian m. carlson" <sandals@crustytoothpaste.net>, 
 Zsh Hackers' List <zsh-workers@zsh.org>
Subject: Re: Error messages from VCS_INFO_get_data_git
References: <20150524202415.GD26436@vauxhall.crustytoothpaste.net>
In-Reply-To: <20150524202415.GD26436@vauxhall.crustytoothpaste.net>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 24.05.2015 22:24, brian m. carlson wrote:

> I'm using zsh 5.0.7 and I'm seeing some error messages when I use git
> rebase -m with vcs_info.  One is already fixed in git, and if I copy the
> git version of the file over my existing copy, I get the following:
> 
>   grep: .git/rebase-merge/git-rebase-todo: No such file or directory
> 
> I'm using Git 2.4.0, and that file doesn't appear to exist in newer Git
> versions.  I've also tried with Git 2.1.4, and it appears to be absent
> there as well.

The file is used with interacive rebasing ("git rebase -i"), see
git-rebase--interactive.sh in Git's source.

Were you running into a conflict with "git rebase -m", or used some other
option that would have aborted/interrupted it?
Does it happen for every "git rebase -m"?

The code path is only triggered when ".git/rebase-merge" exists:

    elif [[ -d "${gitdir}/rebase-merge" ]]; then

And that's what Git (2.4.1+) checks/uses in wt-status.c:

	} else if (!stat(git_path("rebase-merge"), &st)) {
		if (!stat(git_path("rebase-merge/interactive"), &st))
			state->rebase_interactive_in_progress = 1;
		else
			state->rebase_in_progress = 1;
		state->branch = read_and_strip_branch("rebase-merge/head-name");
		state->onto = read_and_strip_branch("rebase-merge/onto");

> The fix is probably as simple as redirecting stderr in that case to
> /dev/null.  A patch to do exactly that is attached.

Thanks, but I think there should be a "test -f ..." instead.


Regards,
Daniel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iD8DBQFVY2RHfAK/hT/mPgARAiWQAJ4xK86pt5NBgUEComofKjzCwQO0VACfel5v
yMKm1XHzR5oQB79/btB7yn0=
=JEo/
-----END PGP SIGNATURE-----