Merge branch 'stable'

5 files changed, 8 insertions, 6 deletions

diff --git a/Makefile b/Makefileindex 561af76f..f79688c3 100644--- a/Makefile+++ b/Makefile@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_CONFIG = /etc/cgitrc 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/Makefile b/Makefile
index 561af76f..f79688c3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 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.cindex 57068a11..d7a8d5a9 100644--- a/cache.c+++ b/cache.c@@ -416,11 +416,11 @@ int cache_ls(const char *path) 				  fullname, strerror(err), err); 			continue; 		}-		printf("%s %s %10zd %s\n",+		printf("%s %s %10"PRIuMAX" %s\n", 		       name, 		       sprintftime("%Y-%m-%d %H:%M:%S", 				   slot.cache_st.st_mtime),-		       slot.cache_st.st_size,+		       (uintmax_t)slot.cache_st.st_size, 		       slot.buf); 		close_slot(&slot); 	}
diff --git a/cache.c b/cache.c
index 57068a11..d7a8d5a9 100644
--- a/cache.c
+++ b/cache.c
@@ -416,11 +416,11 @@ int cache_ls(const char *path)
 				  fullname, strerror(err), err);
 			continue;
 		}
-		printf("%s %s %10zd %s\n",
+		printf("%s %s %10"PRIuMAX" %s\n",
 		       name,
 		       sprintftime("%Y-%m-%d %H:%M:%S",
 				   slot.cache_st.st_mtime),
-		       slot.cache_st.st_size,
+		       (uintmax_t)slot.cache_st.st_size,
 		       slot.buf);
 		close_slot(&slot);
 	}
diff --git a/git b/git-Subproject 97a7a82f199f165f85fe39a3c318b18c621e6335+Subproject 031e6c898f61db1ae0c0be641eac6532c1000d56
diff --git a/git b/git
-Subproject 97a7a82f199f165f85fe39a3c318b18c621e6335
+Subproject 031e6c898f61db1ae0c0be641eac6532c1000d56
diff --git a/tests/setup.sh b/tests/setup.shindex 1457dd51..95acb542 100755--- a/tests/setup.sh+++ b/tests/setup.sh@@ -25,11 +25,13 @@ mkrepo() { 	mkdir -p $name 	cd $name 	git init-	for ((n=1; n<=count; n++))+	n=1+	while test $n -le $count 	do 		echo $n >file-$n 		git add file-$n 		git commit -m "commit $n"+		n=$(expr $n + 1) 	done 	if test "$3" = "testplus" 	then@@ -101,7 +103,7 @@ run_test() { 	desc=$1 	script=$2-	((test_count++))+	test_count=$(expr $test_count + 1) 	printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log 	printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log 	eval "$2" >>test-output.log 2>>test-output.log
diff --git a/tests/setup.sh b/tests/setup.sh
index 1457dd51..95acb542 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -25,11 +25,13 @@ mkrepo() {
 	mkdir -p $name
 	cd $name
 	git init
-	for ((n=1; n<=count; n++))
+	n=1
+	while test $n -le $count
 	do
 		echo $n >file-$n
 		git add file-$n
 		git commit -m "commit $n"
+		n=$(expr $n + 1)
 	done
 	if test "$3" = "testplus"
 	then
@@ -101,7 +103,7 @@ run_test()
 {
 	desc=$1
 	script=$2
-	((test_count++))
+	test_count=$(expr $test_count + 1)
 	printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
 	printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
 	eval "$2" >>test-output.log 2>>test-output.log
diff --git a/ui-plain.c b/ui-plain.cindex be559e02..5addd9e6 100644--- a/ui-plain.c+++ b/ui-plain.c@@ -18,7 +18,7 @@ static void print_object(const unsigned char *sha1, const char *path) { 	enum object_type type; 	char *buf;-	size_t size;+	unsigned long size;  	type = sha1_object_info(sha1, &size); 	if (type == OBJ_BAD) {
diff --git a/ui-plain.c b/ui-plain.c
index be559e02..5addd9e6 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -18,7 +18,7 @@ static void print_object(const unsigned char *sha1, const char *path)
 {
 	enum object_type type;
 	char *buf;
-	size_t size;
+	unsigned long size;
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {