Merge branch 'maint'

* maint:
  git clean: Add test to verify directories aren't removed with a prefix
  git clean: Don't automatically remove directories when run within subdirectory
  git-submodule - possibly use branch name to describe a module

1 files changed, 2 insertions, 1 deletions

diff --git a/git-submodule.sh b/git-submodule.sh
index 7674346c8d..a745e42bf7 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -327,7 +327,8 @@ set_name_rev () {
 		cd "$1" && {
 			git describe "$2" 2>/dev/null ||
 			git describe --tags "$2" 2>/dev/null ||
-			git describe --contains --tags --always "$2"
+			git describe --contains "$2" 2>/dev/null ||
+			git describe --all --always "$2"
 		}
 	) )
 	test -z "$revname" || revname=" ($revname)"