diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2012-03-18 20:59:36 +0000 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2012-03-18 20:59:36 +0000 |
| commit | 2b9fab8d30420d935745c4d84ea22412ab2485e5 (patch) | |
| tree | 664ebc3d061fd7e89393af67bfbc406f3b600be0 /ui-plain.c | |
| parent | Merge branch 'stable' (diff) | |
| parent | Do not provide a default value for `module-link` (diff) | |
| download | cgit-2b9fab8d30420d935745c4d84ea22412ab2485e5.tar.gz cgit-2b9fab8d30420d935745c4d84ea22412ab2485e5.tar.bz2 cgit-2b9fab8d30420d935745c4d84ea22412ab2485e5.zip | |
Merge branch 'lh/module-links'
Diffstat (limited to '')
| -rw-r--r-- | ui-plain.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -97,11 +97,14 @@ static void print_dir_entry(const unsigned char *sha1, const char *base, char *fullpath; fullpath = buildpath(base, baselen, path); - if (!S_ISDIR(mode)) + if (!S_ISDIR(mode) && !S_ISGITLINK(mode)) fullpath[strlen(fullpath) - 1] = 0; html(" <li>"); - cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, - fullpath); + if (S_ISGITLINK(mode)) { + cgit_submodule_link(NULL, fullpath, sha1_to_hex(sha1)); + } else + cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, + fullpath); html("</li>\n"); match = 2; } |