From mboxrd@z Thu Jan 1 00:00:00 1970 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 5BC85C433F5 for ; Thu, 9 Dec 2021 07:26:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230021AbhLIH3c (ORCPT ); Thu, 9 Dec 2021 02:29:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229875AbhLIH3c (ORCPT ); Thu, 9 Dec 2021 02:29:32 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDE07C061746 for ; Wed, 8 Dec 2021 23:25:58 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id d9so8078208wrw.4 for ; Wed, 08 Dec 2021 23:25:58 -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=DSFLxmBFwI+3QxI6zMtwdxNKlGXZcZDyKbmjvwYFhcs=; b=aRWQJ6q/S0rLmx5dCszwXHnWLxgI+ZNff49HWzq4Lcl7wGb3MZQVAkBkzbFLfnK5Kb xzLjwMH5Elfq08f1kA89wRQI5zVImDZLwVZt4OSozj5YSghTfwpU5RBkJtau8b6MhZMW 629UgJmzDxGDLF9CrLAPlz0vf+Xj3Hg9BA0lsKD+ktuz8MzUHC/Yq3VzacyAuvjZtEb1 wQekcvi1Uz5XkxrPrHCwV/0m/7rHDkiKM9Trb2VJDTyEjf/Egy/BmVZRJ3zQvSuRYK3o lgbjzyLFQT3nBQ5KwkzugW/VPevoXuDvA1dllpx+XvsDcbjW/8BifJy+YEf2c2Qh1SyY PwtA== 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=DSFLxmBFwI+3QxI6zMtwdxNKlGXZcZDyKbmjvwYFhcs=; b=Gc2E6lDiLqiUWUKyFsBeFFd4sm4dUswLbAv8HWAs9DXgDWTqFH7SOrSOetl2AveRrx 1gwN2bK+UedTjP1pznwc5qMD8wj4d2TCSkNJ0Xr8XGhKNPKI0vQXS03tGk8viRH+QgaI Akom7h5wAIF20+NzDhEALXQqePhUvmp4EBT2eAKlP9HP0rO/Oev55eYUMaRJztZPHHog DNAvlEfqBB1yR3qt0HGcVhU4h/Llips/P2HmP7q79/NKyOjANP4T8DTD11VF1hUCzPvo Qhi9r+lxxyQ2FfzO26txl053F8mf1lthYlfK1qcYMDYdhIm/bvd5B1Snx04WIX4xHXeq uVGw== X-Gm-Message-State: AOAM533BMEMhIYdE/7dOYSugWJ5vyQwO1GfdPfsCPQbNTu/9TP7LvatY xkjI3iJ/HHeHzHYZks1PygleVjelVko= X-Google-Smtp-Source: ABdhPJyc2ioUIW6Wbktvy/By8nmQ6V5sEpPa3bMR/I0PFw36XGMBZ4XWyXqxtD7EhVYLOCHh6l0Q4Q== X-Received: by 2002:adf:eb42:: with SMTP id u2mr4560643wrn.521.1639034757161; Wed, 08 Dec 2021 23:25:57 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o12sm5319096wmq.12.2021.12.08.23.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Dec 2021 23:25:56 -0800 (PST) Message-Id: In-Reply-To: References: From: "Aleen via GitGitGadget" Date: Thu, 09 Dec 2021 07:25:52 +0000 Subject: [PATCH v19 0/3] am: support --empty=(die|drop|keep) option and --allow-empty option to handle empty patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: =?UTF-8?Q?Ren=C3=A9?= Scharfe , Phillip Wood , Johannes Schindelin , Elijah Newren , Aleen =?UTF-8?Q?=E5=BE=90=E6=B2=9B=E6=96=87?= , 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. ---------------------------------------------------------------------------- Changes since v12: 1. record the empty patch as an empty commit only when there are no changes. 2. fix indentation problems. 3. simplify "to keep recording" to "to record". 4. add a test case for skipping empty patches via the --skip option. ---------------------------------------------------------------------------- Changes since v13: 1. add an additional description about the 'die' value. ---------------------------------------------------------------------------- Changes since v14: 1. reimplement the 'die' value and stop the whole session. (Expected a reroll) 2. the --allow-empty option is a valid resume value only when: (Expected a reroll) * index has not changed * lacking a patch ---------------------------------------------------------------------------- Changes since v15: 1. rename "die" to "stop". ---------------------------------------------------------------------------- Changes since v16: 1. fix the typo from "had" to "has" in the comment. ---------------------------------------------------------------------------- Changes since v17: 1. add trailing comma, show tips of creating an empty commit, and use "%B" to construct test cases. 2. remove the error "Invalid resume value.". 3. hint "--allow-empty" after "--skip". ---------------------------------------------------------------------------- Changes since v18: 1. remove strict checking of "--allow-empty". 徐沛文 (Aleen) (3): doc: git-format-patch: describe the option --always am: support --empty=