From: Junio C Hamano <junkio@cox.net>
Date: Thu, 28 Dec 2006 09:25:43 +0000 (-0800)
Subject: Merge branch 'js/shallow'
X-Git-Tag: v1.5.0-rc1~172
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b11bd57a384a7bee21245d3895d77d20c33e4d78;p=git.git

Merge branch 'js/shallow'

* js/shallow:
  fetch-pack: Do not fetch tags for shallow clones.
  get_shallow_commits: Avoid memory leak if a commit has been reached already.
  git-fetch: Reset shallow_depth before auto-following tags.
  upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
  fetch-pack: Properly remove the shallow file when it becomes empty.
  shallow clone: unparse and reparse an unshallowed commit
  Why didn't we mark want_obj as ~UNINTERESTING in the old code?
  Why does it mean we do not have to register shallow if we have one?
  We should make sure that the protocol is still extensible.
  add tests for shallow stuff
  Shallow clone: do not ignore shallowness when following tags
  allow deepening of a shallow repository
  allow cloning a repository "shallowly"
  support fetching into a shallow repository
  upload-pack: no longer call rev-list
---

b11bd57a384a7bee21245d3895d77d20c33e4d78
diff --cc git-fetch.sh
index 7fb47f69f,5f316053f..8bd11f8b6
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@@ -60,6 -60,16 +61,13 @@@ d
  	-k|--k|--ke|--kee|--keep)
  		keep='-k -k'
  		;;
 -	--reflog-action=*)
 -		rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 -		;;
+ 	--depth=*)
+ 		shallow_depth="--depth=`expr "z$1" : 'z-[^=]*=\(.*\)'`"
+ 		;;
+ 	--depth)
+ 		shift
+ 		shallow_depth="--depth=$1"
+ 		;;
  	-*)
  		usage
  		;;