author | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700) |
* 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
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
1 | 2 | |||
---|---|---|---|---|
bisect.c | patch | | diff1 | | diff2 | | blob | history |
builtin/checkout.c | patch | | diff1 | | diff2 | | blob | history |
bundle.c | patch | | diff1 | | diff2 | | blob | history |
commit.c | patch | | diff1 | | diff2 | | blob | history |
commit.h | patch | | diff1 | | diff2 | | blob | history |
revision.c | patch | | diff1 | | diff2 | | blob | history |
revision.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc bisect.c
Simple merge
diff --cc builtin/checkout.c
Simple merge
diff --cc bundle.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge
diff --cc revision.c
index 66a882029f194cf8c99704df2ca61597a2817eee,6d329b46dc16828b78c975bc1619d8aa0fcc5b48..8764dde381111cfc9c8ea7eb3856223de9786ec9
--- 1/revision.c
--- 2/revision.c
+++ b/revision.c
static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
{
struct all_refs_cb *cb = cb_data;
- add_pending_object(cb->all_revs, object, path);
+ 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_sha1(cb->all_revs, path, sha1, cb->all_flags);
return 0;
}
diff --cc revision.h
Simple merge