submodule update: Add --commit option

[git.git] / t / t7406-submodule-update.sh

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 15426530e49ef2e42cda2528f4a72a784eb40cd9..7f9abcbf2aab6d75d0e8dd89174c437f5deb7570 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -163,6 +163,24 @@ test_expect_success 'submodule update --merge staying on master' '
        )
 '
 
+test_expect_success 'submodule update --commit --rebase should commit gitlink changes' '
+       (cd super/submodule &&
+        git reset --hard HEAD~1 &&
+        echo "local change" > local-file &&
+        git add local-file &&
+        test_tick &&
+        git commit -m "local change"
+       ) &&
+       (cd super &&
+        git submodule update --commit --rebase submodule &&
+        test "$(git log -1 --oneline)" = "cd69713 Updated submodules: submodule"
+       ) &&
+       (cd submodule &&
+        git remote add super-submodule ../super/submodule &&
+        git pull super-submodule master
+       )
+'
+
 test_expect_success 'submodule update - rebase in .git/config' '
        (cd super &&
         git config submodule.submodule.update rebase