From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Oct 2011 02:03:22 +0000 (-0700)
Subject: Merge branch 'rs/pending'
X-Git-Tag: v1.7.8-rc0~80
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0941d6054524bc91f45bf3cbb1c641712b0e0e6d;p=git.git

Merge branch 'rs/pending'

* rs/pending:
  commit: factor out clear_commit_marks_for_object_array
  checkout: use leak_pending flag
  bundle: use leak_pending flag
  bisect: use leak_pending flag
  revision: add leak_pending flag
  checkout: use add_pending_{object,sha1} in orphan check
  revision: factor out add_pending_sha1
  checkout: check for "Previous HEAD" notice in t2020

Conflicts:
	builtin/checkout.c
	revision.c
---

0941d6054524bc91f45bf3cbb1c641712b0e0e6d
diff --cc revision.c
index 66a882029,6d329b46d..8764dde38
--- a/revision.c
+++ b/revision.c
@@@ -894,10 -839,7 +901,10 @@@ struct all_refs_cb 
  static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
  {
  	struct all_refs_cb *cb = cb_data;
 +	struct object *object = get_reference(cb->all_revs, path, sha1,
 +					      cb->all_flags);
 +	add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
- 	add_pending_object(cb->all_revs, object, path);
+ 	add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
  	return 0;
  }