pr-git-1087/newren/am-issues-v2
tagged this
10 Sep 10:31
This series documents a few issues with git am --abort in the form of new testcases, and fixes one of them. However, while I was surprised the abort left the working directory dirty, I couldn't find any documentation to confirm it should or shouldn't be, and reading the code led me to question if perhaps it was intentional. Anyway, if it's intended, let me know and I'll drop that testcase. For frame of reference, these were some issues I found while working on unintentional removal of untracked files/directories and the current working directory, and I'm just submitting them separately. Changes since v1: * Added a patch to tweak the documentation to clarify that partial cleaning of worktree is expected with --abort * Tweaked the second test to be a test that unrelated dirty files are kept, as suggested by Junio Elijah Newren (3): git-am.txt: clarify --abort behavior t4151: add a few am --abort tests am: fix incorrect exit status on am fail to abort Documentation/git-am.txt | 2 ++ builtin/am.c | 3 ++- t/t4151-am-abort.sh | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) base-commit: e0a2f5cbc585657e757385ad918f167f519cfb96 Submitted-As: https://lore.kernel.org/git/pull.1087.v2.git.git.1631269876.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1087.git.git.1631067429.gitgitgadget@gmail.com
Assets 2
-
2021-09-10T10:31:16Z -
2021-09-10T10:31:16Z -