diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:07 -0800 |
| commit | 490b8ad76fec278be532b893d2b5b6df9a621bec (patch) | |
| tree | f893f31a2b4d11f86d51ec9ada900096b3d1ad0e | |
| parent | 39914cb50693e6fbc3002bbc30366e25fe6beca2 (diff) | |
| parent | 3deea89c5feb0dfdfb99ea752f83497d97a3bdd5 (diff) | |
| download | git-490b8ad76fec278be532b893d2b5b6df9a621bec.tar.gz git-490b8ad76fec278be532b893d2b5b6df9a621bec.tar.xz | |
Merge branch 'jh/maint-submodule-status-in-void'
* jh/maint-submodule-status-in-void:
submodule summary: Don't barf when invoked in an empty repo
| -rwxr-xr-x | git-submodule.sh | 7 | ||||
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 664f21721..5869c00f2 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -553,12 +553,15 @@ cmd_summary() { test $summary_limit = 0 && return - if rev=$(git rev-parse -q --verify "$1^0") + if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"}) then head=$rev shift + elif test -z "$1" -o "$1" = "HEAD" + then + return else - head=HEAD + head="HEAD" fi if [ -n "$files" ] diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index d3c039f72..cee319da0 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -227,4 +227,11 @@ test_expect_success 'fail when using --files together with --cached' " test_must_fail git submodule summary --files --cached " +test_expect_success 'should not fail in an empty repo' " + git init xyzzy && + cd xyzzy && + git submodule summary >output 2>&1 && + test_cmp output /dev/null +" + test_done |