From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 3 Sep 2008 13:46:24 +0000 (+0200)
Subject: Update genversion to work with single-binary git
X-Git-Tag: 0.3.1~294
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=6fe50f14efa32c2ed95e7b34a4ba1fd1604617ec;ds=sidebyside

Update genversion to work with single-binary git
---

diff --git a/src/common/genversion.cpp b/src/common/genversion.cpp
index 02a7a5ee..cf64461e 100644
--- a/src/common/genversion.cpp
+++ b/src/common/genversion.cpp
@@ -43,15 +43,15 @@ int main(int argc, char **argv) {
     // try to execute git-describe to get a version string
     QProcess git;
     git.setWorkingDirectory(gitroot);
-    git.start("git-describe", QStringList("--long"));
+    git.start("git", QStringList() << "describe" << "--long");
     if(git.waitForFinished(10000)) {
       QString gitversion = git.readAllStandardOutput();
       if(!gitversion.isEmpty() && !gitversion.contains("fatal")) {
         // seems we have a valid version string, now prettify it...
         // check if the workdir is dirty first
         QString dirty;
-        QStringList params = QStringList() << "--name-only" << "HEAD";
-        git.start("git-diff-index", params);
+        QStringList params = QStringList() << "diff-index" << "--name-only" << "HEAD";
+        git.start("git", params);
         if(git.waitForFinished(10000)) {
           if(!git.readAllStandardOutput().isEmpty()) dirty = "*";
         }