Owasp-modsecurity-crs: Running upgrade.py throws unknown option `ff-only'

[skidoosh]

Hi ladies/gents,

If I try to run upgrade.py on a cloned master I get the error:

crs: Git pull failed! Error: error: unknown option `ff-only'

The error is originating from the command ' git pull origin HEAD --ff-only'. Changing the command to ' git pull --ff-only origin HEAD' fixes the error.

I'm on Debian 8.8 with Git 2.1.4

[victorhora]

Hi @skidoosh,

Thanks for spotting this issue. I haven't noticed before when testing this on some of my VMs. It doesn't seem to happen on newer versions of Git:

But I've confirmed that the issue does happen with older versions of Git:

So this should definitely be fixed.

Do you want to submit a pull request with the fix or should I?

[skidoosh]

I'd love to! Never done it before so I'll read up on how to do it and get it in over the weekend.

[victorhora]

As this is already merged and tested I believe we could close this one @dune73 @csanders-git :)