MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

GitPushNativeResult.java: fix NPE

Browse Source 
java.lang.IllegalArgumentException: Argument for @NotNull parameter 'where' of com/intellij/openapi/util/text/StringUtil.containsIgnoreCase must not be null
	at com.intellij.openapi.util.text.StringUtil.$$$reportNull$$$0(StringUtil.java)
	at com.intellij.openapi.util.text.StringUtil.containsIgnoreCase(StringUtil.java)
	at git4idea.push.GitPushNativeResult.isNonFFUpdate(GitPushNativeResult.java:67)
	at git4idea.push.GitPushRepoResult.convertType(GitPushRepoResult.java:134)

GitOrigin-RevId: ded691d7711fff4106f6dcb7dd13b303c928edb2
This commit is contained in:
Max Medvedev
2024-07-29 18:30:50 +02:00
committed by intellij-monorepo-bot
parent ed3580c53e
commit 59cd1cbd87
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/git4idea/src/git4idea/push/GitPushNativeResult.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package git4idea.push;
import com.intellij.openapi.util.text.StringUtil;
@@ -61,10 +61,10 @@ public class GitPushNativeResult {
}
boolean isNonFFUpdate() {
return myType == Type.REJECTED && myReason != null &&
(StringUtil.containsIgnoreCase(myReason, NO_FF_REJECT_REASON) ||
StringUtil.containsIgnoreCase(myReason, FETCH_FIRST_REASON)) ||
StringUtil.containsIgnoreCase(myReason, FAILED_LOCK_REASON);
if (myReason == null || myType != Type.REJECTED) return false;
return StringUtil.containsIgnoreCase(myReason, NO_FF_REJECT_REASON) ||
StringUtil.containsIgnoreCase(myReason, FETCH_FIRST_REASON) ||
StringUtil.containsIgnoreCase(myReason, FAILED_LOCK_REASON);
}
boolean isStaleInfo() {