From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jul 2008 09:09:38 +0000 (-0700)
Subject: Merge branch 'qq/maint'
X-Git-Tag: v1.6.0-rc0~125
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8c992d16cb8f964e42a733dbc60f0e3f0b47270e?ds=inline;hp=-c

Merge branch 'qq/maint'

* qq/maint:
mailinfo: feed the correct line length to decode_transfer_encoding()
git-clone: remove leftover debugging fprintf().
---

8c992d16cb8f964e42a733dbc60f0e3f0b47270e
diff --combined builtin-clone.c
index 643c7d4169,7bcc664e44..4a0f1ab8ac
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@@ -18,7 -18,6 +18,7 @@@
  #include "transport.h"
  #include "strbuf.h"
  #include "dir.h"
 +#include "pack-refs.h"
  
  /*
   * Overall FIXMEs:
@@@ -322,11 -321,8 +322,11 @@@ static struct ref *write_remote_refs(co
  	get_fetch_map(refs, tag_refspec, &tail, 0);
  
  	for (r = local_refs; r; r = r->next)
 -		update_ref(reflog,
 -			   r->peer_ref->name, r->old_sha1, NULL, 0, DIE_ON_ERR);
 +		add_extra_ref(r->peer_ref->name, r->old_sha1, 0);
 +
 +	pack_refs(PACK_REFS_ALL);
 +	clear_extra_refs();
 +
  	return local_refs;
  }
  
@@@ -421,7 -417,6 +421,6 @@@ int cmd_clone(int argc, const char **ar
  		die("could not create leading directories of '%s'", git_dir);
  	set_git_dir(make_absolute_path(git_dir));
  
- 	fprintf(stderr, "Initialize %s\n", git_dir);
  	init_db(option_template, option_quiet ? INIT_DB_QUIET : 0);
  
  	/*