Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use the deprecated git-$command interface anymore, instead use "git $command" 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6707 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2009-02-22 23:42:07 +00:00
parent 0d07f77411
commit ab5e599100
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_tools/autorevision/autorevision.cpp
View File

@ -553,7 +553,7 @@ bool RevGitSVNQuery::FindRev(const char* cmd, std::string& str) const
bool RevGitSVNQuery::extractRevision(RevisionInformation& rev_info)
{
string revision;
if (!FindRev("git-svn find-rev HEAD", revision)
if (!FindRev("git svn find-rev HEAD", revision)
|| !removeAfterNewLine(revision))
{
// If we got here it means that the current HEAD of git is no SVN
@ -561,9 +561,9 @@ bool RevGitSVNQuery::extractRevision(RevisionInformation& rev_info)
// SVN revision we originate from.
std::string gitrevision;
// Retrieve the most recently used git revision that's still from SVN
if (!FindRev("git-rev-list --max-count=1 --grep='git-svn-id: ' HEAD", gitrevision)
if (!FindRev("git rev-list --max-count=1 --grep='git-svn-id: ' HEAD", gitrevision)
// Match it up with a subversion revision number
|| !FindRev(("git-svn find-rev " + gitrevision).c_str(), revision))
|| !FindRev(("git svn find-rev " + gitrevision).c_str(), revision))
return RevisionExtractor::extractRevision(rev_info);
removeAfterNewLine(revision);
@ -577,7 +577,7 @@ bool RevGitSVNQuery::extractRevision(RevisionInformation& rev_info)
{
// This command will return without success if the working copy is
// changed, wether checked into index or not.
rev_info.wc_modified = system("git-diff --quiet HEAD");
rev_info.wc_modified = system("git diff --quiet HEAD");
}
}