summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--cache.c4
m---------git0
-rwxr-xr-xtests/setup.sh6
-rw-r--r--ui-plain.c2
5 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 561af76..f79688c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,3 +6,3 @@ CACHE_ROOT = /var/cache/cgit
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.0.2
+GIT_VER = 1.6.0.3
GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
diff --git a/cache.c b/cache.c
index 57068a1..d7a8d5a 100644
--- a/cache.c
+++ b/cache.c
@@ -418,3 +418,3 @@ int cache_ls(const char *path)
}
- printf("%s %s %10zd %s\n",
+ printf("%s %s %10"PRIuMAX" %s\n",
name,
@@ -422,3 +422,3 @@ int cache_ls(const char *path)
slot.cache_st.st_mtime),
- slot.cache_st.st_size,
+ (uintmax_t)slot.cache_st.st_size,
slot.buf);
diff --git a/git b/git
-Subproject 97a7a82f199f165f85fe39a3c318b18c621e633
+Subproject 031e6c898f61db1ae0c0be641eac6532c1000d5
diff --git a/tests/setup.sh b/tests/setup.sh
index 1457dd5..95acb54 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -27,3 +27,4 @@ mkrepo() {
git init
- for ((n=1; n<=count; n++))
+ n=1
+ while test $n -le $count
do
@@ -32,2 +33,3 @@ mkrepo() {
git commit -m "commit $n"
+ n=$(expr $n + 1)
done
@@ -103,3 +105,3 @@ run_test()
script=$2
- ((test_count++))
+ test_count=$(expr $test_count + 1)
printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
diff --git a/ui-plain.c b/ui-plain.c
index be559e0..5addd9e 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -20,3 +20,3 @@ static void print_object(const unsigned char *sha1, const char *path)
char *buf;
- size_t size;
+ unsigned long size;