[PATCH 5/5] log: decorate "replaced" on to replaced commits
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Aug 18, 2011, 12:29 UTC
- Message-ID
- <1313670578-2939-6-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1313670578-2939-1-git-send-email-pclouds@gmail.com>
Old code also decorates "new" commits with "refs/replace/SHA1". This is now gone, but I guess no one will miss it.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- log-tree.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/log-tree.c b/log-tree.c index 5605244..b982b9f 100644 --- a/log-tree.c +++ b/log-tree.c @@ -92,8 +92,22 @@ static void add_name_decoration(enum decoration_type type, const char *name, str static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { - struct object *obj = parse_object(sha1); + struct object *obj; enum decoration_type type = DECORATION_NONE; + + if (!prefixcmp(refname, "refs/replace/")) { + unsigned char original_sha1[20]; + if (get_sha1_hex(refname + 13, original_sha1)) { + warning("invalid replace ref %s", refname); + return 0; + } + obj = parse_object(original_sha1); + if (obj && (obj->type == OBJ_COMMIT || obj->type == OBJ_TAG)) + add_name_decoration(DECORATION_GRAFTED, "replaced", obj); + return 0; + } + + obj = parse_object(sha1); if (!obj) return 0;
-- 1.7.4.74.g639db