1 Return-Path: <wking@tremily.us>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 12BCB431FC0
\r
6 for <notmuch@notmuchmail.org>; Mon, 14 Jul 2014 10:52:22 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id I3ogT9vhdb64 for <notmuch@notmuchmail.org>;
\r
17 Mon, 14 Jul 2014 10:52:14 -0700 (PDT)
\r
18 Received: from qmta02.emeryville.ca.mail.comcast.net
\r
19 (qmta02.emeryville.ca.mail.comcast.net [76.96.30.24])
\r
20 by olra.theworths.org (Postfix) with ESMTP id F2B34431FBC
\r
21 for <notmuch@notmuchmail.org>; Mon, 14 Jul 2014 10:52:13 -0700 (PDT)
\r
22 Received: from omta10.emeryville.ca.mail.comcast.net ([76.96.30.28])
\r
23 by qmta02.emeryville.ca.mail.comcast.net with comcast
\r
24 id SFAh1o0040cQ2SLA2HsDrT; Mon, 14 Jul 2014 17:52:13 +0000
\r
25 Received: from odin.tremily.us ([24.18.63.50])
\r
26 by omta10.emeryville.ca.mail.comcast.net with comcast
\r
27 id SHsC1o00B152l3L8WHsCK2; Mon, 14 Jul 2014 17:52:13 +0000
\r
28 Received: by odin.tremily.us (Postfix, from userid 1000)
\r
29 id 23064128C384; Mon, 14 Jul 2014 10:52:12 -0700 (PDT)
\r
30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;
\r
31 t=1405360332; bh=VC+Uml0P4C1slEfmDGiCJHalqmC08etejlV9uq4XJIo=;
\r
32 h=Date:From:To:Cc:Subject:References:In-Reply-To;
\r
33 b=dufMYU0jc4ic2nVutANaK1JVW89lL9qejvZqo/DTkeSsrmQLDeZsbOI5+2+b/GsZG
\r
34 VkXxm3ghRrQssDpPyWPJ7uPlJlcHod5tDlA2H1l4Rsj/n6E7/PdK+ZGqkB2Aa0cE79
\r
35 u9HXHvw2Syxi2PIlfmnixchMTVNiuy8wzpjvVT3c=
\r
36 Date: Mon, 14 Jul 2014 10:52:12 -0700
\r
37 From: "W. Trevor King" <wking@tremily.us>
\r
38 To: David Bremner <david@tethera.net>
\r
39 Subject: Re: [PATCH 2/2] nmbug-status: Use 'show-ref --heads' for loading
\r
41 Message-ID: <20140714175211.GF23983@odin.tremily.us>
\r
42 References: <cover.1399749244.git.wking@tremily.us>
\r
43 <7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us>
\r
44 <87tx6lfnjz.fsf@maritornes.cs.unb.ca>
\r
45 <20140713181339.GB23983@odin.tremily.us>
\r
46 <87pph8b751.fsf@maritornes.cs.unb.ca>
\r
48 Content-Type: multipart/signed; micalg=pgp-sha1;
\r
49 protocol="application/pgp-signature"; boundary="wtjvnLv0o8UUzur2"
\r
50 Content-Disposition: inline
\r
51 In-Reply-To: <87pph8b751.fsf@maritornes.cs.unb.ca>
\r
52 OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;
\r
53 url=http://tremily.us/pubkey.txt
\r
54 User-Agent: Mutt/1.5.23 (2014-03-12)
\r
55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
56 s=q20140121; t=1405360333;
\r
57 bh=C7TwcCkcQkwlHmEiO3iYu+O3BFktf+WC4SkgGY5tacE=;
\r
58 h=Received:Received:Received:Date:From:To:Subject:Message-ID:
\r
59 MIME-Version:Content-Type;
\r
60 b=Yuy7wSTy1WqtgQ2Ms6jwqPo8Rxyuf+n8xid6VabLh9k5XYKE1WglY3tfJD4huCje/
\r
61 fTDP9YIkRVFiox/cxtBVeOGNCiTCsTR8dO9d6JOTgNFZQo/NX/UjaXKn4E5jYBASwH
\r
62 qdJtz6THe5EnsS403ioBEudWd2XBT9erA2KB9Sjm3VYXVRm8QN3nVuP+AG4A0MHbOS
\r
63 kwsjcTWkutS6ze4KtbDMiFXd6oorlJHWDSQLZ7YPrBZBWROfofe3TgXEWCp0Y9+7QY
\r
64 ZhSxfC9/oahPoPyxTBobiH9z4TZzC7XDFiWCShRWJo6lWFJnCei9FqkRKueStRDL0x
\r
66 Cc: notmuch@notmuchmail.org
\r
67 X-BeenThere: notmuch@notmuchmail.org
\r
68 X-Mailman-Version: 2.1.13
\r
70 List-Id: "Use and development of the notmuch mail system."
\r
71 <notmuch.notmuchmail.org>
\r
72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
75 List-Post: <mailto:notmuch@notmuchmail.org>
\r
76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
78 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
79 X-List-Received-Date: Mon, 14 Jul 2014 17:52:22 -0000
\r
83 Content-Type: text/plain; charset=utf-8
\r
84 Content-Disposition: inline
\r
85 Content-Transfer-Encoding: quoted-printable
\r
87 On Mon, Jul 14, 2014 at 06:51:22AM -0300, David Bremner wrote:
\r
88 > W. Trevor King writes:
\r
89 > > On Sun, Jul 13, 2014 at 09:30:56AM -0300, David Bremner wrote:
\r
90 > >> I consider it a useful feature that it works without the user
\r
91 > >> configuring a local branch. I agree that in more complex setups
\r
92 > >> this ambiguity is not as nice, but I'd rather it was only the
\r
93 > >> minority of users with unusual setups (e.g. multiple remotes)
\r
94 > >> have to do configuration.
\r
96 > > I could work up a patch that tried =E2=80=98git show-ref -s config=E2=
\r
98 > > and only fell back to =E2=80=98show-ref -s --heads=E2=80=99 if there we=
\r
100 > > matches. That way folks with only origin/config wouldn't need a
\r
101 > > local branch, but folks with multiple config-carrying remotes (or
\r
102 > > a single config-carrying remote and a local branch) would have to
\r
103 > > have a local config to break the tie. That's possible, and not
\r
104 > > *too* complicated, but I personally prefer the consistency of just
\r
105 > > requiring a local config branch.
\r
107 > It might be simpler to implement (and understand) to try first the
\r
108 > local config branch and then fall back to "origin/config".
\r
110 I'd rather avoid hard-coding an upstream name here. We do hard-code
\r
111 =E2=80=98origin=E2=80=99 as the default remote for =E2=80=98fetch=E2=80=99,=
\r
112 =E2=80=98pull=E2=80=99, and =E2=80=98push=E2=80=99. I'd
\r
113 rather drop those in favor of the configured Git defaults (for
\r
114 example, running a bare =E2=80=98git fetch=E2=80=99 if the user doesn't spe=
\r
116 remote). For most configurations, falling back to =E2=80=9CIs =E2=80=98git=
\r
118 -s config=E2=80=99 a unique hash?=E2=80=9D should be equivalent to hard-cod=
\r
120 show-ref -s origin/config=E2=80=99.
\r
126 This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
\r
127 For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
\r
130 Content-Type: application/pgp-signature; name="signature.asc"
\r
131 Content-Description: OpenPGP digital signature
\r
133 -----BEGIN PGP SIGNATURE-----
\r
136 iQIcBAEBAgAGBQJTxBjFAAoJEG8/JgBt8ol8PmIQAIZm0ukpY20SKwS+SEBnn3Nj
\r
137 ue+mHlzd1tyEeumvqSJzkFZ8yHeXA6ODCDjXhxEy+bgp52SeJoHURYwEFplKmtTt
\r
138 WGbYZCq36luDcrp4gBjCqMKVDwwGg43jTZcac4TDxp8+/69i6RTfUyJrg38UCL+N
\r
139 /YSjfDDBgCX/AmU0Z0/JszUCKP8yPN8wrS1irqRxx3JRSUt8zQi72Tmwk3UjfcP6
\r
140 ZkaxDAKofVA9Oaw0Wv5+FvpOdgSCYGoBgFsHh4zFrJX+e5GLWUzWb7p0pHKeusar
\r
141 qMxpEB0Q0/EVZHu66WFUnvXcYNXin7sK4zAuBGt6HYnKblxDq52ILxDgPSAzPLPS
\r
142 XjyHsgNRYh+F5IWAZTzAD0QgdKusH5eJ5BTUMD11pSx6vwISdJI2O/hsZqNrDxF+
\r
143 GJl3wTtV7FW6Jk4dDd7miSs2sP3b4eJkRpxoD1GzJmaOhlYHHsnf7Vp9qMw+oKva
\r
144 ewcxL/e2xiz9tVA045PfMTCEuF7BbuwhX4AJ4gduDGNpmeYTh0pd8g7xU/qcD3pW
\r
145 xUSK6X9f/VhHU+eJXVH5eRjhebd90KEqa8oli/0STlcIayXAmkTOxRC8VYp8ccc+
\r
146 j/Knf6xFZaNf1fuq89CaXhBtqgcyBIedQZXCLAxB15KKshcLYfSjQnq2ib/fbB7S
\r
147 9Y7cSZFaYt5Oi2XKti49
\r
149 -----END PGP SIGNATURE-----
\r
151 --wtjvnLv0o8UUzur2--
\r