mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-26 18:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2008-11-06 19:18:27 +01:00
commit b8a7eb12d4
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_CONFIG = /etc/cgitrc CGIT_CONFIG = /etc/cgitrc
CACHE_ROOT = /var/cache/cgit CACHE_ROOT = /var/cache/cgit
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
# #

4
cache.c
View File

@ -416,11 +416,11 @@ int cache_ls(const char *path)
fullname, strerror(err), err); fullname, strerror(err), err);
continue; continue;
} }
printf("%s %s %10zd %s\n", printf("%s %s %10"PRIuMAX" %s\n",
name, name,
sprintftime("%Y-%m-%d %H:%M:%S", sprintftime("%Y-%m-%d %H:%M:%S",
slot.cache_st.st_mtime), slot.cache_st.st_mtime),
slot.cache_st.st_size, (uintmax_t)slot.cache_st.st_size,
slot.buf); slot.buf);
close_slot(&slot); close_slot(&slot);
} }

2
git

@ -1 +1 @@
Subproject commit 97a7a82f199f165f85fe39a3c318b18c621e6335 Subproject commit 031e6c898f61db1ae0c0be641eac6532c1000d56

6
tests/setup.sh
View File

@ -25,11 +25,13 @@ mkrepo() {
mkdir -p $name mkdir -p $name
cd $name cd $name
git init git init
for ((n=1; n<=count; n++)) n=1
while test $n -le $count
do do
echo $n >file-$n echo $n >file-$n
git add file-$n git add file-$n
git commit -m "commit $n" git commit -m "commit $n"
n=$(expr $n + 1)
done done
if test "$3" = "testplus" if test "$3" = "testplus"
then then
@ -101,7 +103,7 @@ run_test()
{ {
desc=$1 desc=$1
script=$2 script=$2
((test_count++)) test_count=$(expr $test_count + 1)
printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
eval "$2" >>test-output.log 2>>test-output.log eval "$2" >>test-output.log 2>>test-output.log

2
ui-plain.c
View File

@ -18,7 +18,7 @@ static void print_object(const unsigned char *sha1, const char *path)
{ {
enum object_type type; enum object_type type;
char *buf; char *buf;
size_t size; unsigned long size;
type = sha1_object_info(sha1, &size); type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) { if (type == OBJ_BAD) {