]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 404de65) | patch
Fix stash apply using merge logic 77/9877/4
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Thu, 24 Jan 2013 03:23:26 +0000 (04:23 +0100)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Wed, 30 Jan 2013 16:38:19 +0000 (11:38 -0500)
commit878e78b307373d558a4e10a18bb6590abf90966a
tree7addfdcd328c46e96325e35d77ed8c4751b965a2tree | snapshot
parent404de6563d247446d591b6d8bacd5bf5089d82c7commit | diff
Fix stash apply using merge logic

Instead of the complicated strange stuff, implement staah
apply as cherry-pick.

Provided there are no conflicts and it is requested that
the index should be applied, perform yet another cherry-pick,
but discard tha results thereof it that would result in conflicts.

Bug: 376035
Change-Id: I553f3a753e0124b102a51f8edbb53ddeff2912e2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java diff | blob | history
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/errors/StashApplyFailureException.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit