]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: afa7c7a) | patch
Hard reset should not report conflict on untracked file 53/2353/1
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 27 Jan 2011 16:20:04 +0000 (17:20 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 27 Jan 2011 16:20:04 +0000 (17:20 +0100)
commit91af19de56759c04ca45eff91a8dfe850fa2fdf0
tree13aa1fa7fc702ac5dd2c8f60443bcb6d1568c76etree | snapshot
parentafa7c7ab07a900831c5e6ea0d8c8f8d42297e7cecommit | diff
Hard reset should not report conflict on untracked file

This problem surfaced since EGit Core ResetOperationTest is failing
since change I26806d21. JGit detected checkout conflict for untracked
files which never were tracked by the repository.

"git reset --hard" in c git also doesn't remove such untracked files.

Change-Id: Icc8e1c548ecf6ed48bd2979c81eeb6f578d347bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit