Testing basic 'git diff' fix: In a checked out dev environment, add a new random extra css class and js changes to various files, like this: diff --git a/blocks/settings/amd/src/settingsblock.js b/blocks/settings/amd/src/settingsblock.js index 965aec5..e5fb277 100644 --- a/blocks/settings/amd/src/settingsblock.js +++ b/blocks/settings/amd/src/settingsblock.js @@ -28,7 +28,7 @@ define(['jquery', 'core/tree'], function($, Tree) { if (siteAdminNodeId) { var siteAdminNode = adminTree.treeRoot.find('#' + siteAdminNodeId); var siteAdminLink = siteAdminNode.children('a').first(); - siteAdminLink.replaceWith('<span tabindex="0">' + siteAdminLink.html() + '</span>'); + siteAdminLink.replaceWith('<span tabindex="0">' + siteAdminLink.html() + 'something</span>'); } } }; diff --git a/mod/quiz/yui/src/dragdrop/js/resource.js b/mod/quiz/yui/src/dragdrop/js/resource.js index b213807..327132e 100644 --- a/mod/quiz/yui/src/dragdrop/js/resource.js +++ b/mod/quiz/yui/src/dragdrop/js/resource.js @@ -18,6 +18,7 @@ Y.extend(DRAGRESOURCE, M.core.dragdrop, { this.samenodelabel = { identifier: 'dragtoafter', + foo: 'bar', component: 'quiz' }; this.parentnodelabel = { diff --git a/theme/bootstrapbase/less/editor.less b/theme/bootstrapbase/less/editor.less index c66aebd..f64938a 100644 --- a/theme/bootstrapbase/less/editor.less +++ b/theme/bootstrapbase/less/editor.less @@ -7,6 +7,9 @@ // CSS Reset. @import "bootstrap/reset.less"; +.foo { + bar: bar; +} // Base CSS. @import "bootstrap/scaffolding.less"; @import "bootstrap/type.less"; diff --git a/theme/bootstrapbase/less/moodle.less b/theme/bootstrapbase/less/moodle.less index 2556c38..2835c0a 100644 --- a/theme/bootstrapbase/less/moodle.less +++ b/theme/bootstrapbase/less/moodle.less @@ -13,6 +13,9 @@ @import "moodle/user"; @import "moodle/search"; +.foo { + bar: bar; +} // Upstream Bootstrap. @import "bootstrap/bootstrap"; Run 'grunt css' Run 'grunt js' run 'git diff' - you should not get pages of meaningless diff results, just the same diff as above but with a few mentions of the binary files differing. If you run git status you should get: Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)   modified: blocks/settings/amd/build/settingsblock.min.js modified: blocks/settings/amd/src/settingsblock.js modified: mod/quiz/yui/build/moodle-mod_quiz-dragdrop/moodle-mod_quiz-dragdrop-debug.js modified: mod/quiz/yui/build/moodle-mod_quiz-dragdrop/moodle-mod_quiz-dragdrop-min.js modified: mod/quiz/yui/build/moodle-mod_quiz-dragdrop/moodle-mod_quiz-dragdrop.js modified: mod/quiz/yui/src/dragdrop/js/resource.js modified: theme/bootstrapbase/less/editor.less modified: theme/bootstrapbase/less/moodle.less modified: theme/bootstrapbase/style/editor.css modified: theme/bootstrapbase/style/moodle.css