jenkins-bot has submitted this change and it was merged.
Change subject: Use git-diff default submodule format
......................................................................
Use git-diff default submodule format
If someone has diff.submodule set to anything other than short in their
git config the git diff command creates different output than is
currently expected in this script.
Ensuring that the diff.submodule format is always set to short means
that there are no needed modifications to a person's git config and
there is no regex futzing needed.
Change-Id: I30e114d4ebed42601f6cb685900985fc0f2f1623
---
M make-deploy-notes/make-deploy-notes
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-deploy-notes/make-deploy-notes
b/make-deploy-notes/make-deploy-notes
index 08809c8..fa49946 100755
--- a/make-deploy-notes/make-deploy-notes
+++ b/make-deploy-notes/make-deploy-notes
@@ -178,7 +178,7 @@
* @return string
*/
function git_submodule_diff_output( $oldbranch, $newbranch, $type ) {
- return shell_exec( "git diff $oldbranch $newbranch $type" );
+ return shell_exec( "git diff --submodule=short $oldbranch $newbranch
$type" );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/279172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30e114d4ebed42601f6cb685900985fc0f2f1623
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
