git: fix get_root_git_dir for recursive search

468fac7b · Vitaly Lipatov · 03a7cfd5 · 468fac7b · 468fac7b
Commit 468fac7b authored Feb 06, 2010 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

git share/eterbuild/functions/git +6 -4

get_git_root.sh tests/get_git_root.sh +6 -0

No files found.
--- a/share/eterbuild/functions/git
+++ b/share/eterbuild/functions/git
@@ -22,12 +22,14 @@ get_current_branch()

 get_root_git_dir()
 {
-	# FIXME
-	if [ -d ../.git ] ; then
-		readlink -f $(pwd)/..
+	local DIR="$1"
+	[ -n "$DIR" ] || DIR=$(pwd)
+	[ "$DIR" = "/" ] && return 1
+	if [ -d "$DIR/.git" ] ; then
+		readlink -f "$DIR"
 		return
 	fi
-	pwd
+	get_root_git_dir $(dirname "$DIR") || return 1
 }

 get_remote_git_list()

--- a/tests/get_git_root.sh
+++ b/tests/get_git_root.sh
+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+load_mod git
+
+get_root_git_dir