Oct 12, 2012 · Oct 16, 2012
diff --git a/git/cmd.py b/git/cmd.py

 execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output',
  'with_exceptions', 'as_process',
  'output_stream' )
  'output_stream', 'output_nostrip' )

 __all__ = ('Git', )

 with_exceptions=True,
 as_process=False,
 output_stream=None,
 output_nostrip=False,
 **subprocess_kwargs
 ):
 """Handles executing the command on the shell and consumes and returns
 This merely is a workaround as data will be copied from the
 output pipe to the given output stream directly.

 :param output_nostrip:
 The last line of the output normally is stripped if it is empty. If
 output_nostrip is True, this behavior is disabled. This can be important
 when constructing patches e.g. using the diff command.

 :param subprocess_kwargs:
 Keyword arguments to be passed to subprocess.Popen. Please note that
 some of the valid kwargs are already set by this method, the ones you
 if output_stream is None:
 stdout_value, stderr_value = proc.communicate()
 # strip trailing "\n"
 if stdout_value.endswith("\n"):
 if stdout_value.endswith("\n") and not output_nostrip:
 stdout_value = stdout_value[:-1]
 if stderr_value.endswith("\n"):
 stderr_value = stderr_value[:-1]
diff --git a/git/test/test_cmd.py b/git/test/test_cmd.py
 finally:
 type(self.git).GIT_PYTHON_GIT_EXECUTABLE = prev_cmd
 #END undo adjustment

 def test_output_nostrip(self):
 import subprocess as sp
 hexsha = "b2339455342180c7cc1e9bba3e9f181f7baa5167"

 # Verify that a trailing newline is stripped from the output of a git
 # command.
 content = self.git.cat_file('blob', hexsha)
 g = self.git.hash_object(istream=sp.PIPE, as_process=True, stdin=True)
 g.stdin.write(content)
 g.stdin.close()
 newsha = g.stdout.readline().strip()
 self.assertNotEquals(newsha, hexsha)

 # Verify that output of a git command which ends with an empty
 # line is not modified when the output_nostrip flag is set.
 content = self.git.cat_file('blob', hexsha, output_nostrip=True)
 g = self.git.hash_object(istream=sp.PIPE, as_process=True, stdin=True)
 g.stdin.write(content)
 g.stdin.close()
 newsha = g.stdout.readline().strip()
 self.assertEquals(newsha, hexsha)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,7 +19,7 @@

		execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output',
		'with_exceptions', 'as_process',
		'output_stream' )
		'output_stream', 'output_nostrip' )

		__all__ = ('Git', )

Expand DownExpand Up		@@ -267,6 +267,7 @@ def execute(self, command,
		with_exceptions=True,
		as_process=False,
		output_stream=None,
		output_nostrip=False,
		**subprocess_kwargs
		):
		"""Handles executing the command on the shell and consumes and returns
Expand DownExpand Up		@@ -309,6 +310,11 @@ def execute(self, command,
		This merely is a workaround as data will be copied from the
		output pipe to the given output stream directly.

		:param output_nostrip:
		The last line of the output normally is stripped if it is empty. If
		output_nostrip is True, this behavior is disabled. This can be important
		when constructing patches e.g. using the diff command.

		:param subprocess_kwargs:
		Keyword arguments to be passed to subprocess.Popen. Please note that
		some of the valid kwargs are already set by this method, the ones you
Expand DownExpand Up		@@ -359,7 +365,7 @@ def execute(self, command,
		if output_stream is None:
		stdout_value, stderr_value = proc.communicate()
		# strip trailing "\n"
		if stdout_value.endswith("\n"):
		if stdout_value.endswith("\n") and not output_nostrip:
		stdout_value = stdout_value[:-1]
		if stderr_value.endswith("\n"):
		stderr_value = stderr_value[:-1]
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -108,3 +108,25 @@ def test_cmd_override(self):
		finally:
		type(self.git).GIT_PYTHON_GIT_EXECUTABLE = prev_cmd
		#END undo adjustment

		def test_output_nostrip(self):
		import subprocess as sp
		hexsha = "b2339455342180c7cc1e9bba3e9f181f7baa5167"

		# Verify that a trailing newline is stripped from the output of a git
		# command.
		content = self.git.cat_file('blob', hexsha)
		g = self.git.hash_object(istream=sp.PIPE, as_process=True, stdin=True)
		g.stdin.write(content)
		g.stdin.close()
		newsha = g.stdout.readline().strip()
		self.assertNotEquals(newsha, hexsha)

		# Verify that output of a git command which ends with an empty
		# line is not modified when the output_nostrip flag is set.
		content = self.git.cat_file('blob', hexsha, output_nostrip=True)
		g = self.git.hash_object(istream=sp.PIPE, as_process=True, stdin=True)
		g.stdin.write(content)
		g.stdin.close()
		newsha = g.stdout.readline().strip()
		self.assertEquals(newsha, hexsha)