More branch validation.

malengrin · Mar 25, 2014 · 06727d8 · 06727d8
1 parent 54a16d1
commit 06727d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/formats/git.cpp b/src/formats/git.cpp
@@ -32,11 +32,6 @@ std::string GitCommitLog::logCommand() {
     "--reverse --raw --encoding=UTF-8 "
     "--no-renames";
 
-    if(!gGourceSettings.git_branch.empty()) {
-        log_command += " ";
-        log_command += gGourceSettings.git_branch;
-    }
-
     if(!gGourceSettings.start_date.empty()) {
         log_command += " --since ";
         log_command += gGourceSettings.start_date;
@@ -47,6 +42,11 @@ std::string GitCommitLog::logCommand() {
         log_command += gGourceSettings.stop_date;
     }
 
+    if(!gGourceSettings.git_branch.empty()) {
+        log_command += " ";
+        log_command += gGourceSettings.git_branch;
+    }
+
     return log_command;
 }
 

diff --git a/src/gource_settings.cpp b/src/gource_settings.cpp
@@ -628,7 +628,7 @@ void GourceSettings::importGourceSettings(ConfFile& conffile, ConfSection* gourc
 
         if(!entry->hasValue()) conffile.missingValueException(entry);
 
-        Regex branch_regex("^[/\\w.,;_=+{}\\[\\]-]+$");
+        Regex branch_regex("^(?!-)[/\\w.,;_=+{}\\[\\]-]+$");
 
         std::string branch = entry->getString();