aboutsummaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-11 23:56:09 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-11 23:56:09 -0700
commit4cdda2b895dfb6ba084e3952cbf4274a6a2e0338 (patch)
treed924f60957a287ea138ce59580c05e71e3f9c2f1 /git-submodule.sh
parent243a60fbb5e185e2bf3c4bb1c53128b4d04d5879 (diff)
parenteed81838f0d0e031702473e1d427d71055134edd (diff)
downloadgit-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.xz
Merge branch 'maint'
* maint: bisect: fix bad rev checking in "git bisect good" revision.c: make --date-order overriddable git-submodule: Avoid 'fatal: cannot describe' message Force the medium pretty format on calls to git log Fix section about backdating tags in the git-tag docs Document option --only of git commit Documentation/git-request-pull: Fixed a typo ("send" -> "end")
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 56ec3536e0..7674346c8d 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -327,7 +327,7 @@ set_name_rev () {
cd "$1" && {
git describe "$2" 2>/dev/null ||
git describe --tags "$2" 2>/dev/null ||
- git describe --contains --tags "$2"
+ git describe --contains --tags --always "$2"
}
) )
test -z "$revname" || revname=" ($revname)"