apply: register conflicted stages to the index

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 80af6b9b7ea50652dff6804b589d134207e9258f..236b13a3ab27f54808fa88574738747e3c3936b1 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -100,8 +100,7 @@ test_expect_success setup '
 
        check_fsck &&
 
-       loglen=$(wc -l <.git/logs/refs/heads/master) &&
-       test $loglen = 4
+       test_line_count = 4 .git/logs/refs/heads/master
 '
 
 test_expect_success rewind '
@@ -117,8 +116,7 @@ test_expect_success rewind '
 
        check_have A B C D E F G H I J K L &&
 
-       loglen=$(wc -l <.git/logs/refs/heads/master) &&
-       test $loglen = 5
+       test_line_count = 5 .git/logs/refs/heads/master
 '
 
 test_expect_success 'corrupt and check' '
@@ -136,8 +134,7 @@ test_expect_success 'reflog expire --dry-run should not touch reflog' '
                --stale-fix \
                --all &&
 
-       loglen=$(wc -l <.git/logs/refs/heads/master) &&
-       test $loglen = 5 &&
+       test_line_count = 5 .git/logs/refs/heads/master &&
 
        check_fsck "missing blob $F"
 '
@@ -150,8 +147,7 @@ test_expect_success 'reflog expire' '
                --stale-fix \
                --all &&
 
-       loglen=$(wc -l <.git/logs/refs/heads/master) &&
-       test $loglen = 2 &&
+       test_line_count = 2 .git/logs/refs/heads/master &&
 
        check_fsck "dangling commit $K"
 '
@@ -186,8 +182,8 @@ test_expect_success 'delete' '
        test_tick &&
        git commit -m tiger C &&
 
-       HEAD_entry_count=$(git reflog | wc -l)
-       master_entry_count=$(git reflog show master | wc -l)
+       HEAD_entry_count=$(git reflog | wc -l) &&
+       master_entry_count=$(git reflog show master | wc -l) &&
 
        test $HEAD_entry_count = 5 &&
        test $master_entry_count = 5 &&
@@ -199,13 +195,13 @@ test_expect_success 'delete' '
        test $HEAD_entry_count = $(git reflog | wc -l) &&
        ! grep ox < output &&
 
-       master_entry_count=$(wc -l < output)
+       master_entry_count=$(wc -l < output) &&
 
        git reflog delete HEAD@{1} &&
        test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
        test $master_entry_count = $(git reflog show master | wc -l) &&
 
-       HEAD_entry_count=$(git reflog | wc -l)
+       HEAD_entry_count=$(git reflog | wc -l) &&
 
        git reflog delete master@{07.04.2005.15:15:00.-0700} &&
        git reflog show master > output &&
@@ -214,4 +210,39 @@ test_expect_success 'delete' '
 
 '
 
+test_expect_success 'rewind2' '
+
+       test_tick && git reset --hard HEAD~2 &&
+       test_line_count = 4 .git/logs/refs/heads/master
+'
+
+test_expect_success '--expire=never' '
+
+       git reflog expire --verbose \
+               --expire=never \
+               --expire-unreachable=never \
+               --all &&
+       test_line_count = 4 .git/logs/refs/heads/master
+'
+
+test_expect_success 'gc.reflogexpire=never' '
+
+       git config gc.reflogexpire never &&
+       git config gc.reflogexpireunreachable never &&
+       git reflog expire --verbose --all &&
+       test_line_count = 4 .git/logs/refs/heads/master
+'
+
+test_expect_success 'gc.reflogexpire=false' '
+
+       git config gc.reflogexpire false &&
+       git config gc.reflogexpireunreachable false &&
+       git reflog expire --verbose --all &&
+       test_line_count = 4 .git/logs/refs/heads/master &&
+
+       git config --unset gc.reflogexpire &&
+       git config --unset gc.reflogexpireunreachable
+
+'
+
 test_done