From patchwork Mon Jan 29 20:28:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 13536355 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) (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 D04D81429F for ; Mon, 29 Jan 2024 20:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.108.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706560125; cv=none; b=WOYAQJf8l5YAsd8L9/ovqx/yUMgVPoTy/V5bFIBQIlzFiXINLnZijZSf7j/kswqKKeK+BP5qlGzRTCMESVC3cIPa0N7zekhi1pdQcw3W4pruJpNriEFAuQJt8ti3vwG3wEXclX64sICkfr3qQ/6QThlT7cMRZTlPY+xdfmppnOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706560125; c=relaxed/simple; bh=PYcws/UpTgyYq2C0UEuyPg4UmpO0dNWvVnjetIfMkLM=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BWNMrFyy2fZsooXiDNHR7CpGC9CS3RlV2yyyGsDc7iMaqBJTv2amRXMa1Uw6jBvhDRf9WnS6YhhCZzIOTERQJLXqxvgzSzCjp39h2BdhHvK3/mGhm5wAQ3dPEO5fTDXzvJUOkcbEQiJgbcLRxPOv7A/QMmDXfBdecwe+2OHzr2E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=noVZEKbC; arc=none smtp.client-ip=64.147.108.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="noVZEKbC" Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 748371D8570; Mon, 29 Jan 2024 15:28:42 -0500 (EST) (envelope-from gitster@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=PYcws/UpTgyYq2C0UEuyPg4Um pO0dNWvVnjetIfMkLM=; b=noVZEKbCSvF1D6W7bbqL4fNzA6QvpaUIIt8xJ8apU jk/0Ft/Uz/YiD4DkW3PJLRddDiMp5WMjYiwc82Gu3mtbOCTs7LpWqIqMnoIJORmy Lv2eeYIBp3F1R1LZJIQCGosIaKzdYzaOOyLbjccVwAydQ9GFPkFRrEWvJ97aODHc aw= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 64EE81D856F; Mon, 29 Jan 2024 15:28:42 -0500 (EST) (envelope-from gitster@pobox.com) Received: from pobox.com (unknown [34.125.200.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id D72711D856E; Mon, 29 Jan 2024 15:28:41 -0500 (EST) (envelope-from gitster@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: [PATCH 1/3] builtin/worktree: comment style fixes Date: Mon, 29 Jan 2024 12:28:37 -0800 Message-ID: <20240129202839.2234084-2-gitster@pobox.com> X-Mailer: git-send-email 2.43.0-440-gb50a608ba2 In-Reply-To: <20240129202839.2234084-1-gitster@pobox.com> References: <20240129202839.2234084-1-gitster@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Pobox-Relay-ID: FE09E65A-BEE4-11EE-AFE0-78DCEB2EC81B-77302942!pb-smtp1.pobox.com Signed-off-by: Junio C Hamano --- builtin/worktree.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 6d7da11746..9c76b62b02 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -848,21 +848,21 @@ static int add(int ac, const char **av, const char *prefix) const char *s = worktree_basename(path, &n); new_branch = xstrndup(s, n); } else if (opts.orphan) { - // No-op + ; /* no-op */ } else if (opts.detach) { - // Check HEAD + /* Check HEAD */ if (!strcmp(branch, "HEAD")) can_use_local_refs(&opts); } else if (ac < 2 && new_branch) { - // DWIM: Infer --orphan when repo has no refs. + /* DWIM: Infer --orphan when repo has no refs. */ opts.orphan = dwim_orphan(&opts, !!opt_track, 0); } else if (ac < 2) { - // DWIM: Guess branch name from path. + /* DWIM: Guess branch name from path. */ const char *s = dwim_branch(path, &new_branch); if (s) branch = s; - // DWIM: Infer --orphan when repo has no refs. + /* DWIM: Infer --orphan when repo has no refs. */ opts.orphan = (!s) && dwim_orphan(&opts, !!opt_track, 1); } else if (ac == 2) { struct object_id oid; From patchwork Mon Jan 29 20:28:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 13536357 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) (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 4375B76058 for ; Mon, 29 Jan 2024 20:28:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.108.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706560132; cv=none; b=jHBwoXt+NUtQywDCOmM+Rna9QrgE7mHwZv20dULF3LkCp/WbrXgcwhRYD80veporTFMmaI2XA9yutM8HAYxvVhR71+O9GsOE5/zk+DFHp/4UBUX+UMoDqQR59ilo38ilqDBqiase/lJ7mkRqg8CgZSyQtls+T3OFo87YPQjChR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706560132; c=relaxed/simple; bh=qzaQl1IHzXC0UPE5jMOF/6Jk5Pq5vPfrECbcTnkpB2E=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kvkJwk8vyZg8pPnQMReNdp/Xff4pcX6rrmEYKd4xmn3bXQOp3sxdzNFRBrXvfu8on3IM4poL7343sG6LVwhSygegvN0XTFTW/P9+qu/K5prGIZzOXbMde+vaywRAgY7y6PC3SoYxAvA7QxoQcGKAoQG9SzjOdCF9fFAk6b5udGQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=kJLO5otH; arc=none smtp.client-ip=64.147.108.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="kJLO5otH" Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 08EE21BB04F; Mon, 29 Jan 2024 15:28:44 -0500 (EST) (envelope-from gitster@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=qzaQl1IHzXC0UPE5jMOF/6Jk5 Pq5vPfrECbcTnkpB2E=; b=kJLO5otHJWjyV1RFJizZQ/s/tN1HIYBlBex1nL4WX Qz3/lTKzfdUjNVrQvxKPui3Mi+JBt8RPfX4k+3iJcw4zFIT7tijqMh3L17XJIOYC 0a9Q+w4eoNDSCulvmInwbHxUuGwOvTwCUaVNqYkysJvyZLMuA3mhImbkFmHA5TDh 5w= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id F3F871BB04E; Mon, 29 Jan 2024 15:28:43 -0500 (EST) (envelope-from gitster@pobox.com) Received: from pobox.com (unknown [34.125.200.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 6F32A1BB04D; Mon, 29 Jan 2024 15:28:43 -0500 (EST) (envelope-from gitster@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: [PATCH 2/3] merge-ort.c: comment style fix Date: Mon, 29 Jan 2024 12:28:38 -0800 Message-ID: <20240129202839.2234084-3-gitster@pobox.com> X-Mailer: git-send-email 2.43.0-440-gb50a608ba2 In-Reply-To: <20240129202839.2234084-1-gitster@pobox.com> References: <20240129202839.2234084-1-gitster@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Pobox-Relay-ID: FEFA4B7C-BEE4-11EE-986D-25B3960A682E-77302942!pb-smtp2.pobox.com Signed-off-by: Junio C Hamano --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 77ba7f3020..cb83449d7f 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2641,7 +2641,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt, oidcpy(&ci->stages[i].oid, null_oid()); } - // Now we want to focus on new_ci, so reassign ci to it + /* Now we want to focus on new_ci, so reassign ci to it. */ ci = new_ci; } From patchwork Mon Jan 29 20:28:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 13536356 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (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 8A2781429F for ; Mon, 29 Jan 2024 20:28:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706560130; cv=none; b=RiU1seswZylVHDRB0+vgGR4EcfM0DoQoJmlZSby8TVHRkmFMcWJALZbJCCkWjTDz7ebGWTTXxWDYPSCFZxd2TymQk0NFXuWeoVu7aYvCU+avjzYsqZuEKBvgGB+5ekEXDHaU0uNCVLpFXVv7Pwxumf6DCbW/9LmXRnSQ9Jwkopc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706560130; c=relaxed/simple; bh=K8l1zgwRFVe0MKOfNMAnzLIo1spy9JmhJ2AfhpjZb+8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XjSOm/vSUs3WHXy0pBHahJpMnFTbDQ95pR+R1OY4QL+17BZiAOfXAGWIcUApzIay4VMz5LcJB0yG+A/mwBiTFiabIzeeUGhrbcG1BBGWUyMRRZ71/xR79BtTqXw3/1+Vm2cJ5mdPKRymn1Z3vLpkbeDCHxjjOzfoGS15XIAdIzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=MZqR1E/5; arc=none smtp.client-ip=173.228.157.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="MZqR1E/5" Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id C9DE821CF0; Mon, 29 Jan 2024 15:28:48 -0500 (EST) (envelope-from gitster@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=K8l1zgwRFVe0MKOfNMAnzLIo1 spy9JmhJ2AfhpjZb+8=; b=MZqR1E/5pQhebENEUk+L3w5M2wohuj+m6GEjgYcvk 9sOlWdMBddiUhq3OuXIN7qAkdFcTuH7solsy49RwC/uE4cjPZNusBkJe9ThRVXbr GxTGeeBaDmgUVBrdqFWbQUb2wAdgF0VIJbIY4LN+fjM3bNfa9H1Wlpaitz0hJKjq 9I= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id C280B21CEF; Mon, 29 Jan 2024 15:28:48 -0500 (EST) (envelope-from gitster@pobox.com) Received: from pobox.com (unknown [34.125.200.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 5A0C321CEE; Mon, 29 Jan 2024 15:28:45 -0500 (EST) (envelope-from gitster@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: [PATCH 3/3] reftable/pq_test: comment style fix Date: Mon, 29 Jan 2024 12:28:39 -0800 Message-ID: <20240129202839.2234084-4-gitster@pobox.com> X-Mailer: git-send-email 2.43.0-440-gb50a608ba2 In-Reply-To: <20240129202839.2234084-1-gitster@pobox.com> References: <20240129202839.2234084-1-gitster@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Pobox-Relay-ID: 001E688A-BEE5-11EE-8C4B-F515D2CDFF5E-77302942!pb-smtp20.pobox.com Signed-off-by: Junio C Hamano --- reftable/pq_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reftable/pq_test.c b/reftable/pq_test.c index 011b5c7502..c202eff848 100644 --- a/reftable/pq_test.c +++ b/reftable/pq_test.c @@ -60,7 +60,7 @@ static void test_pq(void) if (last) { EXPECT(strcmp(last, rec->u.ref.refname) < 0); } - // this is names[i], so don't dealloc. + /* this is names[i], so don't dealloc. */ last = rec->u.ref.refname; rec->u.ref.refname = NULL; reftable_record_release(rec);