diff --git a/lfs/setup.go b/lfs/setup.go
index a745fa3b..5e443a7d 100644
--- a/lfs/setup.go
+++ b/lfs/setup.go
@@ -21,8 +21,8 @@ var (
 	filters = &Attribute{
 		Section: "filter.lfs",
 		Properties: map[string]string{
-			"clean":    "git-lfs clean %f",
-			"smudge":   "git-lfs smudge %f",
+			"clean":    "git-lfs clean -- %f",
+			"smudge":   "git-lfs smudge -- %f",
 			"required": "true",
 		},
 	}
@@ -30,8 +30,8 @@ var (
 	passFilters = &Attribute{
 		Section: "filter.lfs",
 		Properties: map[string]string{
-			"clean":    "git-lfs clean %f",
-			"smudge":   "git-lfs smudge --skip %f",
+			"clean":    "git-lfs clean -- %f",
+			"smudge":   "git-lfs smudge --skip -- %f",
 			"required": "true",
 		},
 	}
diff --git a/test/test-env.sh b/test/test-env.sh
index 8ba83a26..38de4327 100755
--- a/test/test-env.sh
+++ b/test/test-env.sh
@@ -2,8 +2,8 @@
 
 . "test/testlib.sh"
 
-envInitConfig='git config filter.lfs.smudge = "git-lfs smudge %f"
-git config filter.lfs.clean = "git-lfs clean %f"'
+envInitConfig='git config filter.lfs.smudge = "git-lfs smudge -- %f"
+git config filter.lfs.clean = "git-lfs clean -- %f"'
 
 begin_test "env with no remote"
 (
diff --git a/test/test-install.sh b/test/test-install.sh
index 0f744f4b..4e58dac3 100755
--- a/test/test-install.sh
+++ b/test/test-install.sh
@@ -41,8 +41,8 @@ begin_test "install with old settings"
   [ "git lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
 
   git lfs install --force
-  [ "git-lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
-  [ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config --global filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config --global filter.lfs.clean)" ]
 )
 end_test
 
@@ -130,16 +130,16 @@ begin_test "install --skip-smudge"
   set -e
 
   git lfs install
-  [ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
-  [ "git-lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config --global filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config --global filter.lfs.smudge)" ]
 
   git lfs install --skip-smudge
-  [ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
-  [ "git-lfs smudge --skip %f" = "$(git config --global filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config --global filter.lfs.clean)" ]
+  [ "git-lfs smudge --skip -- %f" = "$(git config --global filter.lfs.smudge)" ]
 
   git lfs install --force
-  [ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
-  [ "git-lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config --global filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config --global filter.lfs.smudge)" ]
 )
 end_test
 
@@ -156,8 +156,8 @@ begin_test "install --local"
   git init
   git lfs install --local
 
-  [ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
-  [ "git-lfs clean %f" = "$(git config --local filter.lfs.clean)" ]
+  [ "git-lfs clean -- %f" = "$(git config filter.lfs.clean)" ]
+  [ "git-lfs clean -- %f" = "$(git config --local filter.lfs.clean)" ]
   [ "git lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
 )
 end_test
diff --git a/test/test-uninstall.sh b/test/test-uninstall.sh
index 8adb909d..7e91b177 100755
--- a/test/test-uninstall.sh
+++ b/test/test-uninstall.sh
@@ -39,8 +39,8 @@ begin_test "uninstall inside repository with default pre-push hook"
   [ -f .git/hooks/pre-push ]
   grep "git-lfs" .git/hooks/pre-push
 
-  [ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
-  [ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config filter.lfs.clean)" ]
 
   git lfs uninstall
 
@@ -68,8 +68,8 @@ begin_test "uninstall inside repository without git lfs pre-push hook"
   [ -f .git/hooks/pre-push ]
   [ "something something git-lfs" = "$(cat .git/hooks/pre-push)" ]
 
-  [ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
-  [ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config filter.lfs.clean)" ]
 
   git lfs uninstall
 
@@ -92,8 +92,8 @@ begin_test "uninstall hooks inside repository"
   [ -f .git/hooks/pre-push ]
   grep "git-lfs" .git/hooks/pre-push
 
-  [ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
-  [ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config filter.lfs.clean)" ]
 
   git lfs uninstall hooks
 
@@ -102,7 +102,7 @@ begin_test "uninstall hooks inside repository"
     exit 1
   }
 
-  [ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
-  [ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
+  [ "git-lfs smudge -- %f" = "$(git config filter.lfs.smudge)" ]
+  [ "git-lfs clean -- %f" = "$(git config filter.lfs.clean)" ]
 )
 end_test
diff --git a/test/test-worktree.sh b/test/test-worktree.sh
index 7f2580a7..3022ab7d 100755
--- a/test/test-worktree.sh
+++ b/test/test-worktree.sh
@@ -3,8 +3,8 @@
 . "test/testlib.sh"
 
 ensure_git_version_isnt $VERSION_LOWER "2.5.0"
-envInitConfig='git config filter.lfs.smudge = "git-lfs smudge %f"
-git config filter.lfs.clean = "git-lfs clean %f"'
+envInitConfig='git config filter.lfs.smudge = "git-lfs smudge -- %f"
+git config filter.lfs.clean = "git-lfs clean -- %f"'
 
 begin_test "git worktree"
 (