]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d44a30a) | patch
Fire WorkingTreeModifiedEvent if cherry-pick failed with conflicts 30/150030/4
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 23 Sep 2019 22:14:12 +0000 (00:14 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 26 Sep 2019 13:10:05 +0000 (15:10 +0200)
commitcda3b2b49261acaf96629b98feba88acaee3a0b6
tree9489ea7441f9b1237b571565e38fb0f618d0089atree | snapshot
parentd44a30a27fc813be765ae9adcd610a3efc84eb2fcommit | diff
Fire WorkingTreeModifiedEvent if cherry-pick failed with conflicts

Otherwise the paths modified by a cherry-pick with conflicts won't be
reported as modified via WorkingTreeModifiedEvents.

Change-Id: I875b67c0d2f68efdf90a9c32b80a2e074ed3570d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit