From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35291-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 29880 invoked by alias); 25 May 2015 18:18:04 -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: 35291
Received: (qmail 14947 invoked from network); 25 May 2015 18:18:01 -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=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.0
Date: Mon, 25 May 2015 18:17:53 +0000
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Zsh Hackers' List <zsh-workers@zsh.org>
Subject: Re: Error messages from VCS_INFO_get_data_git
Message-ID: <20150525181753.GG26436@vauxhall.crustytoothpaste.net>
References: <20150524202415.GD26436@vauxhall.crustytoothpaste.net>
 <55636447.8000104@thequod.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="54ZiyWcDhi/7bWb8"
Content-Disposition: inline
In-Reply-To: <55636447.8000104@thequod.de>
X-Machine: Running on vauxhall using GNU/Linux on x86_64 (Linux kernel
 3.16.0-4-amd64)
User-Agent: Mutt/1.5.23 (2014-03-12)

--54ZiyWcDhi/7bWb8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, May 25, 2015 at 08:04:55PM +0200, Daniel Hahler wrote:
> On 24.05.2015 22:24, brian m. carlson wrote:
>=20
> >   grep: .git/rebase-merge/git-rebase-todo: No such file or directory
> >=20
> > 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.
>=20
> The file is used with interacive rebasing ("git rebase -i"), see
> git-rebase--interactive.sh in Git's source.
>=20
> 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"?

Yes, in this particular case I'm running into a conflict.  It's just git
rebase -m, not git rebase -i -m.  The file in question is only used by
git-rebase--interactive.sh, which is only triggered with -i.

It always happens when I encounter a conflict with git rebase -m without
using -i.
--=20
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187

--54ZiyWcDhi/7bWb8
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJVY2dRAAoJEL9TXYEfUvaLgP0P/2pkkSErOnMs1aGZs6CD7Sfc
NDt6dLV4sJ2qBAPV3JuvcKcAr+bHm3FoypLSiEeKv9ul/rMOK8xhE6tqU+LskNUo
JGxfSauXeTC4mgKK4l7BOwkQ4/PP6J6iKdGxB45Zf9vkvL7chIIglBetgE17Tkr9
Hl2opjYazb4wPp7anLUevYApNmvrfzvB8VsiiDN4x24OZtHkauT0+Asp4R1nwTig
VpOOBp0Sz3bdZ3CeNQNL5sH/Jtj71vH0FgT8edpVXjhGJM05U/LTENK64VE45WLL
WdYvvxDD5l8z/o5ElXgapkK/lq2rjUnQD4g6bvTvO1jfNmjEYMozT4mDjywE9nWd
1rlSSEZrMAuY7/69UB85TdCidLK+kQF/jnK8Jaox1EIgM1vYBZfkw1VieUgZS/PL
YJq+GdB2ZLowZahBkekMCbgze39bt+YW6MJPOkXziKeQeNq/WDhLhPCGsKbXmUlY
h9U3tE/s3ybOpIaiW5aXbD2bayKT0Q8x+AMMw+eiOd/7zej3KxVQk0fPcXShYlVW
arVeqf29Pr/8ArnoN3897I5JMZfFS6Ft96mmrwE80FlS3D/e85cyWpSG1OE+bPmT
sWXXxgF3qXOETaCfhCzxVJbIDU6Hq/pLvkiAF3HnejPfaJFfV6EWUmrdJHsSR9B+
9ulqif0PnaZuU94FtAyA
=ycCt
-----END PGP SIGNATURE-----

--54ZiyWcDhi/7bWb8--