[PATCH 4/6] Improve error message for git-filter-branch

[PATCH 4/6] Improve error message for git-filter-branch

[John Tapsell]

Tell the user that a backup (original) already exists, and how to solve
this problem (with -f option)
---
 git-filter-branch.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 27b57b8..1ca45e2 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -226,7 +226,8 @@ while read sha1 type name
 do
 	case "$force,$name" in
 	,$orig_namespace*)
-		die "Namespace $orig_namespace not empty"
+		die "Cannot backup - a previous backup already exists in $orig_namespace\n" \
+		    "Force overwriting the backup with -f"
 	;;
 	t,$orig_namespace*)
 		git update-ref -d "$name" $sha1
-- 
1.6.2.rc1.3.g7d31b.dirty

Re: [PATCH 4/6] Improve error message for git-filter-branch

[Sverre Rabbelier]

Heya,

On Thu, Feb 19, 2009 at 08:36, John Tapsell <johnflux@gmail.com> wrote:
> Tell the user that a backup (original) already exists, and how to solve
> this problem (with -f option)

Very helpful, I like it :)! Although perhaps s/Cannot backup/Cannot
create a new backup/ ?

-- 
Cheers,

Sverre Rabbelier

Re: [PATCH 4/6] Improve error message for git-filter-branch

[John Tapsell]

2009/2/19 John Tapsell <johnflux@gmail.com>:
> Tell the user that a backup (original) already exists, and how to solve
> this problem (with -f option)


"Oh, and also all are:
Signed-off-by: John Tapsell <johnflux@gmail.com>"

> ---
>  git-filter-branch.sh |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> index 27b57b8..1ca45e2 100755
> --- a/git-filter-branch.sh
> +++ b/git-filter-branch.sh
> @@ -226,7 +226,8 @@ while read sha1 type name
>  do
>        case "$force,$name" in
>        ,$orig_namespace*)
> -               die "Namespace $orig_namespace not empty"
> +               die "Cannot backup - a previous backup already exists in $orig_namespace\n" \
> +                   "Force overwriting the backup with -f"
>        ;;
>        t,$orig_namespace*)
>                git update-ref -d "$name" $sha1
> --
> 1.6.2.rc1.3.g7d31b.dirty
>
>
>

Re: [PATCH 4/6] Improve error message for git-filter-branch

[Johannes Schindelin]

Hi,

On Thu, 19 Feb 2009, John Tapsell wrote:

> 2009/2/19 John Tapsell <johnflux@gmail.com>:
> > Tell the user that a backup (original) already exists, and how to solve
> > this problem (with -f option)
> 
> 
> "Oh, and also all are:
> Signed-off-by: John Tapsell <johnflux@gmail.com>"

Might be nice to resend it so that the maintainer has less work, no?

Also might be nice to cut the complete crap after the only piece of 
information in your mail:

> 
> > ---
> >  git-filter-branch.sh |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> > index 27b57b8..1ca45e2 100755
> > --- a/git-filter-branch.sh
> > +++ b/git-filter-branch.sh
> > @@ -226,7 +226,8 @@ while read sha1 type name
> >  do
> >        case "$force,$name" in
> >        ,$orig_namespace*)
> > -               die "Namespace $orig_namespace not empty"
> > +               die "Cannot backup - a previous backup already exists in $orig_namespace\n" \
> > +                   "Force overwriting the backup with -f"
> >        ;;
> >        t,$orig_namespace*)
> >                git update-ref -d "$name" $sha1
> > --
> > 1.6.2.rc1.3.g7d31b.dirty
> >
> >
> >
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 4/6] Improve error message for git-filter-branch

[Sverre Rabbelier]

On Thu, Feb 19, 2009 at 16:03, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Might be nice to resend it so that the maintainer has less work, no?

Junio said it was ok to ask him to forge and fixup if desired in the
other thread.

> Also might be nice to cut the complete crap after the only piece of
> information in your mail:

Somehow you failed to do so yourself ;).


-- 
Cheers,

Sverre Rabbelier