Skip to content

Commit 9b6229b

Browse files
committed
match logic with git cli
1 parent ba83554 commit 9b6229b

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

cycode/cli/apps/scan/commit_range_scanner.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,13 @@ def _scan_sast_commit_range(ctx: typer.Context, repo_path: str, commit_range: st
205205
scan_parameters = get_scan_parameters(ctx, (repo_path,))
206206

207207
from_commit_rev, to_commit_rev = parse_commit_range_sast(commit_range, repo_path)
208-
# we are using from_commit_documents here because of flipped mess with R=True, differences in parsing commit ranges
209-
commit_documents, _, diff_documents = get_commit_range_modified_documents(
210-
ctx.obj['progress_bar'], ScanProgressBarSection.PREPARE_LOCAL_FILES, repo_path, from_commit_rev, to_commit_rev
208+
_, commit_documents, diff_documents = get_commit_range_modified_documents(
209+
ctx.obj['progress_bar'],
210+
ScanProgressBarSection.PREPARE_LOCAL_FILES,
211+
repo_path,
212+
from_commit_rev,
213+
to_commit_rev,
214+
reverse_diff=False,
211215
)
212216
commit_documents = excluder.exclude_irrelevant_documents_to_scan(consts.SAST_SCAN_TYPE, commit_documents)
213217
diff_documents = excluder.exclude_irrelevant_documents_to_scan(consts.SAST_SCAN_TYPE, diff_documents)

cycode/cli/files_collector/commit_range_documents.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,14 @@ def get_commit_range_modified_documents(
125125
path: str,
126126
from_commit_rev: str,
127127
to_commit_rev: str,
128+
reverse_diff: bool = True,
128129
) -> tuple[list[Document], list[Document], list[Document]]:
129130
from_commit_documents = []
130131
to_commit_documents = []
131132
diff_documents = []
132133

133134
repo = git_proxy.get_repo(path)
134-
diff_index = repo.commit(from_commit_rev).diff(to_commit_rev, create_patch=True, R=True)
135+
diff_index = repo.commit(from_commit_rev).diff(to_commit_rev, create_patch=True, R=reverse_diff)
135136

136137
modified_files_diff = [
137138
diff for diff in diff_index if diff.change_type != consts.COMMIT_DIFF_DELETED_FILE_CHANGE_TYPE

0 commit comments

Comments
 (0)