[PATCH v4] nmbug: Add an 'init' command

Subject: [PATCH v4] nmbug: Add an 'init' command

Date: Sun, 18 Jan 2015 16:40:10 -0800

To: notmuch@notmuchmail.org


From: W. Trevor King

For folks that want to start versioning a new tag-space, instead of
cloning one that someone else has already started.

The empty-blob hash-object call avoids errors like:

  $ nmbug commit
  error: invalid object 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 for
  fatal: git-write-tree: error building trees
  'git HASH(0x9ef3eb8) write-tree' exited with nonzero value

David Bremner suggested [1]:

  $ git hash-object -w /dev/null

instead of my Python version of:

  $ git hash-object -w --stdin <&-

but I expect that closing stdin is more portable than the /dev/null
path (which doesn't exist on Windows, for example).

The --bare init and use of NMBGIT as the work tree (what could go
wrong with an empty commit?) are suggestions from Michal Sojka [2].

[1]: id:87y4vu6uvf.fsf@maritornes.cs.unb.ca
[2]: id:87a93a5or2.fsf@resox.2x.cz
Since v3 [1] I've incorporated Michal's suggestions [2]:

* Start with 'git --git-dir {NMBGIT} init --bare
* Use NMBGIT instead of a temporary workdir when creating the initial
  “Start a new nmbug repository” commit.

As well as the core.logallrefupdates tweak I turned up in testing [3].

[1]: id:113512958b3fd64902517c1c55576faef816f852.1414532174.git.wking@tremily.us
[2]: id:87a93a5or2.fsf@resox.2x.cz
[3]: id:20141129201829.GI4062@odin.tremily.us

 devel/nmbug/nmbug | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
index 932ec12..1297345 100755
--- a/devel/nmbug/nmbug
+++ b/devel/nmbug/nmbug
@@ -374,6 +374,25 @@ def fetch(remote=None):
     _git(args=args, wait=True)
+def init(remote=None):
+    """
+    Create an empty nmbug repository.
+    This wraps 'git init' with a few extra steps to support subsequent
+    status and commit commands.
+    """
+    _spawn(args=['git', '--git-dir', NMBGIT, 'init', '--bare'], wait=True)
+    _git(args=['config', 'core.logallrefupdates', 'true'], wait=True)
+    # create an empty blob (e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+    _git(args=['hash-object', '-w', '--stdin'], input='', wait=True)
+    _git(
+        args=[
+            'commit', '--allow-empty', '-m', 'Start a new nmbug repository'
+        ],
+        additional_env={'GIT_WORK_TREE': NMBGIT},
+        wait=True)
 def checkout():
     Update the notmuch database from Git.
@@ -725,6 +744,7 @@ if __name__ == '__main__':
+            'init',