From dda23b4a124553735ba08d15212d7739fb3f012e Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Thu, 19 Feb 2015 17:00:13 -0500
Subject: [PATCH] Add filemode ignore to admin tasks

---
 tasks/admin/components/update.js    | 19 ++++++++++++-------
 tasks/admin/distributions/update.js | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/tasks/admin/components/update.js b/tasks/admin/components/update.js
index 7d51b9060..2d1aada07 100644
--- a/tasks/admin/components/update.js
+++ b/tasks/admin/components/update.js
@@ -87,8 +87,10 @@ module.exports = function() {
       gitOptions      = { cwd: outputDirectory },
       commitOptions   = { args: commitArgs, cwd: outputDirectory },
       releaseOptions  = { tag_name: version, owner: release.org, repo: repoName },
-      usernameOptions = { args : 'config  user.name "' + oAuth.name + '"', cwd: outputDirectory },
-      emailOptions    = { args : 'config  user.email "' + oAuth.email + '"', cwd: outputDirectory },
+
+      fileModeOptions = { args : 'config core.fileMode false', cwd: outputDirectory },
+      usernameOptions = { args : 'config user.name "' + oAuth.name + '"', cwd: outputDirectory },
+      emailOptions    = { args : 'config user.email "' + oAuth.email + '"', cwd: outputDirectory },
 
       localRepoSetup  = fs.existsSync(path.join(outputDirectory, '.git')),
       canProceed      = true
@@ -97,14 +99,17 @@ module.exports = function() {
 
     console.info('Processing repository:' + outputDirectory);
 
-    function setUser() {
-      git.exec(usernameOptions, function () {
-        git.exec(emailOptions, function () {
-          commitFiles();
+    function setConfig() {
+      git.exec(fileModeOptions, function() {
+        git.exec(usernameOptions, function () {
+          git.exec(emailOptions, function () {
+            commitFiles();
+          });
         });
       });
     }
 
+
     // standard path
     function commitFiles() {
       // commit files
@@ -164,7 +169,7 @@ module.exports = function() {
 
 
     if(localRepoSetup) {
-      setUser();
+      setConfig();
     }
     else {
       console.error('Repository must be setup before running update components');
diff --git a/tasks/admin/distributions/update.js b/tasks/admin/distributions/update.js
index 7c3605a3e..f0a054d5a 100644
--- a/tasks/admin/distributions/update.js
+++ b/tasks/admin/distributions/update.js
@@ -86,8 +86,10 @@ module.exports = function() {
       gitOptions      = { cwd: outputDirectory },
       commitOptions   = { args: commitArgs, cwd: outputDirectory },
       releaseOptions  = { tag_name: version, owner: release.org, repo: repoName },
-      usernameOptions = { args : 'config  user.name "' + oAuth.name + '"', cwd: outputDirectory },
-      emailOptions    = { args : 'config  user.email "' + oAuth.email + '"', cwd: outputDirectory },
+
+      fileModeOptions = { args : 'config core.fileMode false', cwd: outputDirectory },
+      usernameOptions = { args : 'config user.name "' + oAuth.name + '"', cwd: outputDirectory },
+      emailOptions    = { args : 'config user.email "' + oAuth.email + '"', cwd: outputDirectory },
 
       localRepoSetup  = fs.existsSync(path.join(outputDirectory, '.git')),
       canProceed      = true
@@ -96,10 +98,12 @@ module.exports = function() {
 
     console.info('Processing repository:' + outputDirectory);
 
-    function setUser() {
-      git.exec(usernameOptions, function () {
-        git.exec(emailOptions, function () {
-          commitFiles();
+    function setConfig() {
+      git.exec(fileModeOptions, function() {
+        git.exec(usernameOptions, function () {
+          git.exec(emailOptions, function () {
+            commitFiles();
+          });
         });
       });
     }
@@ -163,7 +167,7 @@ module.exports = function() {
 
 
     if(localRepoSetup) {
-      setUser();
+      setConfig();
     }
     else {
       console.error('Repository must be setup before running update distributions');