Summary

Don't include Error Stream output in the Diff

Review Request #5615 — Created March 12, 2014 and submitted March 12, 2014, 4 p.m.

Information

Owner

ceagan

Repository

RBTools

Branch

Bugs

Depends On

Reviewers

Groups

rbtools

People

Description

We ran into a problem where the diff is generated properly and git doesn't throw an error, but it prints warnings to stderr during the diff generation. The error stream content is included in the diff and this creates a corrupted diff, which causes breakage on the Review Board server. This patch makes it so that the generated diffs don't include the stderr stream content.

Sample Warning:
warning: CRLF will be replaced by LF in pom.xml.
The file will have its original line endings in your working directory.

Testing Done

We tested that the scenario described no longer occurs when the stderr is not included in the diff.

Change Summary:: spelling, clarification
Description:: ~
We ran into a problem where the diff is generated properly and git doesn't throw an error, but it prints warnings to stderr during the diff generation. The error stream content creates a corrupted diff, which causes breakage on the Review Board server. This patch makes it so that the diffs don't include the stderr stream content.
~
We ran into a problem where the diff is generated properly and git doesn't throw an error, but it prints warnings to stderr during the diff generation. The error stream content is included in the diff and this creates a corrupted diff, which causes breakage on the Review Board server. This patch makes it so that the generated diffs don't include the stderr stream content.

Sample Warning:
warning: CRLF will be replaced by LF in pom.xml.
The file will have its original line endings in your working directory.
Testing Done:: ~
We tested that the scenario descibed no longer occurs when the stderr is not included in the diff.
~
We tested that the scenario described no longer occurs when the stderr is not included in the diff.

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to release-0.5.x (e936bbd). Thanks!

~		We ran into a problem where the diff is generated properly and git doesn't throw an error, but it prints warnings to stderr during the diff generation. The error stream content creates a corrupted diff, which causes breakage on the Review Board server. This patch makes it so that the diffs don't include the stderr stream content.
	~	We ran into a problem where the diff is generated properly and git doesn't throw an error, but it prints warnings to stderr during the diff generation. The error stream content is included in the diff and this creates a corrupted diff, which causes breakage on the Review Board server. This patch makes it so that the generated diffs don't include the stderr stream content.

		Sample Warning:
		warning: CRLF will be replaced by LF in pom.xml.
		The file will have its original line endings in your working directory.

~		We tested that the scenario descibed no longer occurs when the stderr is not included in the diff.
	~	We tested that the scenario described no longer occurs when the stderr is not included in the diff.