Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 738d1513d49356d4e7a8eaec4b5df61a0e07881c..73f830db2374e751fb46e25b345e860979b9dd05 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -20,7 +20,7 @@ check_have () {
 }
 
 check_fsck () {
-       output=$(git fsck-objects --full)
+       output=$(git fsck --full)
        case "$1" in
        '')
                test -z "$output" ;;
@@ -71,6 +71,8 @@ test_expect_success setup '
        check_fsck &&
 
        chmod +x C &&
+       ( test "`git config --bool core.filemode`" != false ||
+         echo executable >>C ) &&
        git add C &&
        test_tick && git commit -m dragon &&
        L=`git rev-parse --verify HEAD` &&
@@ -173,4 +175,31 @@ test_expect_success 'recover and check' '
 
 '
 
+test_expect_success 'delete' '
+       echo 1 > C &&
+       test_tick &&
+       git commit -m rat C &&
+
+       echo 2 > C &&
+       test_tick &&
+       git commit -m ox C &&
+
+       echo 3 > C &&
+       test_tick &&
+       git commit -m tiger C &&
+
+       test 5 = $(git reflog | wc -l) &&
+
+       git reflog delete master@{1} &&
+       git reflog show master > output &&
+       test 4 = $(wc -l < output) &&
+       ! grep ox < output &&
+
+       git reflog delete master@{07.04.2005.15:15:00.-0700} &&
+       git reflog show master > output &&
+       test 3 = $(wc -l < output) &&
+       ! grep dragon < output
+
+'
+
 test_done