From 54e5e8331c037140418777ef3bf623e6843e1a44 Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Sun, 1 Dec 2024 00:43:44 +0000 Subject: [PATCH] fix: unstaged git diff --- .../ee/carlrobert/codegpt/codecompletions/InfillRequestUtil.kt | 2 +- src/main/kotlin/ee/carlrobert/codegpt/util/GitUtil.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/InfillRequestUtil.kt b/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/InfillRequestUtil.kt index 25f00c7f..b793c549 100644 --- a/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/InfillRequestUtil.kt +++ b/src/main/kotlin/ee/carlrobert/codegpt/codecompletions/InfillRequestUtil.kt @@ -31,7 +31,7 @@ object InfillRequestUtil { val project = request.editor.project ?: return infillRequestBuilder.build() val repository = GitUtil.getProjectRepository(project) - if (repository != null) { + if (repository != null && service().state.codeCompletionSettings.gitDiffEnabled) { try { val unstagedDiff = GitUtil.getUnstagedDiff(project, repository) if (unstagedDiff.isNotEmpty()) { diff --git a/src/main/kotlin/ee/carlrobert/codegpt/util/GitUtil.kt b/src/main/kotlin/ee/carlrobert/codegpt/util/GitUtil.kt index e8c84e30..63fc04ea 100644 --- a/src/main/kotlin/ee/carlrobert/codegpt/util/GitUtil.kt +++ b/src/main/kotlin/ee/carlrobert/codegpt/util/GitUtil.kt @@ -26,7 +26,6 @@ object GitUtil { ): List { val handler = GitLineHandler(project, gitRepository.root, GitCommand.DIFF) handler.addParameters( - "--cached", "--unified=1", "--diff-filter=AM", "--no-prefix",