]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d3148f9) | patch
Fix StashApplyCommand for stashes containing untracked changes. 26/88726/3
authorThomas Wolf <thomas.wolf@paranor.ch>
Sun, 15 Jan 2017 20:35:50 +0000 (21:35 +0100)
committerThomas Wolf <thomas.wolf@paranor.ch>
Sun, 15 Jan 2017 20:54:12 +0000 (21:54 +0100)
commit46af7192a20bb9d2daf72badc3521320795d44a9
tree261947ca8978abe995367b319d9abda539b9cf99tree | snapshot
parentd3148f9410b071edd4a4c85d2a43d1fa2574b0d2commit | diff
Fix StashApplyCommand for stashes containing untracked changes.

If there are untracked changes, apply only the untracked tree
after a successful merge. The merge tree from merging untracked
with HEAD would also contain files already reset before (changes
in tracked files) and try to reset those again,leading to false
checkout conflicts.

Bug: 505804
Change-Id: Iaced4d277623334d11e3d1cca5969590d7c5093e
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit