" git apply -R" ( man) fails in the same way, and this commit makes this case succeed.
UNDO GIT STASH APPLY PATCH
There are also other ways a patch can contain 2 sections referencing the same file, for example, in 7a07841c0b (" git-apply: handle a patch that touches the same path more than once better",, Git v1.6.0-rc0 - merge). In the code, this is reflected in the behavior of previous_patch() when invoked from check_preimage() when the deletion is checked.Ĭreation then deletion means that when the deletion is checked, previous_patch() returns the creation section, triggering a mode conflict resulting in the "wrong type" error message.īut deletion then creation means that when the deletion is checked, previous_patch() returns NULL, so the deletion mode is checked against lstat, which is what we want.
What we want is: (1) deletion of a file, then (2) creation of a symlink. This causes an issue when the "deletion of a file" section is checked, because Git observes that the so-called file is not a file but a symlink, resulting in a "wrong type" error message. When applying that patch with -R, the sections are reversed, so we get: (1) creation of a symlink, then (2) deletion of a file. (Merged by Junio C Hamano - gitster - in commit c23cd78, ) apply: when -R, also reverse list of sectionsĪ patch changing a symlink into a file is written with 2 sections (in the code, represented as "struct patch"): firstly, the deletion of the symlink, and secondly, the creation of the file.
See commit b0f266d () by Jonathan Tan ( jhowtan). This is most relevant in a patch that changes a path from a regular file to a symbolic link (and vice versa). Warning, that would not in every case: " git apply -R" ( man) did not handle patches that touch the same path twice correctly, which has been corrected with Git 2.30 (Q1 2021). I've been finding this really handy lately. No changes added to commit (use "git add" and/or "git commit -a")Ī light improvement to this is to use git apply in place of patch: git stash show -p | git apply -reverseĪlternatively, you can also use git apply -R as a shorthand to git apply -reverse. " to discard changes in working directory) Nothing to commit (working directory clean) : created 1ff2478: "Initial commit"ġ files changed, 1 insertions(+), 0 deletions(-) Initialized empty Git repository in /tmp/repo/.git/ To keep your other changes intact, use git stash show -p | patch -reverse as in the following: $ git init According to the git-stash manpage, "A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HEAD when the stash was created," and git stash show -p gives us "the changes recorded in the stash as a diff between the stashed state and its original parent.
0 kommentar(er)
