mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
git: fix detection of "nothing to commit" situation
Git reports both to stdout and stderr in such situations, so the condition was always met. If there is a more critical error during cherry-pick command execution, Git doesn't report the "nothing to commit" error, so there is no need in such condition anyway.
This commit is contained in:
@@ -204,9 +204,6 @@ public class GitCherryPicker extends VcsCherryPicker {
|
||||
}
|
||||
|
||||
private static boolean isNothingToCommitMessage(@NotNull GitCommandResult result) {
|
||||
if (!result.getErrorOutputAsJoinedString().isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
String stdout = result.getOutputAsJoinedString();
|
||||
return stdout.contains("nothing to commit") || stdout.contains("previous cherry-pick is now empty");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user