From patchwork Mon Aug 25 15:58:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 382776 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A51DB14007B for ; Tue, 26 Aug 2014 02:00:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C35794B612; Mon, 25 Aug 2014 18:00:36 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qjPKCF9y5XRL; Mon, 25 Aug 2014 18:00:36 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EBDD7A73FD; Mon, 25 Aug 2014 17:59:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A30BFA73F9 for ; Mon, 25 Aug 2014 17:59:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2eA4cvmV3baj for ; Mon, 25 Aug 2014 17:59:08 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ie0-f201.google.com (mail-ie0-f201.google.com [209.85.223.201]) by theia.denx.de (Postfix) with ESMTPS id 2FA0A4B5CB for ; Mon, 25 Aug 2014 17:58:51 +0200 (CEST) Received: by mail-ie0-f201.google.com with SMTP id tr6so1418428ieb.4 for ; Mon, 25 Aug 2014 08:58:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SXJT2RXDo+Y09Lcwz9wUpw341sAIO+UYlsId3Klkbgk=; b=QZWjPIKQu5TpvA0CVfrHBimjnBmmn4zathQH7ma/2zlCDbbfRQVWQH6c/G5ICZxE0N JQMW5zEAbn72iGh5PchLkrYVp20FplMoN1gtqWqZGrlE5daSP6pfzZ8/c7DYkc6GYHxz rqEo06W9oc+bMJ+lKWAZVrcVg17rnwdxYyfn9Tb6O3nbWUttWN3pRUVYMGfFSpa499DI NqwO3s/tAc3O5iBOhleoBCFJb3FOWIhtzV4wUsUjwrq8A7j9V6BVsAMD6pderwosAONC SGZJ/d1Zap7TMHj/l+DqxJHTIyDHNP5fesZqmx5W3fmsPUrtUsLIqybTxd8uhWaKdacZ i4gA== X-Gm-Message-State: ALoCoQkAgou0/aEGqgewCULk1K7MLkxG3UQBLwswOQGdUHAiM6vVQOKoFE0zl/SX0meqzRylRyY3 X-Received: by 10.182.45.162 with SMTP id o2mr15183454obm.20.1408982330223; Mon, 25 Aug 2014 08:58:50 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id c77si16138yha.5.2014.08.25.08.58.50 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 08:58:50 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 14B5F31C2F5; Mon, 25 Aug 2014 08:58:50 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id BB916220545; Mon, 25 Aug 2014 09:58:49 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 25 Aug 2014 09:58:34 -0600 Message-Id: <1408982315-18610-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1408982315-18610-1-git-send-email-sjg@chromium.org> References: <1408982315-18610-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , u-boot-review@google.com, York Sun Subject: [U-Boot] [PATCH v9 13/14] patman: Fix detection of git version X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de A missing 'global' declaration means that this feature does not currently work. Fix it. Signed-off-by: Simon Glass --- Changes in v9: - Add new patch to fix detection of git version Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None tools/patman/gitutil.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index fbd170f..80edc7c 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -481,6 +481,8 @@ def GetDefaultUserEmail(): def Setup(): """Set up git utils, by reading the alias files.""" # Check for a git alias file also + global use_no_decorate + alias_fname = GetAliasFile() if alias_fname: settings.ReadGitAliases(alias_fname)