aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-18 22:58:32 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-18 22:58:32 -0700
commitd9f39d9838f089c145817c6c0f25ffedcb1c500e (patch)
tree1489fcf3173ed657df1340b1c9a0063ce8da3daa /t
parent9a49e00b9a239c58e074bab6e147b293809a3c6f (diff)
parent5634cf24766f8700804ca55f5e8567c88538a5b0 (diff)
downloadgit-d9f39d9838f089c145817c6c0f25ffedcb1c500e.tar.gz
git-d9f39d9838f089c145817c6c0f25ffedcb1c500e.tar.xz
Merge branch 'maint'
* maint: gitweb: Fix 'history' view for deleted files with history Document that WebDAV doesn't need git on the server, and works over SSL git-remote: reject adding remotes with invalid names am: POSIX portability fix
Diffstat (limited to 't')
-rwxr-xr-xt/t5505-remote.sh6
-rwxr-xr-xt/t9500-gitweb-standalone-no-errors.sh16
2 files changed, 22 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 0a7fea865..af2d07779 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -253,4 +253,10 @@ test_expect_success '"remote show" does not show symbolic refs' '
'
+test_expect_success 'reject adding remote with an invalid name' '
+
+ ! git remote add some:url desired-name
+
+'
+
test_done
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 796cd7dba..061a2596d 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -483,6 +483,22 @@ test_expect_success \
'gitweb_run "p=.git;a=history;f=file"'
test_debug 'cat gitweb.log'
+test_expect_success \
+ 'logs: history (implicit HEAD, non-existent file)' \
+ 'gitweb_run "p=.git;a=history;f=non-existent"'
+test_debug 'cat gitweb.log'
+
+test_expect_success \
+ 'logs: history (implicit HEAD, deleted file)' \
+ 'git checkout master &&
+ echo "to be deleted" > deleted_file &&
+ git add deleted_file &&
+ git commit -m "Add file to be deleted" &&
+ git rm deleted_file &&
+ git commit -m "Delete file" &&
+ gitweb_run "p=.git;a=history;f=deleted_file"'
+test_debug 'cat gitweb.log'
+
# ----------------------------------------------------------------------
# feed generation