diff options
| author | John Tapsell <johnflux@gmail.com> | 2009-02-19 07:36:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-04 00:56:52 -0800 |
| commit | 734cd5726cf0f16fcbdc2fc121df23814513c420 (patch) | |
| tree | 6d8a3059303606ce31397193f5bebadf568ba6bc /git-filter-branch.sh | |
| parent | 50dffd4ed577ea50b540bad53950ef2b703b5be8 (diff) | |
| download | git-734cd5726cf0f16fcbdc2fc121df23814513c420.tar.gz | |
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>
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |