You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/09/17 16:01:40 UTC

[1/2] js commit: Fix packager to not add commit hash when creating a tagged version

Updated Branches:
  refs/heads/3.1.x 0d70465a0 -> 968f50161
  refs/heads/master c9d97526c -> 606ff7594


Fix packager to not add commit hash when creating a tagged version

Was adding -0-HASH to version when we just want the tag.


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/606ff759
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/606ff759
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/606ff759

Branch: refs/heads/master
Commit: 606ff75941f6ec4bbec745e1489aa840bb8ed885
Parents: c9d9752
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 17 10:00:11 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 17 10:00:11 2013 -0400

----------------------------------------------------------------------
 build/packager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/606ff759/build/packager.js
----------------------------------------------------------------------
diff --git a/build/packager.js b/build/packager.js
index eaffc15..6c325c4 100644
--- a/build/packager.js
+++ b/build/packager.js
@@ -32,7 +32,7 @@ packager.computeCommitId = function(callback) {
     }
     if (fs.existsSync('.git')) {
         var gitPath = 'git';
-        var args = 'describe --tags --long';
+        var args = 'describe --tags';
         childProcess.exec(gitPath + ' ' + args, function(err, stdout, stderr) {
             var isWindows = process.platform.slice(0, 3) == 'win';
             if (err && isWindows) {


[2/2] js commit: Fix packager to not add commit hash when creating a tagged version

Posted by ag...@apache.org.
Fix packager to not add commit hash when creating a tagged version

Was adding -0-HASH to version when we just want the tag.
(cherry picked from commit 606ff75941f6ec4bbec745e1489aa840bb8ed885)


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/968f5016
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/968f5016
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/968f5016

Branch: refs/heads/3.1.x
Commit: 968f50161d53809f44243e506fb5fb6a7774abb8
Parents: 0d70465
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 17 10:00:11 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 17 10:01:19 2013 -0400

----------------------------------------------------------------------
 build/packager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/968f5016/build/packager.js
----------------------------------------------------------------------
diff --git a/build/packager.js b/build/packager.js
index eaffc15..6c325c4 100644
--- a/build/packager.js
+++ b/build/packager.js
@@ -32,7 +32,7 @@ packager.computeCommitId = function(callback) {
     }
     if (fs.existsSync('.git')) {
         var gitPath = 'git';
-        var args = 'describe --tags --long';
+        var args = 'describe --tags';
         childProcess.exec(gitPath + ' ' + args, function(err, stdout, stderr) {
             var isWindows = process.platform.slice(0, 3) == 'win';
             if (err && isWindows) {