Date: Wed, 9 Apr 2014 19:05:59 -0700
From: "W. Trevor King" <wking@tremily.us>
To: David Bremner <david@tethera.net>
Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}
	changes
Message-ID: <20140410020559.GC21805@odin.tremily.us>
References: <878urg849d.fsf@zancas.localnet>
	<151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>
	<871tx67nnx.fsf@zancas.localnet>
	<20140409210108.GB21805@odin.tremily.us>
	<87sipm576i.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="XWOWbaMNXpFDWE00"
Content-Disposition: inline
In-Reply-To: <87sipm576i.fsf@zancas.localnet>
OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;
	url=http://tremily.us/pubkey.txt
User-Agent: Mutt/1.5.22 (2013-10-16)
Cc: notmuch <notmuch@notmuchmail.org>
Precedence: list


--XWOWbaMNXpFDWE00
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Apr 09, 2014 at 10:01:25PM -0300, David Bremner wrote:
> W. Trevor King writes:
>=20
> > We need non-bare repositories to have remote-tracking branches
> > (distinct from local branches) [3], and we need remote-tracking
> > branches to have working @{upstream}.
>=20
> OK, I see what you mean, the repository has "bare =3D false". On the
> other hand we immediately blow away the work tree,

But whenever we do anything that might involve a working directory
(just merging), we create a temporary one and set GIT_WORK_TREE.  So
the ~/.nmbug repo is a plain-vanilla, non-bare repo with an ephemeral
working directory.

> > I think that's reasonable support for my claim (and most of it is in
> > the original c200167 commit message), but maybe not?
>=20
> In any case, I think I think it's mainly a technicality, and that we
> want to keep the level of detail in the release notes down a bit.
> If you don't like the above mini-patch, then maybe a NOTES section
> in the nmbug docs.

Sure.  I think my previous email was my shot at explaining the
situation ;).  If it wasn't clear, maybe someone else could take a
stab at a NOTES blurb.

> >> Is the "remote repository" in step 1 meant to be the central repo? or
> >> just a backup?
> >
> > The backup.  If you have nothing to backup, you already got everything
> > back after cloning the central repo.
>=20
> It might be less confusing to explicitly use the word "backup" in
> step 1 then.

How about:

  1. If you have any purely local commits (i.e. they aren't in the
     nmbug repository on nmbug.tethera.net), push them to a remote
     repository.  We'll restore them from the backup in step 4.

?

We can also use the suggested ~/.nmbug.bak from step 2 as the backup
repository in step 4.  I chose the current broad-sketch approach for
steps 1 and 4, because I assumed folks with local commits would be
comfortable pushing Git branches around, and didn't want to imply that
I'd covered all the corner cases (e.g. folks with my-funky-tags
branches or other wonky repos).

Cheers,
Trevor

--=20
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

--XWOWbaMNXpFDWE00
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJTRfyFAAoJEKKfehoaNkbtDfUQAKbOeUk+VamOoOt4BnIQWoGJ
8Sz32gRPlKE2p+3VnEEsh9NADUsyzO1Iq2snVqg9eyq9KBlMciL5wStEhnzrQFdj
5j+joJSlav9tkRFhVmhKvVGzRDMaVUBwD90LU13n8QUxjXnrBDOQzajVlKp6XPof
yHyZOsOSisW+RoeJvAkDDJ4ykeOsLChnivFN4gkMjkqFMAs4Az0p+eGI5hA1u5A+
ITdzkeD5odf4LBNE3dCsqBjosfCa+1gE5nUwxylu/AiRuAjB+t+ouMZadAYqqZuD
lbLbS9upJx9+pc/W//ovr5IB5fDpCZ6qSqx7qYcSy071u5MCswv6eHDFNa38LlI+
vLUqQIm6QHNtqGux55eL6w2wAG0hNCmPv4pxM4PNbb4QWYHZYyoIGu5AMxVn1haH
5kXZCQhu73i7XhyDRT3mxsCCTWnNft3SheXVmeBCsyiLIcI4PBUai6vK/GSqpT2F
uiOceYSFGKOsuaNK7pxY3pQQSOxMewJUzqY+6Ptmrb6lKG1azxjE1o+fGladAynz
oQKMb42aVWGDVhT7jRxRg8UVIA2AE45gO/R36Jg9ctdw/j2dK9v0k2qF6rzOljr1
g1IOCZZZtbVRJOh4uDg45bBN9aCfPvW1qKv7KoGEcbRPi+P2EjEkS21yEAnO04oa
5CdOvb+W0dGb6Pb4uNG0
=nEiu
-----END PGP SIGNATURE-----

--XWOWbaMNXpFDWE00--