projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ded8bec
)
Update genversion to work with single-binary git
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 3 Sep 2008 13:46:24 +0000
(15:46 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 3 Sep 2008 13:46:43 +0000
(15:46 +0200)
src/common/genversion.cpp
patch
|
blob
|
history
diff --git
a/src/common/genversion.cpp
b/src/common/genversion.cpp
index
02a7a5e
..
cf64461
100644
(file)
--- 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);
// 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;
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 = "*";
}
if(git.waitForFinished(10000)) {
if(!git.readAllStandardOutput().isEmpty()) dirty = "*";
}