hints

Author: MarcWeber

tg-export.sh

@@ -425,6 +425,10 @@ rebase()
 		commit="$(git rev-parse --verify "refs/heads/$_dep^0" --)"
 
 	else
+
+                die_hint="Try checking out your starting branch and rerun"
+                subshell_hint="starting subshell. exit 1 to abort"
+
 		# First time hitting this dep; the common case
 
 		test -d "$playground/${_dep%/*}" || mkdir -p "$playground/${_dep%/*}"
@@ -459,7 +463,7 @@ rebase()
                     echo "adding dep $n"
                     target_deps=("${target_deps[@]}" "$n")
                   else
-                    die "$_dep has bad .topdep line $dep which has no target branch yet !? BUG"
+                    die "$_dep has bad .topdep line $dep which has no target branch yet !? BUG  $die_hint"
                   fi
                 done <<-EOF
                 $(git show $_dep:.topdeps)
@@ -468,16 +472,17 @@ EOF
 
                 git show "$_dep":.topmsg > $playground/.topmsg
                 echo "creating topgit branch $new_branch_name with deps ${target_deps[@]}"
-                git checkout "${target_deps[0]}" || die 'checking out failed'
-                tg create --topmsg-file $playground/.topmsg -m  "new tg branch $new_branch_name" "${new_branch_name}" "${target_deps[@]}" || {
-                  echo 'tg create failed';
+                git checkout "${target_deps[0]}" || die "checking out failed $die_hint"
+                set -x
+                $tgbin create --topmsg-file $playground/.topmsg -m  "new tg branch $new_branch_name" "${new_branch_name}" "${target_deps[@]}" || {
+                  echo "tg create failed $subshell_hint";
                   "${SHELL:-@SHELL_PATH@}" -i </dev/tty || { echo "user abort"; return ; }
                 }
                 # git add .topmsg .topdeps
                 # git commit -m "$new_branch_name dotfiles"
 
                 git cherry-pick $commit || {
-                  echo "cherry-picking the commit failed, please fix and commit and exit shell. use status !=0 to abort rebase"
+                  echo "cherry-picking the commit failed, please fix and commit and exit shell. $subshell_hint"
                   "${SHELL:-@SHELL_PATH@}" -i </dev/tty || { echo "user abort"; return ; }
                 }