diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:29 -0800 |
| commit | 6fe12b5215f4ca597accc97ac5dce0f88e8483e9 (patch) | |
| tree | 8d917549f1b1eb3d1a3f1bc941d884db7cf9aaa3 /t/test-lib-functions.sh | |
| parent | The tenth batch (diff) | |
| parent | docs/rev-list: add some examples of --disk-usage (diff) | |
| download | git-6fe12b5215f4ca597accc97ac5dce0f88e8483e9.tar.gz git-6fe12b5215f4ca597accc97ac5dce0f88e8483e9.zip | |
Merge branch 'jk/rev-list-disk-usage'
"git rev-list" command learned "--disk-usage" option.
* jk/rev-list-disk-usage:
docs/rev-list: add some examples of --disk-usage
docs/rev-list: add an examples section
rev-list: add --disk-usage option for calculating disk usage
t: add --no-tag option to test_commit
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index c96a555ace..6348e8d733 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -190,6 +190,7 @@ test_commit () { author= && signoff= && indir= && + no_tag= && while test $# != 0 do case "$1" in @@ -216,6 +217,9 @@ test_commit () { indir="$2" shift ;; + --no-tag) + no_tag=yes + ;; *) break ;; @@ -238,7 +242,10 @@ test_commit () { git ${indir:+ -C "$indir"} commit \ ${author:+ --author "$author"} \ $signoff -m "$1" && - git ${indir:+ -C "$indir"} tag "${4:-$1}" + if test -z "$no_tag" + then + git ${indir:+ -C "$indir"} tag "${4:-$1}" + fi } # Call test_merge with the arguments "<message> <commit>", where <commit> |