Skip to content

Commit 1cf0b3b

Browse files
committed
remove force
1 parent d92de88 commit 1cf0b3b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

patchwork/steps/CommitChanges/CommitChanges.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ def run(self) -> dict:
128128
repo = git.Repo(cwd, search_parent_directories=True)
129129
repo_dir_path = Path(repo.working_tree_dir)
130130
repo_changed_files = {repo_dir_path / item.a_path for item in repo.index.diff(None)}
131+
repo_ignored_files = repo.ignored(*repo_changed_files)
132+
repo_changed_files = repo_changed_files.difference(repo_ignored_files)
131133
repo_untracked_files = {repo_dir_path / item for item in repo.untracked_files}
132134
modified_files = {Path(modified_code_file["path"]).resolve() for modified_code_file in self.modified_code_files}
133135
true_modified_files = modified_files.intersection(repo_changed_files.union(repo_untracked_files))
@@ -150,7 +152,7 @@ def run(self) -> dict:
150152
to_branch,
151153
):
152154
for modified_file in true_modified_files:
153-
repo.git.add("-f", modified_file)
155+
repo.git.add(modified_file)
154156
commit_with_msg(repo, f"Patched {modified_file}")
155157

156158
return dict(

0 commit comments

Comments
 (0)