From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E73332E3384 for ; Tue, 22 Jul 2025 11:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753183273; cv=none; b=FxnxDxmirHsNKI5QmtoNKNU3hh6Y+ZC/uQSQ4dnEGb+jl5UB0c3MNwXxSYyZ7WgK0gsCpQCw/qm/0aXbQ9jiOnZACyMSVxR3FncED9x1spHJiECSAY86EAz4sN6Oj9j7ED5KLvgOimqdTEdsAtvYVQCPEkrHfSoDyzBrrIeiDrI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753183273; c=relaxed/simple; bh=ieQ4ViKFA/5ct6xcIzgDIE+Hc+5lXU8mcwQKhvrb4NQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jpUMRtXD5WFGMBbgJis4+iXKEJPk3dyvsmprMt4bKfRpq1J957QupG3AZ4O25MdgPnxPeZLdzYwDzmgV4vDJHL32dajtw3l6iYkdl94uPfbjuiQiEdWfuToLdJZxbNgGcMAUk1WmCWGIZKNGlqTIQnM+N+9F7+/QkVpJJDdaVsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=kUISvN/z; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=D1p6akOk; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="kUISvN/z"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="D1p6akOk" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.stl.internal (Postfix) with ESMTP id 100FB1D0024C; Tue, 22 Jul 2025 07:21:10 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Tue, 22 Jul 2025 07:21:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1753183269; x=1753269669; bh=w74W61J4FvDhnKAXoof3+HV/QHmnRGpTUTLh9jQXR/E=; b= kUISvN/zSSTQY9rxDZcbb7LuxPfoV97NcD3nQzjIBb6SRjMGEqXaOiBbyxqJPtn+ COaSFF1PH8OYeKJcH/I/VHp//zVdghCgOth2b2hkSo4mK0sM3zdO5kkJ/SHE/tAE MEQ4F/Dn9O0VouvRjF2q1jYkO+CCpYBa6pfRk2CHXOvNlbqBJwYH/pg/XtZqMFho lefn9xDjNItBZHEJN/1MdM3oGO4z8hEcUlob8UrfU4krl0jQ+BmKep1G6KkWdye7 6TgAcQt3OzRnzrwnnBc5Oc8f+kalpZkIjKRvzFlfkdUw2qLAV18lXaw6U/KIR2ph 9dYmWFlRSvcvs1QX1lnPbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1753183269; x= 1753269669; bh=w74W61J4FvDhnKAXoof3+HV/QHmnRGpTUTLh9jQXR/E=; b=D 1p6akOkhu9iszTxGRfq98AMSmdPwi10bDmTAbRTkfnDlg7lWk96QYRYD45HaHhO0 0v8Icglm1oD1sulvVmUjCoQOPyqmtXzPgekTWnZdjlvA+YuBx8bknMGeNThG/sdG 0nXdEUFYhTga4m3hIAXkDNbVJTpBaqMEZl8CKfcip2othaotXA/5/vZiwWsKEBDj 2g/i2oUgn0qRJ261ONHonkgwSphEJfE8zRaGGrNdMYtGKijjKJkZWryKY76klz1o l3V+ku92jW42Tc4L04smJBrRCN78IMuXxoJtyTp3x6fT1xOl9SYYWJvMak+rcFUA 3836sqVnboSzvtbm8rDPA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdejgeejiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgt khcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnh epffeuiedujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkh hsrdhimhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthht ohepkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomhdprhgtphhtthhopehgihhtse hvghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 22 Jul 2025 07:21:08 -0400 (EDT) Received: by mail (OpenSMTPD) with ESMTPSA id a904d647 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 22 Jul 2025 11:21:08 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 22 Jul 2025 13:20:51 +0200 Subject: [PATCH 2/8] builtin/reflog: improve grouping of subcommands Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250722-pks-reflog-append-v1-2-183e5949de16@pks.im> References: <20250722-pks-reflog-append-v1-0-183e5949de16@pks.im> In-Reply-To: <20250722-pks-reflog-append-v1-0-183e5949de16@pks.im> To: git@vger.kernel.org Cc: Karthik Nayak X-Mailer: b4 0.14.2 The way subcommands of git-reflog(1) are layed out does not make any immediate sense. Reorder them such that read-only subcommands precede writing commands for a bit more structure. Furthermore, move the "expire" subcommand last. This prepares for a subsequent change where we are about to introduce a new "write" command to append reflog entries. Like this, the writing subcommands are ordered such that those affecting a single reflog come before those spanning across all reflogs. Signed-off-by: Patrick Steinhardt --- Documentation/git-reflog.adoc | 8 ++++---- builtin/reflog.c | 38 +++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Documentation/git-reflog.adoc b/Documentation/git-reflog.adoc index 707a9b39edb..6ae13e772b8 100644 --- a/Documentation/git-reflog.adoc +++ b/Documentation/git-reflog.adoc @@ -11,13 +11,13 @@ SYNOPSIS [synopsis] git reflog [show] [] [] git reflog list -git reflog expire [--expire=