From: Lars Hjemli Date: Mon, 1 Sep 2008 20:40:24 +0000 (+0200) Subject: Merge branch 'lh/clone' X-Git-Tag: v0.8~26 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=288d502b3d8e7fa916104b486bbb146521e5c716;p=cgit Merge branch 'lh/clone' * lh/clone: Add support for cloning over http Conflicts: cmd.c --- 288d502b3d8e7fa916104b486bbb146521e5c716 diff --cc Makefile index 1163b02,78aad10..b002d44 --- a/Makefile +++ b/Makefile @@@ -55,8 -55,8 +55,9 @@@ OBJECTS += configfile. OBJECTS += html.o OBJECTS += parsing.o OBJECTS += shared.o +OBJECTS += ui-atom.o OBJECTS += ui-blob.o + OBJECTS += ui-clone.o OBJECTS += ui-commit.o OBJECTS += ui-diff.o OBJECTS += ui-log.o diff --cc cmd.c index c0e4db3,03e165c..40ac53e --- a/cmd.c +++ b/cmd.c @@@ -10,8 -10,8 +10,9 @@@ #include "cmd.h" #include "cache.h" #include "ui-shared.h" +#include "ui-atom.h" #include "ui-blob.h" + #include "ui-clone.h" #include "ui-commit.h" #include "ui-diff.h" #include "ui-log.h" @@@ -23,11 -23,11 +24,16 @@@ #include "ui-tag.h" #include "ui-tree.h" + static void HEAD_fn(struct cgit_context *ctx) + { + cgit_clone_head(ctx); + } + +static void atom_fn(struct cgit_context *ctx) +{ + cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); +} + static void about_fn(struct cgit_context *ctx) { if (ctx->repo) @@@ -108,7 -118,7 +124,8 @@@ static void tree_fn(struct cgit_contex struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) { static struct cgit_cmd cmds[] = { + def_cmd(HEAD, 1, 0), + def_cmd(atom, 1, 0), def_cmd(about, 0, 1), def_cmd(blob, 1, 0), def_cmd(commit, 1, 1),