summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-03-17 00:53:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-03-17 00:53:08 (GMT)
commit47c52b2dada2d7223cfc8927ae7909dba27579a2 (patch)
treea757bd2c357f9c43a5be33800859c056c213016f /t
parent190f9bf62a17ca6f97dee3f3818450ab2927215b (diff)
parent56710a7ae0170404d7bc6411bd5c9a18124c0629 (diff)
downloadgit-47c52b2dada2d7223cfc8927ae7909dba27579a2.zip
git-47c52b2dada2d7223cfc8927ae7909dba27579a2.tar.gz
git-47c52b2dada2d7223cfc8927ae7909dba27579a2.tar.bz2
Merge branch 'tb/rename-remote-progress'
"git remote rename A B", depending on the number of remote-tracking refs involved, takes long time renaming them. The command has been taught to show progress bar while making the user wait. * tb/rename-remote-progress: builtin/remote.c: show progress when renaming remote references builtin/remote.c: parse options in 'rename'
Diffstat (limited to 't')
-rwxr-xr-xt/t5505-remote.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 9ab3154..c90cf47 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -753,7 +753,9 @@ test_expect_success 'rename a remote' '
(
cd four &&
git config branch.main.pushRemote origin &&
- git remote rename origin upstream &&
+ GIT_TRACE2_EVENT=$(pwd)/trace \
+ git remote rename --progress origin upstream &&
+ test_region progress "Renaming remote references" trace &&
grep "pushRemote" .git/config &&
test -z "$(git for-each-ref refs/remotes/origin)" &&
test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&