From patchwork Fri Jan 17 07:47:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 1224669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-517570-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axis.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=roQZQTqk; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47zY8B1nWrz9sRQ for ; Fri, 17 Jan 2020 18:48:08 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=pKVTOd8ayVwrWYwf LH1g0vGbpgUSl7dEahtgSmpUZNduT7y6RUrnliNZUmasX0oJgdnYgtLP7em/oyhy eNLP3pqlsq/u9zeJKp4XWWi62anVP2DYcHx+FOYlClZxfc8K/BsHLD52LMpTBKic BJrcgoyO9/Alpkz/28+CRK/s+rI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; s=default; bh=fUQue6WnH5FBYVEt91VJBt X6ZIw=; b=roQZQTqkYUBn8m1fVWkcKqZX320qDCl8jOlxhzaw2qEG/IvFRblXiv 32kblyVoo1SMe2rzOHcVexonAfqpMuxs/g2b9pt70FKSoDP9bl/2Hxzxf2TlnZAT 0sXu3EW/UsGh5gQ1+sdpBRTH6ogEKNXxYUlFCgtfyO1Bv+c5U0Ook= Received: (qmail 10508 invoked by alias); 17 Jan 2020 07:47:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 10492 invoked by uid 89); 17 Jan 2020 07:47:59 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=touching X-HELO: smtp1.axis.com Received: from smtp1.axis.com (HELO smtp1.axis.com) (195.60.68.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Jan 2020 07:47:49 +0000 IronPort-SDR: NrcZW+qCpJj7jJalSHdGh4Bw1bY1pxA4WtGbYWovBAGlIxKBsElHDnUY28pYTjKLJUBWk/recw 7pCKeI+YJbhHRBpymFKwdnffFYaaXUQZTiYN2OnagK39VMTBdQ8KWlbtk41bgIWhnITbLty1gO IYmv7/o4F5Ap339gS+6imoVKxYwJ9yyGZdNBZKZYK+lBd3o8Y7Q4QcvW/p+p2dh+NTuZGGDln2 T/qKD/VMN/XmPtYsCozcxTWZibXXADqCSynZ7QUoYYChHKQO7JwH5CVutdoM9k8PuKw532VRec 6B8= Date: Fri, 17 Jan 2020 08:47:45 +0100 Message-ID: <202001170747.00H7ljnC021131@ignucius.se.axis.com> From: Hans-Peter Nilsson To: Subject: [COMMITTED] contrib/gcc_update: Insert "tformat:" for git log --pretty=tformat:%p:%t:%H MIME-Version: 1.0 X-IsSubscribed: yes Really old git versions (like 1.6.0) require "git log --pretty=tformat:%p:%t:%H" or else we see: Updating GIT tree Current branch master is up to date. fatal: invalid --pretty format: %p:%t:%H Adjusting file timestamps Touching gcc/config.in... Touching gcc/config/arm/arm-tune.md... ...and an empty revision in LAST_UPDATED and gcc/REVISION. In its absence, for newer git versions, "tformat" is the default qualifier, documented as such default for at least git-2.11.0. Committed as obvious. brgds, H-P diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 16d0667..4e89b8d 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2020-01-17 Hans-Peter Nilsson + + * gcc_update : Use git log "--pretty=tformat:%p:%t:%H", + not "--pretty=%p:%t:%H". + 2020-01-16 Andreas Schwab * gcc-git-customization.sh: Avoid double expansion. diff --git a/contrib/gcc_update b/contrib/gcc_update index 5df3297..8c980b1 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -330,7 +330,7 @@ case $vcs_type in exit 1 fi - revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H` + revision=`$GCC_GIT log -n1 --pretty=tformat:%p:%t:%H` branch=`$GCC_GIT name-rev --name-only HEAD || :` ;;