Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shellgit: Ensure the passed filepath to diff-index is interpreted as filepath #1367

Merged
merged 1 commit into from
Nov 27, 2023
Merged

shellgit: Ensure the passed filepath to diff-index is interpreted as filepath #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.mkd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
Unreleased
----------

- shellgit: Ensure the passed filepath to diff-index is interpreted as filepath [#1367](https://github.com/puppetlabs/r10k/pull/1367)

4.0.0
-----
Expand Down
2 changes: 1 addition & 1 deletion lib/r10k/git/shellgit/working_repository.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def dirty?(exclude_spec=true)
logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, file)}))

# Do this in a block so that the extra subprocess only gets invoked when needed.
logger.debug1 { git(['diff-index', '-p', 'HEAD', file], :path => @path.to_s, :raise_on_fail => false).stdout }
logger.debug1 { git(['diff-index', '-p', 'HEAD', '--', file], :path => @path.to_s, :raise_on_fail => false).stdout }
end

return dirty_files.size > 0
Expand Down