]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.3' 12/72112/2
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 4 May 2016 23:13:35 +0000 (01:13 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 4 May 2016 23:13:45 +0000 (01:13 +0200)
commit89db7e01fa9f1bfe93e3097a8c272eac3032723c
treedf6a7b675794186288d53e7149d237b73ea99320
parentbc9df9c63c748a6cf3aa2a3ff929484e4bdcc78d
parent05fd01656ee295e4a8d3c1efff0ca3a6f48c1f4c
Merge branch 'stable-4.3'

* stable-4.3:
  Scan loose ref before packed in case gc about to remove the loose
  Fix possible NPEs when reporting transport errors
  Fix calling of clean/smudge filters from Checkout,MergeCommands
  Fix ApplyCommand when result of patch is an empty file

Change-Id: I0dc76b7a8c87ce8e0386a1b9e0fa92a3aa62abf7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>