diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:22 -0700 |
| commit | 0941d6054524bc91f45bf3cbb1c641712b0e0e6d (patch) | |
| tree | c2ff08811332fe9247ca57f124863d8289ba7844 /revision.h | |
| parent | dd57c76e84372bf16c6bdba9a1bd49da3e617339 (diff) | |
| parent | 86a0a408b900eecc9d0d4a1eb8ae223181e96679 (diff) | |
| download | git-0941d6054524bc91f45bf3cbb1c641712b0e0e6d.tar.gz | |
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
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 754f31b1cd..6aa53d1aa7 100644 --- a/revision.h +++ b/revision.h @@ -118,6 +118,7 @@ struct rev_info { date_mode_explicit:1, preserve_subject:1; unsigned int disable_stdin:1; + unsigned int leak_pending:1; enum date_mode date_mode; @@ -214,6 +215,7 @@ extern void add_object(struct object *obj, const char *name); extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name); +extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags); extern void add_head_to_pending(struct rev_info *); |