Merge branch 'stable-4.11'

* stable-4.11:
  LFS: Fix potential NPE in LfsPrePushHook

Change-Id: If721bd18035870541d216d2dcd9d47484e9af3e5
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-04-09 16:40:37 +09:00
commit 045799f2ec
1 changed files with 4 additions and 0 deletions

View File

@ -180,6 +180,10 @@ private void excludeRemoteRefs(ObjectWalk walk) throws IOException {
if (oid == null) {
oid = r.getObjectId();
}
if (oid == null) {
// ignore (e.g. symbolic, ...)
continue;
}
RevObject o = walk.parseAny(oid);
if (o.getType() == Constants.OBJ_COMMIT
|| o.getType() == Constants.OBJ_TAG) {