aboutsummaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-08-19 19:43:50 +0700
committerJunio C Hamano <gitster@pobox.com>2011-08-19 11:12:10 -0700
commit5267d292ecbdc91018db05275ec6057d2c4cfa18 (patch)
treed54fe05f3801bd5ba65251eea32491fe702ecb8e /log-tree.c
parent76f5df305beddb864b3d1d12800d0de442d05596 (diff)
downloadgit-5267d292ecbdc91018db05275ec6057d2c4cfa18.tar.gz
git-5267d292ecbdc91018db05275ec6057d2c4cfa18.tar.xz
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>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 56052441e..74fc20da4 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;