Merge branch 'master' into next

* master:
  unpack-objects: remove stale and confusing comment
  git-fetch: fix --keep vs --thin
This commit is contained in:
Junio C Hamano
2006-07-17 15:11:24 -07:00
2 changed files with 2 additions and 6 deletions

View File

@@ -20,6 +20,7 @@ verbose=
update_head_ok=
exec=
upload_pack=
keep=--thin
while case "$#" in 0) break ;; esac
do
case "$1" in
@@ -354,7 +355,7 @@ fetch_main () {
( : subshell because we muck with IFS
IFS=" $LF"
(
git-fetch-pack $exec $keep --thin "$remote" $rref || echo failed "$remote"
git-fetch-pack $exec $keep "$remote" $rref || echo failed "$remote"
) |
while read sha1 remote_name
do

View File

@@ -241,11 +241,6 @@ static void unpack_one(unsigned nr, unsigned total)
}
}
/*
* We unpack from the end, older files first. Now, usually
* there are deltas etc, so we'll not actually write the
* objects in that order, but we might as well try..
*/
static void unpack_all(void)
{
int i;