Thread (11 messages) 11 messages, 4 authors, 2021-09-13

Re: [PATCH v2 0/3] A pair of git am --abort issues

From: Johannes Schindelin <hidden>
Date: 2021-09-13 12:08:56

Hi Elijah,

On Fri, 10 Sep 2021, Elijah Newren via GitGitGadget wrote:
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
FWIW I gave this a light read-over and am happy with it!

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help