]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec0d78d) | patch
Fix applying stash on other commit 80/18980/3
authorStefan Lay <stefan.lay@sap.com>
Wed, 27 Nov 2013 16:10:39 +0000 (17:10 +0100)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Fri, 29 Nov 2013 15:36:53 +0000 (10:36 -0500)
commitdcd0dd4d9ec0ffebb5bdbbe9ea819316427b79ca
treec252c6b0f8aa0fcbdef5251b86eb7862e5adc897tree | snapshot
parentec0d78d0939ee8ce30bd349bd885186c13d3b645commit | diff
Fix applying stash on other commit

Applying a stash on another commit failed because the merge base for the
cherry-pick of the stashed index state was not corectly set.

Bug: 422684
Change-Id: I9355352b2b9a7abefa3248ca3c17a9301177d0d6
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
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