From 8ecd7a0d8813f2f10fd1aa5ff5f257797f79ced1 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 13 Mar 2019 17:38:03 -0700 Subject: [PATCH] filter-repo: fix bug in checking for uncommitted but staged changes Signed-off-by: Elijah Newren --- git-filter-repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-repo b/git-filter-repo index fbe9a6f..1bee75b 100755 --- a/git-filter-repo +++ b/git-filter-repo @@ -2749,7 +2749,7 @@ class RepoFilter(object): # Do extra checks in non-bare repos if not is_bare: # Avoid uncommitted, unstaged, or untracked changes - if subprocess.call('git diff --staged'.split()): + if subprocess.call('git diff --staged --quiet'.split()): abort("you have uncommitted changes") if subprocess.call('git diff --quiet'.split()): abort("you have unstaged changes")