From bb3c417f6f5ac80fb186b2c8809f04595634e769 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 21 Feb 2013 18:24:36 +2000 Subject: [PATCH] [Patch v2 3/4] nmbug: replace hard-coded magic hash with git-hash-object --- c9/b395f7bdb78871a81b88831658aae345a9b6a9 | 91 +++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 c9/b395f7bdb78871a81b88831658aae345a9b6a9 diff --git a/c9/b395f7bdb78871a81b88831658aae345a9b6a9 b/c9/b395f7bdb78871a81b88831658aae345a9b6a9 new file mode 100644 index 000000000..315fe4cf4 --- /dev/null +++ b/c9/b395f7bdb78871a81b88831658aae345a9b6a9 @@ -0,0 +1,91 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 69CC9431FB6 + for ; Wed, 20 Feb 2013 14:24:55 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id pjzOa9e9uA7E for ; + Wed, 20 Feb 2013 14:24:54 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1CC0E431FBD + for ; Wed, 20 Feb 2013 14:24:54 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) + (envelope-from ) + id 1U8I5r-00086U-8S; Wed, 20 Feb 2013 18:24:51 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1U8I5l-00028L-In; Wed, 20 Feb 2013 18:24:45 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 3/4] nmbug: replace hard-coded magic hash with + git-hash-object +Date: Wed, 20 Feb 2013 18:24:36 -0400 +Message-Id: <1361399077-7737-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1361399077-7737-1-git-send-email-david@tethera.net> +References: <1361399077-7737-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 20 Feb 2013 22:24:55 -0000 + +From: David Bremner + +This is at least easier to understand than the magic hash. It may also +be a bit more robust, although it is hard to imagine these numbers +changing without many other changes in git. +--- + devel/nmbug/nmbug | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug +index 73d64fe..b9c70e4 100755 +--- a/devel/nmbug/nmbug ++++ b/devel/nmbug/nmbug +@@ -15,9 +15,6 @@ $NMBGIT .= '/.git' if (-d $NMBGIT.'/.git'); + + my $TAGPREFIX = $ENV{NMBPREFIX} || 'notmuch::'; + +-# magic hash for git +-my $EMPTYBLOB = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'; +- + # for encoding + + my $ESCAPE_CHAR = '%'; +@@ -50,6 +47,9 @@ if (!exists $command{$subcommand}) { + usage (); + } + ++# magic hash for git ++my $EMPTYBLOB = git (qw{hash-object -t blob /dev/null}); ++ + &{$command{$subcommand}}(@ARGV); + + sub git_pipe { +-- +1.7.10.4 + -- 2.26.2