From patchwork Mon Mar 3 22:00:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Seiki Oshiro X-Patchwork-Id: 13999534 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A05301C5D76 for ; Mon, 3 Mar 2025 22:01:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039282; cv=none; b=jrRwisd62UXCFp3Zxdqbif0G/uamoES2tAfrO77mbxvWRrY0TcXEQWwyw4+9Oa1WYEZunAbkvP0UsxPBasPlvFKKscxJaJULoFedCdhQnWNmGpfH3/BQRglPKPBGC42osbOz7bN4VriWoYFMN8u3bbcD+6/tHb7MNpalkrfpSbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039282; c=relaxed/simple; bh=FIt5Rma8Ddosq3geQdgFOFfHgIQc+emsR2js9AGorRo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eWtX1F33m5KYQTzH449cuuVgW3fpZiYQ2Z54Bljs6HtRcrNDQEDJzTPysqfZ4NGw8L2nO0cjgTn7fxcmycsFdEHLejMGKRxkN4MepZ8+Q7sV9hIFqdavmAgz9fhp2+gNgrS6rn/Juoavy29QLIOkNBEiZhyC0XAXd94Hgp1q/4I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QZj61Q7S; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QZj61Q7S" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22337bc9ac3so94248165ad.1 for ; Mon, 03 Mar 2025 14:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741039279; x=1741644079; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1NoC3TVZQIV70pMT6wG4GaGvTXkiZ/B6lTfMypKM9ek=; b=QZj61Q7SijnvCEDmQjbHwoVuPEFivTL/SfFwTQ7rJRu4/yjd0bEouFMLwT3CeA+G3r 7H7HiVGXg3m2EJEtWY9SnLrY4kI7A7rdfBBpVQNwxZlUxng7EN2mCuoAEYz9jSxWlfPf 0Ka1N2l2rj+CtYutq8AxMgNiMnsOVXSEWS8O71xjiKf+IoUGCtGOeP3CXUWMJl+OPuoD JRQvC0Un7BANvSN6BuR1+ZkzQIOArU4Hw1C9saSk+wppBncVaQ5/6+a/9qUIn9idoGcs uKPDNZGxIiNp2fMv3GOhzrGGjmrS2bjILcKizthH6A4+erddIFI33JM/2UcAhop4GJ8I pfXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741039279; x=1741644079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1NoC3TVZQIV70pMT6wG4GaGvTXkiZ/B6lTfMypKM9ek=; b=naadlhwpa0xuaiRBKX5RGThWz9DKwHDkQNfxK1SWeUxBD9VqkF2tqaiP9JZ5G0X/Fj GWj+sG4+q9TeA8aqh7vko2gpts1+/t9TOdV+XfYT2H/wtJthKoVTgDjyKH0sNsjzIFM1 3PGHIAcueXJxaoW88Lw3t2dlwSDG7tL827W+/1G7fNAlbkh3ooS17ikVut80SqkgXbZ6 IosYGW55SL5wqIoyz5edqCF2q+ha1+isS4jXuUAox6L+XZB/f83wMfdEB8MKd+FzKuzt 2hsYy/P6trft0OL8KFeBDmfxl/wax71GhrqqwSXURn3uCdJLd4nLSxQQGDiwGWQRAlg5 8+ZA== X-Gm-Message-State: AOJu0YzQZOQW4OisgL6GIL0gojO2i6m55CufWLi+aSDLWCbffqHTzx+E wsjZ4ZkVB6XURbA+F3bpY4DE57Hb+sQ5wvqXsr/cDDfisiR4EgORHJxaLQ== X-Gm-Gg: ASbGnctZEt0qvij74Fi0u4oK9ImsDyJ0+tg7vuEm/hgTLkoci+/GDO2r73amf0pM1TL b7r6XWYIfqqdeYGWzsfg/aK4AhBScUzhfIrpCrea7cRSkEbJk6nU5RGDCrbvSSf4VEnriHgBn0b cJaAXbT02aQsAeSTmV3xJ+3xtUuBXleGvUSzyZMkAaitmmSm4MRZQkoV1TV2hMIwKI+TKnJoOEu ydJiSZMpXuaC6AQ/Ny/z3OBdkK9qtxgU/qezmaA6f0ar/5pv8b2iObc0kXieFp8HqomAGuVblV9 n991IcIpaMPJtf1T4xli+D2av7IMfKvLwH7mwF9BRtZIAC6uJzJziGq4yaYokWFbhdGGvHV8imQ zn7Skx0Py9g== X-Google-Smtp-Source: AGHT+IGSYK3fC56k4u8objD8LlBP0C8mUOoA8IYPOol+VQxgQnTFmP4OgE50Gz01tWDEF4QnWV5Iew== X-Received: by 2002:a17:903:17c8:b0:223:49cb:5eaa with SMTP id d9443c01a7336-22369213d6fmr229383595ad.35.1741039278905; Mon, 03 Mar 2025 14:01:18 -0800 (PST) Received: from localhost.localdomain ([2804:7f0:b77d:283:5dd5:8e9e:2c56:864a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223504dc7e1sm82746565ad.176.2025.03.03.14.01.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Mar 2025 14:01:18 -0800 (PST) From: Lucas Seiki Oshiro To: git@vger.kernel.org Cc: Lucas Seiki Oshiro Subject: [GSoC][RFC PATCH 1/6] builtin/log: add subject-extra-prefix flag to format-patch Date: Mon, 3 Mar 2025 19:00:24 -0300 Message-Id: <20250303220029.10716-2-lucasseikioshiro@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250303220029.10716-1-lucasseikioshiro@gmail.com> References: <20250303220029.10716-1-lucasseikioshiro@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a new flag --subject-extra-prefix to format-patch. This flag is primarily targeted for new contributors that send emails with the suject starting with "[Newbie]", "[FirstTimer]" or "[Newcomer]" and developers from mentoring programs, which may start the subject with "[GSoC]", "[Outreachy]" or similar. Signed-off-by: Lucas Seiki Oshiro --- builtin/log.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builtin/log.c b/builtin/log.c index e41f88945e..95667c93ca 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -2036,6 +2036,7 @@ int cmd_format_patch(int argc, struct strbuf rdiff2 = STRBUF_INIT; struct strbuf rdiff_title = STRBUF_INIT; const char *rfc = NULL; + const char *extra_prefix = NULL; int creation_factor = -1; const char *signature = git_version_string; char *signature_to_free = NULL; @@ -2079,6 +2080,9 @@ int cmd_format_patch(int argc, OPT_CALLBACK_F(0, "subject-prefix", &cfg, N_("prefix"), N_("use [] instead of [PATCH]"), PARSE_OPT_NONEG, subject_prefix_callback), + OPT_STRING(0, "subject-extra-prefix", &extra_prefix, + N_("subject-extra-prefix"), + N_("add an extra prefix at the beginning of the subject")), OPT_CALLBACK_F('o', "output-directory", &output_directory, N_("dir"), N_("store resulting files in "), PARSE_OPT_NONEG, output_directory_callback), From patchwork Mon Mar 3 22:00:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Seiki Oshiro X-Patchwork-Id: 13999535 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 633D61F12ED for ; Mon, 3 Mar 2025 22:01:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039296; cv=none; b=FUS3IaHqZ0QVrGF3L54Yyv5YH3y3nNRNNhoVtQd0D6+9ASMYNRLuACkNI4DhQNWb/higbyDrNgnZ57WuFNV4d1KtLwyBK8SXJHD3itiYuxVsFjAgOEN2snbrwBTrhVdeAs5YNm18GnZwKLvE5FSMtSXrNxkuvXFVzVdsjLtA7X0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039296; c=relaxed/simple; bh=3OuNyHlHS+SjqagRiasCsdQU0OHABHHQkoZ/O6M435M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qfIoZzA8VlkkuGMAVBEvYwyxe7mJNE9InWK6Ry6OlaEtSwrxolg5qS/ulloxFN3XPIKgf7X+MNPP2XjrpXWo+zMA4G66BS/dldgDg24q1+tawIXnRIxQQC3Dlx+n7bBk1wBH/Q1XcCnN/9GZkrh0EvR0UsZArwsXim/BbuYoxSg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jjd+oucV; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jjd+oucV" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22328dca22fso74667355ad.1 for ; Mon, 03 Mar 2025 14:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741039292; x=1741644092; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mTOzC8cVilP2FYG9KevtmZiYJ2WwzCJovXWF1R6yTt0=; b=Jjd+oucVovK+pe0sX7w+TXS9ogZxsshC+OjO8TZsCHzsRaQRmB+spW8zbR3rFRrH3f M/rg0Zy/zNehM+MdilJOJSiTo81SFrCDeAA8Be2RRw4j7bGT9pgfyoT2f83aor8Uaky3 QOdBh5qh8mwEZftlQtE+vXcOQUbUIXV/IDvfAgJeXzlPEn87YPbP2oyX4L3X+lUuLKxE f6tZfRJCttQW98rgKchuRqqFg1eXqHKYMCi1fWrkOi9Ka5/ox5AtJaI3y0i+qMqmyd2D srOkQKMpMy3G97jAmQ2WVeryzzXZdkMy5ZdNbmnV0LRTU5HwZ5dU92FI/hTH5WIvQi6s SpYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741039292; x=1741644092; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mTOzC8cVilP2FYG9KevtmZiYJ2WwzCJovXWF1R6yTt0=; b=RGsVYQ6iuNMMIYb+CVH8z90452uRS+/FEtstRec6mm169Q8STPW+NlDSbH1Y0COVBA rhs8Ar+KzQ3V5W2nrF9i+fZudIIYrQoF+31BlfA0LkRb+PZnmLMpq7N0qOiEOOeE8Rnj WNgsQ+a/xR2TLPLsSf+V1s0y0MA5cNU8QxTQK3vvYVFUpkMeiEq4P5Qxk7BUfyEG52aI jx77jP2lysGym4q9UbfyTN1XbBKne74gp3lVMGNSjEYBomOXna1pA3/3ioRxKzPAeNhe u3tuz4hkLsS+iOiHg39RxGEj9fmOD2VdFek2G9wfIIU0j37dRiG3HnRHlvhGj1zGFF8o 5Utw== X-Gm-Message-State: AOJu0YwMNY5Z037vsX44b90MFfodn7GnNpareaP3wRALs2/YoW+hbTT1 //ouHpPqSnWnzyzI27E34rbrI47NbFPl/64x8s6KYxLsdMiJMp7+XbfDeg== X-Gm-Gg: ASbGncupPLagndBXkXGwu6QWd9BQGS3biFndk8jtMdvcGmighvAIkB8MrY3JWx3DZLG CBPSW7uTuSdFmt07GAxFExIqofuM4boRSlNFSWr3z8sbGk48x60udSJeHLiwcVzkgYAx2rdN9NC 5nJuINyywImR9q8LOychSiTX+CT3urHsDCg1dVJzD0+0OKWi2cuuhkL82lyVIHaOWuBlnYKhmXz JxjzU+CZzBGeS9ySagLaiyqGkSkZ75BVCipd6F8JENOtRTK2A9xsZY16xbNnQXJmA9NHzpitLi3 CnRiOxFbai29Xl5qUlDnYmefTWUxUHLPxs8DtSRxT1qV2oXsdB5+aXNES/wJDOT8XVQipCd2/we cYDR/RbYb7A== X-Google-Smtp-Source: AGHT+IF5deq61YZf+afExzNMqfV9C1XzGdiB/im0McbRFeX6q3SIqM+5tDl3GjIPjvTXBVOo3XmpSQ== X-Received: by 2002:a17:902:e54b:b0:21f:7880:8472 with SMTP id d9443c01a7336-2236924fa13mr242848975ad.35.1741039292382; Mon, 03 Mar 2025 14:01:32 -0800 (PST) Received: from localhost.localdomain ([2804:7f0:b77d:283:5dd5:8e9e:2c56:864a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223504dc7e1sm82746565ad.176.2025.03.03.14.01.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Mar 2025 14:01:31 -0800 (PST) From: Lucas Seiki Oshiro To: git@vger.kernel.org Cc: Lucas Seiki Oshiro Subject: [GSoC][RFC PATCH 2/6] builtin/log: die if -k and --suject-extra-prefix are used together Date: Mon, 3 Mar 2025 19:00:25 -0300 Message-Id: <20250303220029.10716-3-lucasseikioshiro@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250303220029.10716-1-lucasseikioshiro@gmail.com> References: <20250303220029.10716-1-lucasseikioshiro@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When calling format-patch, -k keeps the commit title as the patch subject and can't be used with other options that depend on the existence of a prefix. This way, -k shouldn't also be used with --subject-extra-prefix, as it introduces an extra prefix. If -k and --subject-extra-prefix are used together, die. Signed-off-by: Lucas Seiki Oshiro --- builtin/log.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/log.c b/builtin/log.c index 95667c93ca..52dc0301cf 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -2256,6 +2256,8 @@ int cmd_format_patch(int argc, die(_("options '%s' and '%s' cannot be used together"), "-n", "-k"); if (cfg.keep_subject && cfg.subject_prefix) die(_("options '%s' and '%s' cannot be used together"), "--subject-prefix/--rfc", "-k"); + if (cfg.keep_subject && extra_prefix) + die(_("options '%s' and '%s' cannot be used together"), "--subject-extra-prefix", "-k"); rev.preserve_subject = cfg.keep_subject; argc = setup_revisions(argc, argv, &rev, &s_r_opt); From patchwork Mon Mar 3 22:00:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Seiki Oshiro X-Patchwork-Id: 13999536 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF10D1C5D76 for ; Mon, 3 Mar 2025 22:01:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039305; cv=none; b=p4mtPSkG01FQvtsiQOppdTxqN1qDpU3q+RxWAzquKpaPkotJ9OSbnfALvL68PmLI0uG/W6NQdrqJYUxoMkFxxWviog6IltqIRuRpgxkzXr7+Ka0T2hz52xqUA7nNylpzNMfwMuZctC3p2yNjHzG7sI9owedaCze15koJWEp3XZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039305; c=relaxed/simple; bh=Ps6P/WrstRaN8FR460qL3+xLauO0UyMTgbGEzPfgxKQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pbX4PO2IfOi4m+2Izjj/hKlgtE4yMKf9Fci7oxZg3pgB6WSZl6b3kBEylJC63UelofbwWdxIjaLwi9xj9mz96G7rcBs0z6zJoNfTfUjXIqtp9dW7mixO/si3ABh6j7hHVbAFvyLoUErTk736T58hIKfXJDfWDTOU6ZtaCyDltCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TySzMEGP; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TySzMEGP" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-223cc017ef5so16418695ad.0 for ; Mon, 03 Mar 2025 14:01:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741039302; x=1741644102; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9ISVrHOku3ZEkZ7ArXkjFEEvaS+E2pBP5nUrdbNku/g=; b=TySzMEGPwUXg8IiAwWrKC70+OAgXhP6H7R9pknHtpEBK/mpgIsff8WEF72mf/VEM8F s72gEKgm+ugyK+rIqwgdmkccod2nP0/ulExN2ULx+a8HaUeBABS+lb+2YD2hBC7/yJaj G+QZqA8areLfz+1GVH8DBxa7QMU0FsLJb7IhIqp5WGkgWt5VHLjRcZcHYsDaigwZSDY/ 1EnTTvnZfzzy5k8J4/nagpQqKpo1s7HNONg8CORigvhQTlluitNwuylpLONwv1YmNuo1 uPx532zzO4qj0gP3PNXOT0pw4DLGdxna4OODqnUlh24zOsHxsCQ0Opy/IeR8LKHTghVb NB0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741039302; x=1741644102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ISVrHOku3ZEkZ7ArXkjFEEvaS+E2pBP5nUrdbNku/g=; b=MUUu0CbnwocsGCRyFfccdMYwkcxOOoAYwiZd0Tgar5i43NtPSp5oYo0BjiAop9R6A5 5IE3oeMbWjdYSud+JpyB51S5+XT4FERKIr3Aq6y5KtLGtBWNfyinRznuTeOYwr81fcpy UrpJ/mWzAa1XSM/ZvX/FDg9PmsewurjgtfLLBs6Hd1+0aljzKU3I/X9SwQgBKhKKiJry eLO+kKyM+/bw3rdK9OdFw9YhioDz+78gX7pcvP6iVE/MM/8tqRZ+3S+T+rtNk2BVtnbU Rrz+kWkaAqVXlYx+8HfOuIr05X31XEHzNGkH2Fxshr+ds95JH90aBwJih8GwUH+n7Fp5 7yfA== X-Gm-Message-State: AOJu0YzvXC3Hyw3kbiADw7h89sAqGoTAUhrCA5BE8KikAsaFNAXnCayv ObQcU6cVJFG2s8rGO6i96Qh3meK8V/mfLA6tiP8OSE9r5wA6FbTeGuPbjg== X-Gm-Gg: ASbGnctQXyK6s09Q9Zw+tJ6JzrFjUSSUCmsotUQtLaxRr02D+TR38XuExmXr9dEIpK0 Gjc4Aea0wMsv7RJNpKnnFYXqOaEFzdgZaKR6wtgeWGOWtj1P8YYTp5AWntPGzJbXqrszmrEcU4Y DHVhyBZtSQYIJbS1zqRUUN7xRmyzVJFrY4DWwU18Q2vA5Ltfc8ZLQ+UfGg2kFGYuoHEBS3OsSG8 yrDlN2XQSB+ngusOu9JnfgW18slqmMc/aZNXYEQy9VsQv+emYcOlijSNK5huPb6/C1Oxpc2z+HJ ajEmNrFAodyTWUNNyf2+NZEBoqqzIu2HqEvEpsJMaO2UeFZAkYU06iQiRlOREApfUo+7BDjA2Ob O2MCvEnBR1w== X-Google-Smtp-Source: AGHT+IEkLgNrf/5M6fiHkUzNiOJIirNlLy4X43lVMPc3DMlq4iB23h5uH0kEXcDlHFWRzmndQFPwMw== X-Received: by 2002:a17:902:e5c7:b0:21f:4c65:6290 with SMTP id d9443c01a7336-22368fa5545mr244213915ad.1.1741039302415; Mon, 03 Mar 2025 14:01:42 -0800 (PST) Received: from localhost.localdomain ([2804:7f0:b77d:283:5dd5:8e9e:2c56:864a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223504dc7e1sm82746565ad.176.2025.03.03.14.01.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Mar 2025 14:01:42 -0800 (PST) From: Lucas Seiki Oshiro To: git@vger.kernel.org Cc: Lucas Seiki Oshiro Subject: [GSoC][RFC PATCH 3/6] revision: add subject_extra_field to struct rev_info Date: Mon, 3 Mar 2025 19:00:26 -0300 Message-Id: <20250303220029.10716-4-lucasseikioshiro@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250303220029.10716-1-lucasseikioshiro@gmail.com> References: <20250303220029.10716-1-lucasseikioshiro@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently, the `struct rev_info` is responsible for holding information about the prefix that is added at the beginning of the subject when `format-patch` is called. This way, it makes sense that it also holds the information of the extra prefix, if it is present. Add a new field called `subject_extra_field` to `struct rev_info` and use NULL as its default value. Signed-off-by: Lucas Seiki Oshiro --- revision.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/revision.h b/revision.h index 71e984c452..70927ef1fb 100644 --- a/revision.h +++ b/revision.h @@ -294,6 +294,7 @@ struct rev_info { const char *extra_headers; const char *log_reencode; const char *subject_prefix; + const char *subject_extra_prefix; int patch_name_max; int no_inline; int show_log_size; @@ -413,6 +414,7 @@ struct rev_info { .expand_tabs_in_log = -1, \ .commit_format = CMIT_FMT_DEFAULT, \ .expand_tabs_in_log_default = 8, \ + .subject_extra_prefix = NULL, \ } /** From patchwork Mon Mar 3 22:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Seiki Oshiro X-Patchwork-Id: 13999537 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 695FF1D799D for ; Mon, 3 Mar 2025 22:01:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039311; cv=none; b=hL7Y5y8vOOImKZINACGjyo2sugjm2tJLX8zZnPjXcmwzVfxc9rGr2CE29URqJfpy44Rl4hVXNHx9Q+ft3+3fxZ13NDBvyZSopee2OdiNJ0SM6h0X4Op1oQ4PFJZo4pX1jb6gInna6chMMzMrzlZyPtmMkz2t+3UpFZ/zinbUZtg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039311; c=relaxed/simple; bh=R4YTWUoJ4YJra0NSaBqsMU2sC5GQkO52K8swbH3mor8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P4GMuOligWUZqKaRqKZP9ijfHtIObr8+FEUqnF6BVVSP0jdNZYPpW+QfgSCwpULYdplDO8PhhplyjIjM7nDIWnELqrch5/dqUU8osRz3sEOQb14NmP+oN1LZfqkNeVz6UUjHyLd/HhVyjCtGHrLl7lRWISr9amU7UbI5tt8O/38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fT2J2nFD; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fT2J2nFD" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22349dc31bcso86624485ad.3 for ; Mon, 03 Mar 2025 14:01:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741039309; x=1741644109; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0KC+3u4g+dkgLQPM389VXbApe1EUEKnrrM8rYJlRvxE=; b=fT2J2nFD0zgIzlF6L0Dvkui1Imt9MAn0aPWtEh5jQXpdLQ04I8g/DZJ6KxHEwntiC/ /0WUX2kaRg6QLhgbGstj2nUXDbXSEic7BeLTHLQGFinh+nNIwQENTl9JzIgutFdlQ/Kx /4gEAyOnsAbtr2RIaA+k3FOTiBLoPQwMUix2V/y5xf4N+TrSavy+l0ohaaMtw35dy9M5 zG/ik/HNOoGw3Q0Jj3q+r1Y6/JuGzSvjNz3qqYQSj9tTIkOPMB+jQW5cgva7l//5brrx UqQhZQyeYEj1H85S7uYoxErPHf6XesHb2qPw2a3NJYjXiFMu4U8okErNhnnqEg69vtId N8bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741039309; x=1741644109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0KC+3u4g+dkgLQPM389VXbApe1EUEKnrrM8rYJlRvxE=; b=vEjswuYHIxVxRZxQ4TV2Hhy3ybRxYGwtC6M/sya5ehJwZFxWJzOIKilXsP4GLEbNCq sFjHsi3b0ppgKk+RnqQHpbN/vk87kImPpxfZ0J0fSqB3I9tmpwGsFRUV1n2BE4qPf93E CaiZnqAZRiidTqz8xoJkawj6vK/l00kowa5uHtlL2UaX0MFo3V7jLB1Nc2wY3BNRCGQT BFGgu7heBB/Plb/2x9xEfFyAqbGIzYEdb3HQ8seFcLsC+SA/J0HiRtFGSqc3WWD7u/04 3SkyTdvcEiAU1tXHdud8JITItijddSkjaOZ/bkABFVJjt0n3Tko8Vck3fjfoqeI1MkYQ +nDg== X-Gm-Message-State: AOJu0YwXgtx0RkY4eGK5bfDYcb/IDuZPvimBKe/D1icM+ZXPtXqsC8c8 WPYoaa4EWvjuAE8UyRdwfh8WfJsY55+97LaMdlMznzJ6JX4yB6avHJ3pVA== X-Gm-Gg: ASbGncucFAkBTRjW66LzmeVlYwEqurWLUSjfKmfht3bU+SIb4fxrxHq7TxxWm4YCOXH EqFiGuScbHxdY2Ee04LpozYePmKU+Tx/IIQE5kgq1VdPlWhlPskddFoqxurTbLQ+EmV2Kl3y41P LYGxFVH3/lJP/zX2sBu/lD6xGZV9PgDG+01eQ81394gfTyY8dmRqP2yhQ4HLoE9P/7t2wDLGPN1 Lm7DqSKo4+3csfHPmbc+E5mxsoUqloweuDp80y+J7Mmle3PhMsBKTOGpbBz2IB94WXLqIREJitX hmlWpU0/GzA4SY62mRoXNWUxUkfwjd7fQH4JoSku66W8/glnRsoGGohvAx8+xzQlRcTVp5SF4Ja zLzOK5TqMYw== X-Google-Smtp-Source: AGHT+IFv8U1+MGDR92QOfOg3SG2lJkVuLE4rJNt++CAsBoBwDBsl0SvrYixpAZJfWgutV4ym8NHiMw== X-Received: by 2002:a17:90b:3c4b:b0:2fe:7fae:59f7 with SMTP id 98e67ed59e1d1-2febac0a421mr25763747a91.33.1741039309258; Mon, 03 Mar 2025 14:01:49 -0800 (PST) Received: from localhost.localdomain ([2804:7f0:b77d:283:5dd5:8e9e:2c56:864a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223504dc7e1sm82746565ad.176.2025.03.03.14.01.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Mar 2025 14:01:48 -0800 (PST) From: Lucas Seiki Oshiro To: git@vger.kernel.org Cc: Lucas Seiki Oshiro Subject: [GSoC][RFC PATCH 4/6] builtin/log: fill subject extra prefix in format-patch Date: Mon, 3 Mar 2025 19:00:27 -0300 Message-Id: <20250303220029.10716-5-lucasseikioshiro@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250303220029.10716-1-lucasseikioshiro@gmail.com> References: <20250303220029.10716-1-lucasseikioshiro@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since the `struct rev_info` is the responsible of holding the subject extra prefix string, copy to its `subject_extra_prefix` field the string provided by --subject-extra-prefix when calling `format-patch`. Signed-off-by: Lucas Seiki Oshiro --- builtin/log.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/log.c b/builtin/log.c index 52dc0301cf..034ad44ef0 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -2205,6 +2205,7 @@ int cmd_format_patch(int argc, rev.reroll_count = reroll_count; } + rev.subject_extra_prefix = extra_prefix; rev.subject_prefix = cfg.sprefix.buf; for (i = 0; i < cfg.extra_hdr.nr; i++) { From patchwork Mon Mar 3 22:00:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Seiki Oshiro X-Patchwork-Id: 13999538 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB8781C5D76 for ; Mon, 3 Mar 2025 22:01:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039319; cv=none; b=QowfDaDX0kYl19OmCdVKZ1zK4mCqYdE3EPGWvj5uiBjhhoY4VMIpUHOHdc5tJUjeHa+Z/FMsBebR5EdhQbS3BbU5cWdXoz7iR4sMSMShxKJryivNfTdBQcwOLIO572a0BNExOfFn8uLTsw/7xas05ePHl3EBkaWni3wy8DlyQAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039319; c=relaxed/simple; bh=4iV7UjDFomA1xyvpdUD0tRlh4gdZXeHQoPPaiNgHNJs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kSPohwtwDOJzHp3w6JNw2X37UdOckk0J9iJFpa2QVasDJ/hULouFbUTySyfld/USWs/jsCu0TgLFtRITPlGdMKo17MFNWy0/rpbN5RAh9XGP9wWTo0dYkrGBYwvS1jDsxUMdGs/qkhidE+l9Fi4y7M5R4tprQ5/LTCGtdb+wreE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MEMq3SEV; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MEMq3SEV" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22328dca22fso74670555ad.1 for ; Mon, 03 Mar 2025 14:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741039316; x=1741644116; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nFfGrdPvOoq1LEqsMBve5eDLP5VaJ95ZfRAcnK+W4fM=; b=MEMq3SEV+oywK0fn3IsQJo88AGF27HC68UDxFJKD5yvzib15p23QvsNDfngdUy3ETQ YKoVZPSYY/Tb8osOxsLbXV3jEHnmxVSoRlu8KtLy4MYudve1Jv4JQXIwhAJmZG1Egtx7 zDD7brbFFdWmGlSrxKXNwXp7TgbV4yzNaAXfLJX6O53jpgI2zwIAm3WaSCCOs6LxXUrR AgIfXZDxmYJGeAB5sGwnm+oTEzAGxKp3UQRGpet1LLqfjtQa5wxMTpGMRv+sCMA1uSsU vnm1NTAhT7zh7+HyAOV5CKREhg8ZY3eVZAwwc5Ef/jfir3BTXDI4K3TkU9MMWLK6KdNT HKgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741039316; x=1741644116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nFfGrdPvOoq1LEqsMBve5eDLP5VaJ95ZfRAcnK+W4fM=; b=xBjEK2012tHhmSKdkevauFAEe/mY7XypG2sz9YUiEyySbeKom20+Sls2gFL0mxWXoJ uxEc8np7wUElzgaeoADyaorkwYB5/Hj5eWFL+DRsRVX4xVYTIFpcO0NNK08TynoZwdoL mQq5LGc4Xo0koFZwxG0gQyU6D6ykPixi6FXSLtz9CFk5YFuYit77FY9+F56vda4BtNFi BnWKiqlZeLamd257AvSLunwCkGlR0A4VOuMd2vLQFz95NrtFNMb9LNYPTTQWVr6hZ/II fonDN7Rj0xv59HhVoE0jK/zvTXtwJTx7CcHGu9UWtQPJ/dsV3gzCwbtUBFA1005KfYxj +lvw== X-Gm-Message-State: AOJu0Yzpb9JDYaD0gQuPcfUHb4clkxPU6pF4jhsqZRvmxwbkIYrp2QzV UQGJS/d+YCpM7BNcajAvCHYkXQcMxZUsnD1gceNJrLFhTHgknb75TXbXFg== X-Gm-Gg: ASbGncstDZ41vWH2ZWtFej0M0BTt/VkK+snBeBkRyA+0C4XxKYPFmoC4ZFUexhuBCvv Cyivr6iILeMV7T7TWM3BmYcsyPO8cynsROS5oMIjwfLUxFh2rY8FaCR7b+LS5GK0JoVaf46i/1M z0bmz27wSFUbFilLhzUkpDg3jKM6GuocZP0RYoQwVVvYlHNsrURIk7TBvcmjD6z/fd6Eygui6Of Tun9dnUWoPMzKYWWfQwZsYmOqpesisnO3HGJ+dA09VxmlhHCFKj7pI5uI7vcfKNEJdGdYmw8hXU hOwM/TauqQMFy/7gvahP+gRYsBYS0GeMZx+Q3TJJc6ruTeyAXFfHElQSeoDKVGHZ054a4Q4XjyZ J9G9cfc/fNg== X-Google-Smtp-Source: AGHT+IGoz0hN6EHbleXWvYoDGJIZ3Xwca3DQP6deOH6MFpja6MtqODRswAl97AYvZaHWASAVJwjboQ== X-Received: by 2002:a17:902:ec90:b0:223:628c:199 with SMTP id d9443c01a7336-2236926725amr198739475ad.52.1741039316495; Mon, 03 Mar 2025 14:01:56 -0800 (PST) Received: from localhost.localdomain ([2804:7f0:b77d:283:5dd5:8e9e:2c56:864a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223504dc7e1sm82746565ad.176.2025.03.03.14.01.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Mar 2025 14:01:56 -0800 (PST) From: Lucas Seiki Oshiro To: git@vger.kernel.org Cc: Lucas Seiki Oshiro Subject: [GSoC][RFC PATCH 5/6] log-tree: add subject prefix in output email subject Date: Mon, 3 Mar 2025 19:00:28 -0300 Message-Id: <20250303220029.10716-6-lucasseikioshiro@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250303220029.10716-1-lucasseikioshiro@gmail.com> References: <20250303220029.10716-1-lucasseikioshiro@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When an extra subject prefix is provided by the user when calling `format-patch --subject-extra-prefix`, insert it between brackets at the beginning of the the patch subject. Don't change the behavior when this flag is not used. For example, this `format-patch` call: `git format-patch -1 --subject-extra-prefix EXTRA -n -v2` will create a patch with the subject beginning with: `Subject: [EXTRA][PATCH v2 1/1]` Signed-off-by: Lucas Seiki Oshiro --- log-tree.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/log-tree.c b/log-tree.c index 8b184d6776..d72ab25585 100644 --- a/log-tree.c +++ b/log-tree.c @@ -478,17 +478,21 @@ void fmt_output_commit(struct strbuf *filename, void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt) { + strbuf_addstr(sb, "Subject: "); + + if (opt->subject_extra_prefix && *opt->subject_extra_prefix) + strbuf_addf(sb, "[%s]", + opt->subject_extra_prefix); + if (opt->total > 0) { - strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ", + strbuf_addf(sb, "[%s%s%0*d/%d] ", opt->subject_prefix, *opt->subject_prefix ? " " : "", decimal_width(opt->total), opt->nr, opt->total); } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { - strbuf_addf(sb, "Subject: [%s] ", + strbuf_addf(sb, "[%s] ", opt->subject_prefix); - } else { - strbuf_addstr(sb, "Subject: "); } } From patchwork Mon Mar 3 22:00:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Seiki Oshiro X-Patchwork-Id: 13999539 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65CA31C5D76 for ; Mon, 3 Mar 2025 22:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039323; cv=none; b=nLh4Xnk4nA8iNtZ+9dh2n6nbPoWOMNO4vI+HLQR9jX4heqZDgxk9hxHta26soX9FBmGnWmufU1kpCuUeAfmAghbxC6VQoAw1+ixTG4B8mEAEk5bG0smRjpqjRM1Mp0md/7gRkpAAtUfIbUe5cjEiYu6tyniUPPOL3vPoBtMEXWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741039323; c=relaxed/simple; bh=F9BNVIIs5rOt2lKmswauhY7ZPy4+8kiElwUjLfBSM5U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sx6Q1zb2aGIaWgrdoXLAIax1xpyk2pY1pc7PzTn7eCkjRb6ZkaH5HxQ+A5EnpQhGNEuyh9o3LglR+MSZ89WwWe+keNEQfYgyWRseEOtSPPNVNRsE9+Mv+WApIKxcxSD24Boodz0pYmtLT3RrDr3fXvEVE3dv8V/jtrUkypTgX7w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZbRE1EOl; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZbRE1EOl" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2234e4b079cso90043715ad.1 for ; Mon, 03 Mar 2025 14:02:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741039321; x=1741644121; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PdxQeQmWLHvuQE04oozeWR7qZzDvIeYAgMZbpGrNkfA=; b=ZbRE1EOltqd5Qeokzb6ggp8AYPHEuLSOb2raZUvVJ4f6+zEDn8SXxpP2oc2b0quAAu r0DQxRQrUmAsjZ8nHgIMUwZgAhS0Oh1gMz2UCG8p5Nq3eAQDPHVmvMO+W4Q9Aok3k2Km i1Zc3YEvdYJGX5rB0TC8eeohFyuofNSu/qHAtdKNc6hqTsWaDJjTI7atxclKSBHMDGqY BJluFpQl61w6gZpIl2p0HHj2Cn/yEkHxYwuGCSgRjidjLB0tYp3m89aizDhMG3RO2C81 XPXJwASGhbifinRSmpgAipqLUHTN6eCK4gnULXz/YQBoArGSDJfcmXkQgMOf1CfVDu2T Hi2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741039321; x=1741644121; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PdxQeQmWLHvuQE04oozeWR7qZzDvIeYAgMZbpGrNkfA=; b=a2jFl8xamA0o53suFo72UGLVgIHBu7+Jvd1Wasvy/Sq6l95RHDPnrsevKy6NM9RsQ6 Fb/TAa0OGJ6H0jtQoMUkAYnnt/b6YJNfZX8kojKJPOKTGGDQ9E7grDQv7c5344Umpenq 6o1OAeU0HiFAXWPUf/ZwiBF+g5aF5OI6rXTicDMoLdc8ZEVdtrGjzcTmfWjUrWwyc+wV dOCM0cuXPH0OvlHKE5VVoOAXG0mBj4q8uwTpBkS8+ag9/XTYdJ1LFvjoX0D4O5QDZZym tS7oIdrilpQbbylqCGy22OC1y/smA+TR97L3Ai+7afu6ZIFXWSzCxbKmeWlOOWGAz+vd dtgg== X-Gm-Message-State: AOJu0YyfaqmqI0/e+WfEaq067vtBm2920cIyUjAOHSuHWZf1OMM7kABn p0WEzHhY/xnVW77ScPUgPyX22Ynmo1SaJKVzw9FpUWVsUNZNO1lNFNNw5Q== X-Gm-Gg: ASbGnct78eNnKfJnJe3SSqkMS/mDZgIvJ0zyStDk0JWBRkTi6clb0P9fRt0d0znwS11 iqqA2zeZZwEUdhumQTqPIxuAUXocZ5hk7VdIw0HUbEwZz82UrvfKGY5AopFlR+kPM4oQjPzVGGP O5LbvTKpn09EJfeJTLZOV1rXA5ulp3ef9/WlLbeFea61aBmF269TegP7yTxbXMXGy5sgcn0hUTa Rnskb5chgSLgtsIg52tHOxylSw3WARixjl3BkdFv+FKlZE2lR2+ETilysVlckjeeXjMOvFkWnvk 22c+QfOjUbCPNeILWiCGAW9PG9qtOGkiHWW+3pQUnJZV8f1PYueYJiUgH6HJ4ZLIHdkDBNhFEFG 1rP7RjuLLFg== X-Google-Smtp-Source: AGHT+IHGa2cRjWBrxTWtwuPt2fc9CJDIsK6t2Eq3VI2qIDhQweYumcNAknEAGVR7002SSGhr+rbg/g== X-Received: by 2002:a17:902:f547:b0:21b:d2b6:ca7f with SMTP id d9443c01a7336-2236920c5b1mr239609275ad.32.1741039321200; Mon, 03 Mar 2025 14:02:01 -0800 (PST) Received: from localhost.localdomain ([2804:7f0:b77d:283:5dd5:8e9e:2c56:864a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223504dc7e1sm82746565ad.176.2025.03.03.14.01.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Mar 2025 14:02:00 -0800 (PST) From: Lucas Seiki Oshiro To: git@vger.kernel.org Cc: Lucas Seiki Oshiro Subject: [GSoC][RFC PATCH 6/6] t4014: add tests for the new flag --subject-extra-prefix Date: Mon, 3 Mar 2025 19:00:29 -0300 Message-Id: <20250303220029.10716-7-lucasseikioshiro@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250303220029.10716-1-lucasseikioshiro@gmail.com> References: <20250303220029.10716-1-lucasseikioshiro@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add tests for `format-patch --subject-extra-prefix` asserting that it works correctly in the following situations: - without other flags related to the prefix; - with the --rfc flag, which should add RFC to the prefix; - with the -n flag, which should add the numbering to the prefix; - with the -v flag, which should add the patch version to the prefix; - with the -k flag, diying as they aren't meant to be used together. Signed-off-by: Lucas Seiki Oshiro --- t/t4014-format-patch.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 884f83fb8a..1256ce2197 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1444,6 +1444,46 @@ test_expect_success '--rfc and -k cannot be used together' ' test_cmp expect.err actual.err ' +cat >expect <<'EOF' +Subject: [EXTRA][PATCH] header with . in it +EOF +test_expect_success '--subject-extra-prefix adds extra prefix' ' + git format-patch -1 --stdout --subject-extra-prefix=EXTRA >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +Subject: [EXTRA][RFC PATCH] header with . in it +EOF +test_expect_success '--subject-extra-prefix works with --rfc' ' + git format-patch --rfc -1 --stdout --subject-extra-prefix=EXTRA >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +Subject: [EXTRA][PATCH 1/1] header with . in it +EOF +test_expect_success '--subject-extra-prefix works with numbered patches' ' + git format-patch -n -1 --stdout --subject-extra-prefix=EXTRA >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +Subject: [EXTRA][PATCH v2] header with . in it +EOF +test_expect_success '--subject-extra-prefix works with -v' ' + git format-patch -v2 -1 --stdout --subject-extra-prefix=EXTRA >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +test_expect_failure '--subject-extra-prefix does not run with -k' ' + git format-patch -k -1 --stdout --subject-extra-prefix=EXTRA >/dev/null +' + test_expect_success '--from=ident notices bogus ident' ' test_must_fail git format-patch -1 --stdout --from=foo >patch '