From: "W. Trevor King" <wking@tremily.us>
To: David Bremner <david@tethera.net>
Cc: notmuch <notmuch@notmuchmail.org>
Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes
Date: Wed, 9 Apr 2014 14:01:08 -0700 [thread overview]
Message-ID: <20140409210108.GB21805@odin.tremily.us> (raw)
In-Reply-To: <871tx67nnx.fsf@zancas.localnet>
[-- Attachment #1: Type: text/plain, Size: 3713 bytes --]
On Wed, Apr 09, 2014 at 08:22:26AM -0300, David Bremner wrote:
> W. Trevor King writes:
>
> > The changes just landed with c200167 (nmbug: Add 'clone' and replace
> > FETCH_HEAD with @{upstream}, 2014-03-09).
> >
> > The preferred markup language for NEWS seems to be Markdown, which is
> > parsed by devel/news2wiki.pl into Markdown chunks for rendering by
> > ikiwiki [1].
> >
> > [1]: http://notmuchmail.org/news/
> > ---
> > NEWS | 20 ++++++++++++++++++++
> > 1 file changed, 20 insertions(+)
> >
> > diff --git a/NEWS b/NEWS
> > index d4f4ea4..e26fa0a 100644
> > --- a/NEWS
> > +++ b/NEWS
> > @@ -20,6 +20,26 @@ Bug fix for saved searches with newlines in them.
> > Split lines confuse `notmuch count --batch`, so we remove embedded
> > newlines before calling notmuch count.
> >
> > +nmbug
> > +-----
> > +
> > +nmbug adds a `clone` command for setting up the initial repository and
> > +uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
> > +
> > + The `@{upstream}` change reduces ambiguity when fetching multiple
> > + branches, but requires existing users update their bare `NMBGIT`
> > + repository (usually `~/.nmbug`) to a non-bare repository. The
> > + easiest way to do this is:
>
> That bit about non-bare seems to be untrue/misleading?
The old repositories were bare [1]:
git clone --bare http://nmbug.tethera.net/git/nmbug-tags.git $HOME/.nmbug
the new repositories are not [2]:
system ('git', 'clone', '--no-checkout', '--separate-git-dir', $NMBGIT,
$repository, $tempwork) == 0
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}.
I think that's reasonable support for my claim (and most of it is in
the original c200167 commit message), but maybe not?
> As a step 0, I guess commit any tag changes to nmbug?
> > +
> > + 1. Push any local commits to a remote repository.
> > + 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
> > + 3. Use the new `clone` command to create a fresh clone:
> > +
> > + nmbug clone nmbug@nmbug.tethera.net:nmbug-tags
> > +
>
> Jani mentioned on IRC that some people might track nmbug in a read only
> way via git://
Sure. The current docs suggest HTTP [1], so I'm fine changing this to
the HTTP URL (or the Git URL). I think folks will get the idea
regardless. I can resubmit v2 with this update, or you can just
squash it in if/when this patch lands in master, whatever is easiest.
> > + 4. If you had local commits in step 1, add a remote for that
> > + repository and fetch them into the new repository.
>
> 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.
Cheers,
Trevor
[1]: http://notmuchmail.org/nmbug/
[2]: http://git.notmuchmail.org/git/notmuch/blob/c20016742681e1ed48c83de32639e10507ffa14d:/devel/nmbug/nmbug#l133
[3]: http://git.kernel.org/cgit/git/git.git/tree/Documentation/git-clone.txt
--bare::
Make a 'bare' Git repository…
Also the branch heads at the remote are copied directly
to corresponding local branch heads, without mapping
them to `refs/remotes/origin/`. When this option is
used, neither remote-tracking branches nor the related
configuration variables are created.
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-04-09 21:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 0:28 [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with @{upstream} W. Trevor King
2014-04-06 12:27 ` David Bremner
2014-04-08 11:11 ` WARNING: backwards incompatible change to nmbug pushed David Bremner
2014-04-08 15:57 ` [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes W. Trevor King
2014-04-09 11:22 ` David Bremner
2014-04-09 21:01 ` W. Trevor King [this message]
2014-04-10 1:01 ` David Bremner
2014-04-10 2:05 ` W. Trevor King
2014-04-08 11:12 ` [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with @{upstream} David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140409210108.GB21805@odin.tremily.us \
--to=wking@tremily.us \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).