diff options
| author | Lars Hjemli | 2009-08-17 10:17:23 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2009-08-17 10:17:23 +0200 |
| commit | cb92d05b6b729cd0e219b43d7a79aff832a9c1ac (patch) | |
| tree | 3324266f779b12bcf9f80ad5ee2f18f535832549 | |
| parent | ui-log.c: handle lightweight tags when printing commit decorations (diff) | |
| parent | cgit.c: do not segfault on unexpected query-string format (diff) | |
| download | cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.gz cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.zip | |
Merge branch 'stable'
| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | ui-tag.c | 5 |
2 files changed, 7 insertions, 1 deletions
| diff --git a/cgit.c b/cgit.c index 66dd140..5816f3d 100644 --- a/cgit.c +++ b/cgit.c | |||
| @@ -177,6 +177,9 @@ void config_cb(const char *name, const char *value) | |||
| 177 | 177 | ||
| 178 | static void querystring_cb(const char *name, const char *value) | 178 | static void querystring_cb(const char *name, const char *value) |
| 179 | { | 179 | { |
| 180 | if (!value) | ||
| 181 | value = ""; | ||
| 182 | |||
| 180 | if (!strcmp(name,"r")) { | 183 | if (!strcmp(name,"r")) { |
| 181 | ctx.qry.repo = xstrdup(value); | 184 | ctx.qry.repo = xstrdup(value); |
| 182 | ctx.repo = cgit_get_repoinfo(value); | 185 | ctx.repo = cgit_get_repoinfo(value); |
| diff --git a/ui-tag.c b/ui-tag.c index a9c8670..c2d72af 100644 --- a/ui-tag.c +++ b/ui-tag.c | |||
| @@ -37,7 +37,10 @@ void cgit_print_tag(char *revname) | |||
| 37 | struct tag *tag; | 37 | struct tag *tag; |
| 38 | struct taginfo *info; | 38 | struct taginfo *info; |
| 39 | 39 | ||
| 40 | if (get_sha1(revname, sha1)) { | 40 | if (!revname) |
| 41 | revname = ctx.qry.head; | ||
| 42 | |||
| 43 | if (get_sha1(fmt("refs/tags/%s", revname), sha1)) { | ||
| 41 | cgit_print_error(fmt("Bad tag reference: %s", revname)); | 44 | cgit_print_error(fmt("Bad tag reference: %s", revname)); |
| 42 | return; | 45 | return; |
| 43 | } | 46 | } |