diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-08-19 19:43:50 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-19 11:12:10 -0700 |
| commit | 5267d292ecbdc91018db05275ec6057d2c4cfa18 (patch) | |
| tree | d54fe05f3801bd5ba65251eea32491fe702ecb8e | |
| parent | 76f5df305beddb864b3d1d12800d0de442d05596 (diff) | |
| download | git-5267d292ecbdc91018db05275ec6057d2c4cfa18.tar.gz | |
log: decorate "replaced" on to replaced commits
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | log-tree.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 56052441e2..74fc20da4d 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) + add_name_decoration(DECORATION_GRAFTED, "replaced", obj); + return 0; + } + + obj = parse_object(sha1); if (!obj) return 0; |