From 5a2a1e10c7dde38065e479ba36e0ef0233e0dfba Mon Sep 17 00:00:00 2001 From: eleonore12345 Date: Fri, 12 Jul 2024 18:49:24 +0200 Subject: [PATCH] =?UTF-8?q?bug=20test=5Fgit=5Fupdate=20avec=20git=20branc?= =?UTF-8?q?=20r=C3=A9par=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 6 +++--- test_git_update.sh | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/readme.md b/readme.md index f2eed5c..3c8f7cc 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -## Testing of differeng cloning methods +## Testing of different cloning methods Our objective is to find the least-consuming method in terms of memory and bandwidth resources. We are interested in cloning one specific state of the repository. We are not interested in its history or the possibility to change it from the server where it has been cloned. The first step is done by the script creation_repo.sh which creates an adequate repository to act as a local remote. The testing in itself is done by performance_tests.sh. @@ -57,7 +57,7 @@ OPTIONS -n number executes test number -h prints the help. DESCRIPTION - This script is in writing. It allows you to measure memory and bandwidth usage. The first four test different cloning methods. Te following apply changes to the local remote before testing fetching and merging commands. + This script allows you to measure memory and bandwidth usage. The first five test different cloning methods. Te following apply changes to the local remote before testing fetching and merging commands. TEST0: classic cloning TEST1: --single-branch cloning TEST2: --depth=1 --no-single-branch cloning @@ -95,4 +95,4 @@ DESCRIPTION TEST27: --depth=1 fetching+merging -s ours with reflog and gc after addition of a 1M file TEST28: --depth=1 fetching+merging -s ours with reflog and gc after removal of a 1M file - TEST29: --depth=1 fetching+merging -s ours with reflog and gc after addition then removal of a 1M file" \ No newline at end of file + TEST29: --depth=1 fetching+merging -s ours with reflog and gc after addition then removal of a 1M file" diff --git a/test_git_update.sh b/test_git_update.sh index 90d4d09..6469bfd 100755 --- a/test_git_update.sh +++ b/test_git_update.sh @@ -79,8 +79,8 @@ history_check(){ tag_check(){ local repo_name=$1 cd $repo_name - run $(git branch) > res - if [ $(grep "no branch" res | wc -l) = 1 ];then + git branch > res + if [ $(grep "no branch" res | wc -l) = 1 ]; then echo "The tag instruction has been respected" tag_result=0 else @@ -92,8 +92,8 @@ tag_check(){ branch_check(){ local repo_name=$1 - run cd $repo_name - run $(git branch) > res + run cd $repo_name + git branch > res if [ $(grep $BRANCH_NAME res | wc -l) = 1 ];then echo "The branch instruction has been respected" branch_result=0 @@ -212,7 +212,7 @@ test3(){ TEST4(){ #CASE 4: git updated ff section TEST4 - + }