diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:35 -0700 |
| commit | ff968f03e6951e8ee84cfb923f8905296286134a (patch) | |
| tree | fc0bdcd4cc3562610de64b6c43661cd38e9fb09c /git-sh-setup.sh | |
| parent | 5f2e448370e7c436b9ad7e7c495f4c96630f3e3c (diff) | |
| parent | 877449c136539cf8b9b4ed9cfe33a796b7b93f93 (diff) | |
| download | git-ff968f03e6951e8ee84cfb923f8905296286134a.tar.xz | |
Merge branch 'fg/submodule-keep-updating'
* fg/submodule-keep-updating:
git-submodule.sh: clarify the "should we die now" logic
submodule update: continue when a checkout fails
git-sh-setup: add die_with_status
Conflicts:
git-submodule.sh
Diffstat (limited to 'git-sh-setup.sh')
| -rw-r--r-- | git-sh-setup.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 94e26ed5e8..8e427dab31 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -39,9 +39,15 @@ git_broken_path_fix () { # @@BROKEN_PATH_FIX@@ -die() { - echo >&2 "$@" - exit 1 +die () { + die_with_status 1 "$@" +} + +die_with_status () { + status=$1 + shift + echo >&2 "$*" + exit "$status" } GIT_QUIET= |