MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: rebase: NotNull

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-01-06 15:30:00 +03:00
parent 6e10f05748
commit 4a02352ba5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
+2 -2
View File
@@ -134,7 +134,7 @@ public class GitRebaseUtils {
* @return the rebase directory or null if it does not exist.
*/
@Nullable
private static File getRebaseDir(VirtualFile root) {
private static File getRebaseDir(@NotNull VirtualFile root) {
File gitDir = new File(VfsUtilCore.virtualToIoFile(root), GitUtil.DOT_GIT);
File f = new File(gitDir, GitRepositoryFiles.REBASE_APPLY);
if (f.exists()) {
@@ -154,7 +154,7 @@ public class GitRebaseUtils {
* @return the commit information or null if no commit information could be detected
*/
@Nullable
public static CommitInfo getCurrentRebaseCommit(VirtualFile root) {
public static CommitInfo getCurrentRebaseCommit(@NotNull VirtualFile root) {
File rebaseDir = getRebaseDir(root);
if (rebaseDir == null) {
LOG.warn("No rebase dir found for " + root.getPath());