Skip to contentSkip to conversation

Improve error message for git-filter-branch

PATCH In review John Tapsell 3 participants 5 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 4/6 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)

---
 git-filter-branch.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
git-filter-branch.sh +2 -1
index 27b57b8..1ca45e2 100755
@@ -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
Signature · 1 line
1.6.2.rc1.3.g7d31b.dirty
#1 lore raw

2009/2/19 John Tapsell <[email protected]>:

Quoted 2 lines

Tell the user that a backup (original) already exists, and how to solve this problem (with -f option)

"Oh, and also all are:

Quoted 23 lines
---
 git-filter-branch.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
git-filter-branch.sh +2 -2
index 27b57b8..1ca45e2 100755
@@ -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

#2 lore raw

Hi,

Quoted 7 lines · John Tapsell

2009/2/19 John Tapsell <[email protected]>:

Quoted 2 lines

Tell the user that a backup (original) already exists, and how to solve this problem (with -f option)

"Oh, and also all are:

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:

Quoted 29 lines
Quoted 20 lines
---
 git-filter-branch.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
git-filter-branch.sh +2 -2
index 27b57b8..1ca45e2 100755
@@ -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
--
Quoted 4 lines

1.6.2.rc1.3.g7d31b.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 1 line · Johannes Schindelin

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.

Quoted 2 lines

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 ;).

Signature · 3 lines
Cheers,

Sverre Rabbelier
#4 lore raw
In reply to John Tapsell

Heya,

Quoted 2 lines · John Tapsell

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/ ?

Signature · 3 lines
Cheers,

Sverre Rabbelier