Merge branch 'stable'

5 files changed, 46 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 2107610..2e51c31 100644
--- a/Makefile
+++ b/Makefile
@@ -9,2 +9,22 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
+# Define NO_STRCASESTR if you don't have strcasestr.
+#
+# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
+#
+
+#-include config.mak
+
+#
+# Platform specific tweaks
+#
+
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
+uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
+
+ifeq ($(uname_O),Cygwin)
+        NO_STRCASESTR = YesPlease
+        NEEDS_LIBICONV = YesPlease
+endif
+
 #
@@ -98,2 +118,5 @@ ifdef NO_ICONV
 endif
+ifdef NO_STRCASESTR
+        CFLAGS += -DNO_STRCASESTR
+endif
 
diff --git a/cgit.h b/cgit.h
index 91db98a..92f0c5a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -235,8 +235,2 @@ extern int cgit_parse_snapshots_mask(const char *str);
 
-/* libgit.a either links against or compiles its own implementation of
- * strcasestr(), and we'd like to reuse it. Simply re-declaring it
- * seems to do the trick.
- */
-extern char *strcasestr(const char *haystack, const char *needle);
-
 
diff --git a/parsing.c b/parsing.c
index c8f3048..f3f3b15 100644
--- a/parsing.c
+++ b/parsing.c
@@ -98,2 +98,5 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
 
+#ifdef NO_ICONV
+#define reencode(a, b, c)
+#else
 const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
@@ -112,2 +115,3 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 }
+#endif
 
diff --git a/ui-log.c b/ui-log.c
index 8dd8b89..d212984 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -66,2 +66,13 @@ void print_commit(struct commit *commit)
 
+static const char *disambiguate_ref(const char *ref)
+{
+        unsigned char sha1[20];
+        const char *longref;
+
+        longref = fmt("refs/heads/%s", ref);
+        if (get_sha1(longref, sha1) == 0)
+                return longref;
+
+        return ref;
+}
 
@@ -72,3 +83,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         struct commit *commit;
-        const char *argv[] = {NULL, tip, NULL, NULL, NULL};
+        const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
         int argc = 2;
@@ -77,3 +88,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         if (!tip)
-                argv[1] = ctx.qry.head;
+                tip = ctx.qry.head;
+
+        argv[1] = disambiguate_ref(tip);
 
diff --git a/ui-repolist.c b/ui-repolist.c
index c23232c..2324273 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -8,2 +8,6 @@
 
+/* This is needed for strcasestr to be defined by <string.h> */
+#define _GNU_SOURCE 1
+#include <string.h>
+
 #include <time.h>