From patchwork Mon Dec 9 11:52:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 11279239 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D169C13B6 for ; Mon, 9 Dec 2019 11:53:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1223207FF for ; Mon, 9 Dec 2019 11:53:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V0RdxPpi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727678AbfLILxT (ORCPT ); Mon, 9 Dec 2019 06:53:19 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36435 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727613AbfLILxS (ORCPT ); Mon, 9 Dec 2019 06:53:18 -0500 Received: by mail-wm1-f65.google.com with SMTP id p17so14604613wma.1 for ; Mon, 09 Dec 2019 03:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zOj7vpzDhBq5DQ1tXOq0lbHYgZrUg4SALkvy59BjkZs=; b=V0RdxPpiKZQ89TDnt4mbWszGxgtHMIcdvTrH4uERTJ6qv4FREE8ptSWkelVwpNOG9R st+hkmzoicaqvEnxo3MHgx27TR9UYM+Rw6vrIUFMag7Ig9jOmh2Iu6nY6QnE9J5R2AD1 Jea1wF5hxRCNsAR+NryIkJxqfsqGb1nhXNGOywFCdweHc8VF/s6aX1CsOfm7VnYKoKYM T8oJ4YN5VE0j8JwefA9HfcCeec/QwdUWhsMW+1/ThNbhDFg5rvkvRXinCA/Ni7xUvz6v 44vrt5E8J+Z6PZsHnzSJbRjAr/iabUqIUtbjmSNoc8DwlTcW/QFPPXpfKNEZ7IWDovzr rpVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zOj7vpzDhBq5DQ1tXOq0lbHYgZrUg4SALkvy59BjkZs=; b=HwA89n/PlcQ/F8B6CpMYm2kAGfKs8MVszV3ZNUJBKpKbbsitHBNHolNfU1AAbGHava 9GAdC4d6Ka/pgPQuPCo3EDtcz+wJitW1IONJu8tu3UCDkLorSkr8i6CJYmG8BpQ7rcWn y0tAOZa4OSr1KAvK/VOcIjaza8ta14LS6gZZEwcPe4KawwJj4dQzTiMndCW6BSovB16A s7TRuqbs7kbmTtTbIFvi+jjuR/paHVDUcvN9S1bGadPiQtO1OrQAdOup2c9gueO/1rjr OFsKQTTJsN62IH4k1FrjEHfCReNTXKZ6ZMZCW8N3GPOWPDv0JzWp9w7Y3KbmIml+Eovv edIw== X-Gm-Message-State: APjAAAWM85Ld1k3TX3Uu3lIGsEQvAZkx2o9N/uTW2eTTe3zOuVNhL4Bx g996L4RsU7ox7CPoFWnC5E5iCfLz X-Google-Smtp-Source: APXvYqyV4tuvb/f1XBbhFtY4iChZxT5x91u50hbQBAVWVYFV4wNKD8f6HpqQBQtZKjGPgIhgZ+XtMg== X-Received: by 2002:a7b:c4cc:: with SMTP id g12mr25072189wmk.68.1575892396842; Mon, 09 Dec 2019 03:53:16 -0800 (PST) Received: from localhost.localdomain (x4db55b9c.dyn.telefonica.de. [77.181.91.156]) by smtp.gmail.com with ESMTPSA id k8sm27239621wrl.3.2019.12.09.03.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Dec 2019 03:53:16 -0800 (PST) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: Junio C Hamano Cc: Derrick Stolee , =?utf-8?q?Ren=C3=A9_Scharfe?= , Jonathan Tan , git@vger.kernel.org, =?utf-8?q?SZE?= =?utf-8?q?DER_G=C3=A1bor?= Subject: [PATCH v3 12/14] name-rev: use 'name->tip_name' instead of 'tip_name' Date: Mon, 9 Dec 2019 12:52:56 +0100 Message-Id: <20191209115258.9281-13-szeder.dev@gmail.com> X-Mailer: git-send-email 2.24.0.801.g241c134b8d In-Reply-To: <20191209115258.9281-1-szeder.dev@gmail.com> References: <20191112103821.30265-1-szeder.dev@gmail.com> <20191209115258.9281-1-szeder.dev@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Following the previous patches in this series we can get the value of 'name_rev()'s 'tip_name' parameter from the 'struct rev_name' associated with the commit as well. So let's use 'name->tip_name' instead, which makes the patch eliminating the recursion of name_rev() a bit easier to follow. Note that at this point we could drop the 'tip_name' parameter as well, but that parameter will be necessary later, after the recursion is eliminated. Signed-off-by: SZEDER Gábor --- builtin/name-rev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index fc61d6fa71..6c1e6e9868 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -126,18 +126,21 @@ static void name_rev(struct commit *commit, if (parent_number > 1) { size_t len; - strip_suffix(tip_name, "^0", &len); + strip_suffix(name->tip_name, "^0", &len); if (name->generation > 0) - new_name = xstrfmt("%.*s~%d^%d", (int)len, tip_name, + new_name = xstrfmt("%.*s~%d^%d", + (int)len, + name->tip_name, name->generation, parent_number); else - new_name = xstrfmt("%.*s^%d", (int)len, tip_name, + new_name = xstrfmt("%.*s^%d", (int)len, + name->tip_name, parent_number); generation = 0; distance = name->distance + MERGE_TRAVERSAL_WEIGHT; } else { - new_name = tip_name; + new_name = name->tip_name; generation = name->generation + 1; distance = name->distance + 1; }