From 8f31cf63bd41dcfa28a68aa7eee8de1f592857f6 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Tue, 29 Sep 2009 20:39:43 +0400
Subject: [PATCH] [8564] Not allow use -l -s options unsupported combination in
 git_id call.

---
 contrib/git_id/git_id.cpp | 7 +++++++
 src/shared/revision_nr.h  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/git_id/git_id.cpp b/contrib/git_id/git_id.cpp
index 14bdf9165..332202c7c 100644
--- a/contrib/git_id/git_id.cpp
+++ b/contrib/git_id/git_id.cpp
@@ -875,6 +875,13 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (local && do_sql)
+    {
+        printf("Options -l/--local and -s/--sql can't be used in same time currently.\n");
+        printf("FAILED\n");
+        return 1;
+    }
+
     DO( find_path()                     );
     if(!local)
     {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2300a49dd..6679f88e5 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8563"
+ #define REVISION_NR "8564"
 #endif // __REVISION_NR_H__