From patchwork Tue Nov 30 05:37:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 12646361 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30AF9C433EF for ; Tue, 30 Nov 2021 05:37:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238337AbhK3Fkr (ORCPT ); Tue, 30 Nov 2021 00:40:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbhK3Fkr (ORCPT ); Tue, 30 Nov 2021 00:40:47 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46FEFC061574 for ; Mon, 29 Nov 2021 21:37:28 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id c6-20020a05600c0ac600b0033c3aedd30aso13891470wmr.5 for ; Mon, 29 Nov 2021 21:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=Au7nJtjmjY50zN8p2YwvP0I4EuVe7URveK1DkN1Vg6A=; b=f7AD58mrpw65ulNPRsy01FpYd/2bpioNcUILmGWKw6uqfkKscn9yk1HP8P64zgPMb6 sDCydKf4oDv3CfhCghx30FNLW3PSc5L9NjpxSxvM00H5EYABp+l0kV7WBpPo7G+ayGSC 4XqwnyCTcJFtDflzw/WNHsz0QPVPgbmRnWnxpMYBX+Mj2FE6mf87REEq9HQ6blePsCVa I8tPmPo/EtulRG5WAoeU9U/vIldxkWmDB3GQxuQvY9Kg6Awp6UgoDmp8D+PJNpDKztJl yHbCyKaJ1z9rdLNQXK7BkVj8qtgJ94ImMCNHKCAu/lMGfyIziD6bjRk/cdh9wngJb/2v CNAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=Au7nJtjmjY50zN8p2YwvP0I4EuVe7URveK1DkN1Vg6A=; b=YN97s+lEjrUewyGBdnQlf3anJ/jEfrBuniDbBbN5s10QDgdgAatB3XuV8wb+r7qwwt GZU0SsNpV9FEefPQsLslMs7PpwCkcAWBD+8KMbDcqfckeTcI3jFiSs9sJ2mqtmZob1LB oDzDLtY3F4B6fXmuhB0bmn/TNcn/STHlz6ZVsxky+OuBVJd1zGpTUVRgZJhaudlPwJ0Q n0+SoQOqgrwDhrBPQvM14sEHA7nbqgRh0iJyl56ZmcEjUFMwHrHXwe1mute0mblkWsYy UiiDeXeNSReccHo26WL6U2hRpNM5JluHL6tZIb6yTHuVorSSIXIUIb9sjaB/6lIKFlfn uc6w== X-Gm-Message-State: AOAM5330yDKoBOUjI6g+NzegHVbbPELbyChRctBvk/hsYwFwszRlMV7s Zr6iYSYbj/q40aldLLgojPmOVezVc+0= X-Google-Smtp-Source: ABdhPJzirF13/xmFQL0jamdVXvXD0lTCj3y8EyRS3w1NqNeiNcQx6LH1OiTVCQJdeaMiFOrgWxlTxQ== X-Received: by 2002:a7b:cc8f:: with SMTP id p15mr2556902wma.129.1638250646629; Mon, 29 Nov 2021 21:37:26 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e8sm15293197wrr.26.2021.11.29.21.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 21:37:26 -0800 (PST) Message-Id: In-Reply-To: References: From: "Aleen via GitGitGadget" Date: Tue, 30 Nov 2021 05:37:22 +0000 Subject: [PATCH v12 0/3] am: support --empty=(die|drop|keep) option and --allow-empty option to handle empty patches MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?b?UmVuw6k=?= Scharfe , Phillip Wood , Johannes Schindelin , Elijah Newren , Aleen =?utf-8?b?5b6Q5rKb5paH?= , Aleen Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since that git has supported the --always option for the git-format-patch command to create a patch with an empty commit message, git-am should support applying and committing with empty patches. ---------------------------------------------------------------------------- Changes since v1: 1. add a case when not passing the --always option. 2. rename the --always option to --allow-empty. ---------------------------------------------------------------------------- Changes since v2: 1. rename the --allow-empty option to --empty-commit. 2. introduce three different strategies (die|skip|asis) when trying to record empty patches as empty commits. ---------------------------------------------------------------------------- Changes since v3: 1. generate the missed file for test cases. 2. grep -f cannot be used under Mac OS. ---------------------------------------------------------------------------- Changes since v4: 1. rename the --empty-commit option to --empty. 2. rename three different strategies (die|skip|asis) to die, drop and keep correspondingly. ---------------------------------------------------------------------------- Changes since v5: 1. throw an error when passing --empty option without value. ---------------------------------------------------------------------------- Changes since v6: 1. add i18n resources. ---------------------------------------------------------------------------- Changes since v7: 1. update code according to the seen branch. 2. fix the wrong document of git-am. 3. sign off commits by a real name. ---------------------------------------------------------------------------- Changes since v8: 1. update the committer's name with my real name to fix DCO of GGG. ---------------------------------------------------------------------------- Changes since v9: 1. imitate the signed name format of https://lore.kernel.org/git/pull.1143.git.git.1637347813367.gitgitgadget@gmail.com . ---------------------------------------------------------------------------- Changes since v11: 1. introduce an interactive option --allow-empty for git-am to record empty patches in the middle of an am session. 徐沛文 (Aleen) (3): doc: git-format-patch: describe the option --always am: support --empty=