Apr 7, 2022 · Apr 6, 2022 · Apr 6, 2022 · Apr 7, 2022 · Apr 7, 2022 · Apr 7, 2022
diff --git a/AUTHORS b/AUTHORS
 -Alba Mendez <me _at_ alba.sh>
 -Robert Westman <robert _at_ byteflux.io>
 -Hugo van Kemenade
 -Hiroki Tokunaga <tokusan441 _at_ gmail.com>
 Portions derived from other open source works and are clearly marked.
diff --git a/git/cmd.py b/git/cmd.py
 execute_kwargs = {'istream', 'with_extended_output',
                  'with_exceptions', 'as_process', 'stdout_as_string',
                  'output_stream', 'with_stdout', 'kill_after_timeout',
                  'universal_newlines', 'shell', 'env', 'max_chunk_size'}
                  'universal_newlines', 'shell', 'env', 'max_chunk_size', 'strip_newline_in_stdout'}

 log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
                shell: Union[None, bool] = None,
                env: Union[None, Mapping[str, str]] = None,
                max_chunk_size: int = io.DEFAULT_BUFFER_SIZE,
                strip_newline_in_stdout: bool = True,
                **subprocess_kwargs: Any
                ) -> Union[str, bytes, Tuple[int, Union[str, bytes], str], AutoInterrupt]:
        """Handles executing the command on the shell and consumes and returns
            effects on a repository. For example, stale locks in case of git gc could
            render the repository incapable of accepting changes until the lock is manually
            removed.

        :param strip_newline_in_stdout:
            Whether to strip the trailing `\n` of the command stdout.
        :return:
            * str(output) if extended_output = False (Default)
            * tuple(int(status), str(stdout), str(stderr)) if extended_output = True
                        if not universal_newlines:
                            stderr_value = stderr_value.encode(defenc)
                # strip trailing "\n"
                if stdout_value.endswith(newline):  # type: ignore
                if stdout_value.endswith(newline) and strip_newline_in_stdout:  # type: ignore
                    stdout_value = stdout_value[:-1]
                if stderr_value.endswith(newline):  # type: ignore
                    stderr_value = stderr_value[:-1]
diff --git a/test/test_repo.py b/test/test_repo.py
        except GitCommandError:
            pass
        self.assertEqual(r.currently_rebasing_on(), commitSpanish)

    @with_rw_directory
    def test_do_not_strip_newline_in_stdout(self, rw_dir):
        r = Repo.init(rw_dir)
        fp = osp.join(rw_dir, 'hello.txt')
        with open(fp, 'w') as fs:
            fs.write("hello\n")
        r.git.add(Git.polish_url(fp))
        r.git.commit(message="init")
        self.assertEqual(r.git.show("HEAD:hello.txt", strip_newline_in_stdout=False), 'hello\n')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,4 +45,5 @@ Contributors are:
		-Alba Mendez <me _at_ alba.sh>
		-Robert Westman <robert _at_ byteflux.io>
		-Hugo van Kemenade
		-Hiroki Tokunaga <tokusan441 _at_ gmail.com>
		Portions derived from other open source works and are clearly marked.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,7 +55,7 @@
		execute_kwargs = {'istream', 'with_extended_output',
		'with_exceptions', 'as_process', 'stdout_as_string',
		'output_stream', 'with_stdout', 'kill_after_timeout',
		'universal_newlines', 'shell', 'env', 'max_chunk_size'}
		'universal_newlines', 'shell', 'env', 'max_chunk_size', 'strip_newline_in_stdout'}

		log = logging.getLogger(__name__)
		log.addHandler(logging.NullHandler())
Expand DownExpand Up		@@ -738,6 +738,7 @@ def execute(self,
		shell: Union[None, bool] = None,
		env: Union[None, Mapping[str, str]] = None,
		max_chunk_size: int = io.DEFAULT_BUFFER_SIZE,
		strip_newline_in_stdout: bool = True,
		**subprocess_kwargs: Any
		) -> Union[str, bytes, Tuple[int, Union[str, bytes], str], AutoInterrupt]:
		"""Handles executing the command on the shell and consumes and returns
Expand DownExpand Up		@@ -810,7 +811,8 @@ def execute(self,
		effects on a repository. For example, stale locks in case of git gc could
		render the repository incapable of accepting changes until the lock is manually
		removed.

		:param strip_newline_in_stdout:
		Whether to strip the trailing `\n` of the command stdout.
		:return:
		* str(output) if extended_output = False (Default)
		* tuple(int(status), str(stdout), str(stderr)) if extended_output = True
Expand DownExpand Up		@@ -944,7 +946,7 @@ def _kill_process(pid: int) -> None:
		if not universal_newlines:
		stderr_value = stderr_value.encode(defenc)
		# strip trailing "\n"
		if stdout_value.endswith(newline): # type: ignore
		if stdout_value.endswith(newline) and strip_newline_in_stdout: # type: ignore
		stdout_value = stdout_value[:-1]
		if stderr_value.endswith(newline): # type: ignore
		stderr_value = stderr_value[:-1]
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1098,3 +1098,13 @@ def test_rebasing(self, rw_dir):
		except GitCommandError:
		pass
		self.assertEqual(r.currently_rebasing_on(), commitSpanish)

		@with_rw_directory
		def test_do_not_strip_newline_in_stdout(self, rw_dir):
		r = Repo.init(rw_dir)
		fp = osp.join(rw_dir, 'hello.txt')
		with open(fp, 'w') as fs:
		fs.write("hello\n")
		r.git.add(Git.polish_url(fp))
		r.git.commit(message="init")
		self.assertEqual(r.git.show("HEAD:hello.txt", strip_newline_in_stdout=False), 'hello\n')