Skip to content

Commit

Permalink
Merge pull request #38 from byohay/feature/support-project-path-spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
byohay committed Jan 12, 2022
2 parents 53434ec + d40ca3a commit 619d14e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/kintsugi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def file_has_base_ours_and_theirs_versions?(file_path)
def file_has_version_in_stage_numbers?(file_path, stage_numbers)
file_absolute_path = File.absolute_path(file_path)
actual_stage_numbers =
`git ls-files -u -- #{file_absolute_path}`.split("\n").map do |git_file_status|
`git ls-files -u -- "#{file_absolute_path}"`.split("\n").map do |git_file_status|
git_file_status.split[2]
end
(stage_numbers - actual_stage_numbers.map(&:to_i)).empty?
Expand Down

0 comments on commit 619d14e

Please sign in to comment.