From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 6 Dec 2008 10:37:37 +0000 (+0100)
Subject: Merge branch 'full-log'
X-Git-Tag: v0.8.2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c32fe07717f27fc891b66ccd06057fb810d03ad;p=cgit

Merge branch 'full-log'

Conflicts:
	cgit.c
	cgit.h
---

3c32fe07717f27fc891b66ccd06057fb810d03ad
diff --cc cgit.c
index e09c86e,db5d342..166fbc6
--- a/cgit.c
+++ b/cgit.c
@@@ -154,8 -154,8 +154,10 @@@ static void querystring_cb(const char *
  		ctx.qry.name = xstrdup(value);
  	} else if (!strcmp(name, "mimetype")) {
  		ctx.qry.mimetype = xstrdup(value);
 +	} else if (!strcmp(name, "s")){
 +		ctx.qry.sort = xstrdup(value);
+ 	} else if (!strcmp(name, "showmsg")) {
+ 		ctx.qry.showmsg = atoi(value);
  	}
  }
  
diff --cc cgit.h
index f1fbeca,aab898b..cb2f176
--- a/cgit.h
+++ b/cgit.h
@@@ -122,7 -121,7 +122,8 @@@ struct cgit_query 
  	char *url;
  	int   ofs;
  	int nohead;
 +	char *sort;
+ 	int showmsg;
  };
  
  struct cgit_config {