From d48ec2ddfa5b5107a0596187fe51a741f3688d2a Mon Sep 17 00:00:00 2001
From: Soonho Kong <soonhok@cs.cmu.edu>
Date: Sat, 28 Sep 2013 13:33:13 -0700
Subject: [PATCH] chore(travis): fix git-commit-msg extraction

[skip-ci]
---
 .travis.osx.yml     | 9 +++++----
 .travis.windows.yml | 9 +++++----
 .travis.yml         | 5 +++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.osx.yml b/.travis.osx.yml
index 7c4aaed0a..c51670f5d 100644
--- a/.travis.osx.yml
+++ b/.travis.osx.yml
@@ -63,11 +63,12 @@ after_script:
      yes "C" | ctest -D ExperimentalMemCheck -VV;
   fi
 - if [[ $PUSH_TO_CDASH == TRUE ]]; then
-    GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
-    GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
-    GIT_SUBJECT=${GIT_SUBJECT//\"/};
+    GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`;
+    GIT_SUBJECT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 2-`;
+    GIT_SUBJECT=${GIT_SUBJECT//\"/\\\"};
+    GIT_SUBJECT=${GIT_SUBJECT//,/\,};
     GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
-    find Testing -name "*.xml" -exec sed -i "" "s/Generator=\".*\"/Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"/" {} ";";
+    find Testing -name "*.xml" -exec sed -i "" "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
     ctest -D ExperimentalSubmit;
   fi
 - cd ..
diff --git a/.travis.windows.yml b/.travis.windows.yml
index 57b38a30c..5fc4456ce 100644
--- a/.travis.windows.yml
+++ b/.travis.windows.yml
@@ -45,11 +45,12 @@ script:
   - sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
   - ctest -D ExperimentalBuild -VV
   - if [[ $PUSH_TO_CDASH == TRUE ]]; then
-       GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
-       GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
-       GIT_SUBJECT=${GIT_SUBJECT//\"/};
+       GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`;
+       GIT_SUBJECT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 2-`;
+       GIT_SUBJECT=${GIT_SUBJECT//\"/\\\"};
+       GIT_SUBJECT=${GIT_SUBJECT//,/\,};
        GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
-       find Testing -name "*.xml" -exec sed -i "s/Generator=\".*\"/Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"/" {} ";";
+       find Testing -name "*.xml" -exec sed -i "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
        find Testing -type f -name "*.xml" -exec sed -i 's/OSName=\"Linux\"/OSName=\"Windows\"/' {} \; ;
        ctest -D ExperimentalSubmit;
     fi
diff --git a/.travis.yml b/.travis.yml
index 18d634160..42588da37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -210,9 +210,10 @@ after_script:
 - if [[ $LEANREPO == BLESSED && $PUSH_TO_CDASH == TRUE ]]; then
       GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
       GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
-      GIT_SUBJECT=${GIT_SUBJECT//\"/};
+      GIT_SUBJECT=${GIT_SUBJECT//\"/\\\"};
+      GIT_SUBJECT=${GIT_SUBJECT//,/\,};
       GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
-      find Testing -name "*.xml" -exec sed -i "s/Generator=\".*\"/Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"/" {} ";";
+      find Testing -name "*.xml" -exec sed -i "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
       ctest -D ExperimentalSubmit;
   fi
 - cd ..