Merge branch 'ta/remove-stale-translated-tut'

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 12ae2566408a07ee4d56a49908ad5d5751b460de..f387027c05cf502c6892c7694598bef34376be92 100755 (executable)
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -63,18 +63,6 @@ test_expect_success 'fetch new branch' '
        compare_refs server HEAD local FETCH_HEAD
 '
 
-#
-# This is only needed because of a bug not detected by this script. It will be
-# fixed shortly, but for now lets not cause regressions.
-#
-test_expect_success 'bump commit in server' '
-       (cd server &&
-       git checkout master &&
-       echo content >>file &&
-       git commit -a -m four) &&
-       compare_refs server HEAD server HEAD
-'
-
 test_expect_success 'fetch multiple branches' '
        (cd local &&
         git fetch
@@ -162,4 +150,20 @@ test_expect_failure 'pushing without marks' '
        compare_refs local2 HEAD server HEAD
 '
 
+test_expect_success 'push all with existing object' '
+       (cd local &&
+       git branch dup2 master &&
+       git push origin --all
+       ) &&
+       compare_refs local dup2 server dup2
+'
+
+test_expect_success 'push ref with existing object' '
+       (cd local &&
+       git branch dup master &&
+       git push origin dup
+       ) &&
+       compare_refs local dup server dup
+'
+
 test_done