From: John Tapsell <johnflux@gmail.com>
Date: Thu, 19 Feb 2009 07:36:35 +0000 (+0000)
Subject: Improve error message for git-filter-branch
X-Git-Tag: v1.6.3-rc0~224
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=734cd5726cf0f16fcbdc2fc121df23814513c420;p=git.git

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 <johnflux@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 9a09ba138..20f6f5175 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