Merge pull request #792 from skidoosh/v3.0/master

csanders-git · web-flow · commit 4a056fe0016c · 2017-06-12T21:48:07.000-04:00
Fix for issue #789
diff --git a/rules/REQUEST-901-INITIALIZATION.conf b/rules/REQUEST-901-INITIALIZATION.conf
@@ -27,7 +27,6 @@
 #
 SecComponentSignature "OWASP_CRS/3.0.2"
 
-
 #
 # -=[ Default setup values ]=-
 #
diff --git a/util/upgrade.py b/util/upgrade.py
@@ -33,9 +33,9 @@ def upgrade_crs(crs_directory, quiet):
 
     # Do a git 'git pull'
     os.chdir(crs_directory)
-    gitcmd = "git pull origin HEAD --ff-only"
+    gitcmd = "git pull --ff-only origin HEAD"
     try:
-        git_output = check_output(gitcmd, stderr=STDOUT, shell=True)        
+        git_output = check_output(gitcmd, stderr=STDOUT, shell=True)
         returncode = 0
     except CalledProcessError as ex:
         git_output = ex.output

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`#`
`28`	`28`	`SecComponentSignature "OWASP_CRS/3.0.2"`
`29`	`29`
`30`		`-`
`31`	`30`	`#`
`32`	`31`	`# -=[ Default setup values ]=-`
`33`	`32`	`#`