Don't exit from a function, return

This commit is contained in:
Nathan Broadbent
2012-01-06 16:06:36 +08:00
parent 8d1566c688
commit a78577d613

View File

@@ -72,7 +72,7 @@ git_exclude_basename() {
git_bisect_grep() { git_bisect_grep() {
if [ -z "$2" ]; then if [ -z "$2" ]; then
echo "Usage: $0 <good_revision> <string>"; echo "Usage: $0 <good_revision> <string>";
exit 1 return
fi fi
if [ -n "$3" ]; then search_path="$3"; else search_path="."; fi if [ -n "$3" ]; then search_path="$3"; else search_path="."; fi
git bisect start git bisect start
@@ -89,7 +89,7 @@ git_bisect_grep() {
git_submodule_rm() { git_submodule_rm() {
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Usage: $0 path/to/submodule (no trailing slash)" echo "Usage: $0 path/to/submodule (no trailing slash)"
exit 1 return
fi fi
git config -f .git/config --remove-section "submodule.$1" git config -f .git/config --remove-section "submodule.$1"
git config -f .gitmodules --remove-section "submodule.$1" git config -f .gitmodules --remove-section "submodule.$1"
@@ -104,7 +104,7 @@ git_submodule_rm() {
git_swap_remotes() { git_swap_remotes() {
if [ -z "$2" ]; then if [ -z "$2" ]; then
echo "Usage: $0 remote1 remote2" echo "Usage: $0 remote1 remote2"
exit 1 return
fi fi
git remote rename "$1" "$1_temp" git remote rename "$1" "$1_temp"
git remote rename "$2" "$1" git remote rename "$2" "$1"