Merge branch 'jo/init'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2007 04:48:08 +0000 (21:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2007 04:48:08 +0000 (21:48 -0700)
* jo/init:
Quiet the output from git-init when cloning, if requested.
Add an option to quiet git-init.

1  2 
git-clone.sh
diff --combined git-clone.sh
index 4cbf60f554cee4560559cc3aa4e7d6fbb90e68ed,dacaaa678fd5bd10f4a290fe496604b2c3c91dfc..262508683df5383d3758d239185fc2b71b525a83
@@@ -72,17 -72,6 +72,17 @@@ Perhaps git-update-server-info needs t
        rm -fr "$clone_tmp"
        http_fetch "$1/HEAD" "$GIT_DIR/REMOTE_HEAD" ||
        rm -f "$GIT_DIR/REMOTE_HEAD"
 +      if test -f "$GIT_DIR/REMOTE_HEAD"; then
 +              head_sha1=`cat "$GIT_DIR/REMOTE_HEAD"`
 +              case "$head_sha1" in
 +              'ref: refs/'*)
 +                      ;;
 +              *)
 +                      git-http-fetch $v -a "$head_sha1" "$1" ||
 +                      rm -f "$GIT_DIR/REMOTE_HEAD"
 +                      ;;
 +              esac
 +      fi
  }
  
  quiet=
@@@ -195,7 -184,7 +195,7 @@@ yes
        GIT_DIR="$D" ;;
  *)
        GIT_DIR="$D/.git" ;;
- esac && export GIT_DIR && git-init ${template+"$template"} || usage
+ esac && export GIT_DIR && git-init $quiet ${template+"$template"} || usage
  
  if test -n "$reference"
  then