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>
This commit is contained in:
parent
50dffd4ed5
commit
734cd5726c
@ -232,7 +232,9 @@ while read sha1 type name
|
|||||||
do
|
do
|
||||||
case "$force,$name" in
|
case "$force,$name" in
|
||||||
,$orig_namespace*)
|
,$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*)
|
t,$orig_namespace*)
|
||||||
git update-ref -d "$name" $sha1
|
git update-ref -d "$name" $sha1
|
||||||
|
Loading…
Reference in New Issue
Block a user