]> source.dussan.org Git - jgit.git/commit
ResetCommand: Correctly reset unmerged paths in resetIndexForPaths 87/8387/2
authorRobin Stocker <robin@nibor.org>
Sun, 28 Oct 2012 14:35:21 +0000 (15:35 +0100)
committerChris Aniszczyk <zx@twitter.com>
Thu, 1 Nov 2012 17:33:50 +0000 (10:33 -0700)
commit3f1d56d6b7105eec88eea59730a5d78f668df179
tree85998a8ca422164e5ffad6c7ddfede4de38225e8
parent8acaae802c8908712663b0c21b7b09ac602ecb1d
ResetCommand: Correctly reset unmerged paths in resetIndexForPaths

The previous implementation used a PathEdit, which does not reset the
stage of the entry.

Bug: 391860
Change-Id: If26d3a35abfee85424ad69de724f06a28b6e9efb
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java
org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java