From 734cd5726cf0f16fcbdc2fc121df23814513c420 Mon Sep 17 00:00:00 2001 From: John Tapsell Date: Thu, 19 Feb 2009 07:36:35 +0000 Subject: [PATCH] Improve error message for git-filter-branch Tell the user that a backup (original) already exists, and how to solve this problem (with -f option) Signed-off-by: John Tapsell Signed-off-by: Junio C Hamano --- git-filter-branch.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 9a09ba1382..20f6f51750 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -232,7 +232,9 @@ while read sha1 type name do case "$force,$name" in ,$orig_namespace*) - die "Namespace $orig_namespace not empty" + die "Cannot create a new backup. +A previous backup already exists in $orig_namespace +Force overwriting the backup with -f" ;; t,$orig_namespace*) git update-ref -d "$name" $sha1 -- 2.11.4.GIT