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:
commit
045799f2ec
|
@ -180,6 +180,10 @@ private void excludeRemoteRefs(ObjectWalk walk) throws IOException {
|
||||||
if (oid == null) {
|
if (oid == null) {
|
||||||
oid = r.getObjectId();
|
oid = r.getObjectId();
|
||||||
}
|
}
|
||||||
|
if (oid == null) {
|
||||||
|
// ignore (e.g. symbolic, ...)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
RevObject o = walk.parseAny(oid);
|
RevObject o = walk.parseAny(oid);
|
||||||
if (o.getType() == Constants.OBJ_COMMIT
|
if (o.getType() == Constants.OBJ_COMMIT
|
||||||
|| o.getType() == Constants.OBJ_TAG) {
|
|| o.getType() == Constants.OBJ_TAG) {
|
||||||
|
|
Loading…
Reference in New Issue