sha1_name.c: fix parsing of ":/token" syntax

diff --git a/git-am.sh b/git-am.sh
index 3c08d53161faa72744ab64a1391d85cf9243f006..9df951a597d6b9ec5f7f390c35a60adb942a3fdc 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -663,10 +663,7 @@ do
                [eE]*) git_editor "$dotest/final-commit"
                       action=again ;;
                [vV]*) action=again
-                      : ${GIT_PAGER=$(git var GIT_PAGER)}
-                      : ${LESS=-FRSX}
-                      export LESS
-                      $GIT_PAGER "$dotest/patch" ;;
+                      git_pager "$dotest/patch" ;;
                *)     action=again ;;
                esac
            done
@@ -776,6 +773,5 @@ do
        go_next
 done
 
-git gc --auto
-
 rm -fr "$dotest"
+git gc --auto