Ottomata has submitted this change and it was merged.
Change subject: Using unified diff output for puppet-merge when showing
submodule diffs
......................................................................
Using unified diff output for puppet-merge when showing submodule diffs
Change-Id: I2ec0f8f0d7f4eabb5029b20664790447bfe2b206
---
M modules/puppetmaster/files/puppet-merge
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/puppetmaster/files/puppet-merge
b/modules/puppetmaster/files/puppet-merge
index cf78f4d..161d77e 100755
--- a/modules/puppetmaster/files/puppet-merge
+++ b/modules/puppetmaster/files/puppet-merge
@@ -78,7 +78,7 @@
git submodule update --quiet --init)
# show the diff between the $basedir puppet directory and the $tmpdir
puppet directory
- diff -Nr -x "private" -x ".git" "${basedir}" "${tmpdir}" || true
+ diff -uNr -x "private" -x ".git" "${basedir}" "${tmpdir}" || true
# We've shown the diff so we are done with $tmpdir. Remove it.
rm -r "${tmpdir}"
--
To view, visit https://gerrit.wikimedia.org/r/111470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ec0f8f0d7f4eabb5029b20664790447bfe2b206
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
