aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
diff options
context:
space:
mode:
authorChristian Halstrick <christian.halstrick@sap.com>2010-10-15 14:51:52 +0200
committerChristian Halstrick <christian.halstrick@sap.com>2010-10-18 00:19:13 +0200
commit609c6dc3580653516038b4d677bfb2e735fd641f (patch)
tree9ab550243a97737229b519e4854438cc371a6b66 /org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
parent9b4876cedf430e454b99da5410e2a9d624f35129 (diff)
downloadjgit-609c6dc3580653516038b4d677bfb2e735fd641f.tar.gz
jgit-609c6dc3580653516038b4d677bfb2e735fd641f.zip
Fix possible NPE in DirCacheCheckout
There was a chance that we hit a NPE which doing a checkout with DirCacheCheckout when there is no HEAD (e.g. initial checkout). This is fixed here. Change-Id: Ie3b8cae21dcd90ba8352823ea94a700f8ee9221a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java')
0 files changed, 0 insertions, 0 deletions