-
-
Notifications
You must be signed in to change notification settings - Fork 905
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.
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
Deprecate default of Git.show(strip_newline_in_stdout=False) #1948
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot for contributing.
I think with a few minor modifications this PR can be merged.
@@ -1210,6 +1210,14 @@ def execute( | |||
if self.GIT_PYTHON_TRACE and (self.GIT_PYTHON_TRACE != "full" or as_process): | |||
_logger.info(" ".join(redacted_command)) | |||
|
|||
if strip_newline_in_stdout and command[:2] == ["git", "show"]: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"git"
shouldn't be hard-coded, and I am pretty sure there is a variable for this somewhere.
@@ -1210,6 +1210,14 @@ def execute( | |||
if self.GIT_PYTHON_TRACE and (self.GIT_PYTHON_TRACE != "full" or as_process): | |||
_logger.info(" ".join(redacted_command)) | |||
|
|||
if strip_newline_in_stdout and command[:2] == ["git", "show"]: | |||
warnings.warn( | |||
"Git.show() has strip_newline_in_stdout=True by default, which probably isn't what you want and will " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Git.show() has strip_newline_in_stdout=True by default, which probably isn't what you want and will " | |
"Git.show() has strip_newline_in_stdout=True by default, which probably isn't what you want and may " |
return r | ||
|
||
@with_rw_directory | ||
def test_warn_when_strip_newline_in_stdout(self, rw_dir): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's put the additional assertion done in test_do_not_strip_newline_in_stdout
here so that it's clearer what's under test: The deprecation warning if git show
is used and strip_newline_in_stdout=True
. This way, test_do_not_strip_newline_in_stdout
can be removed. I'd also hope that the assertion then can be changed to use the default value for strip_newline_in_stdout
, which is probably True
, the cause of the confusion in this case.
As per our discussion in #1377.
Also fix a few tests that were broken by my git being configured to create new repos with
main
as the initial branch, so that all my tests pass.