From 54b7b3eedf1a88471bdd9a61954e284a9a3a079d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:19:37 +0100 Subject: [PATCH 1/7] remove example txt --- example.txt | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 example.txt diff --git a/example.txt b/example.txt deleted file mode 100644 index f37c3d2..0000000 --- a/example.txt +++ /dev/null @@ -1,14 +0,0 @@ -<<<<<<< HEAD -<<<<<<< HEAD -preproregfrgdefefefefeffe -totobiduMACHINleefgrrgfefeef -zddzddzdz -======= -preproregfrgdefedededfeefefefeffe -totobiduleefgrrgfefeef -======= -preproregfrgeffefeefefdefedededfeefefefeffe -totobiduHYYYYYYYYYYleeerfefeffefgrrgfefeef -zdAAAAAAAAAAAAAAdzddzdz ->>>>>>> preprod -dzzdzd From 96fe28d11177bc1ef1200f9e28b0651586006bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:21:14 +0100 Subject: [PATCH 2/7] fix pr title --- izigit.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/izigit.sh b/izigit.sh index e497cb0..4f300bd 100644 --- a/izigit.sh +++ b/izigit.sh @@ -68,10 +68,11 @@ PrIssueToPreprod() { pr_title=$(gh issue view $2 --json title --jq .title) # remove special characters from pr_title pr_title=${issue_title//[^a-zA-Z0-9 ]/} + pr_title="$2 $pr_title" # Create a pull request from the issue branch to the target branch (preprod) - gh pr create --base preprod --head $issue_branch_name -t "$2 $pr_title" -b "" + gh pr create --base preprod --head $issue_branch_name -t "$pr_title" -b "" # Add comment to issue comment="$date - create pull request branch $issue_branch_name to $preprod_branch - $github_name" From 1a59ccc50426ef62b2acac8c56784d9088ee3f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:24:35 +0100 Subject: [PATCH 3/7] fix pr title --- izigit.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/izigit.sh b/izigit.sh index 4f300bd..39afe25 100644 --- a/izigit.sh +++ b/izigit.sh @@ -68,11 +68,10 @@ PrIssueToPreprod() { pr_title=$(gh issue view $2 --json title --jq .title) # remove special characters from pr_title pr_title=${issue_title//[^a-zA-Z0-9 ]/} - pr_title="$2 $pr_title" # Create a pull request from the issue branch to the target branch (preprod) - gh pr create --base preprod --head $issue_branch_name -t "$pr_title" -b "" + gh pr create --base preprod --head $issue_branch_name -t "${$2} ${$pr_title}" -b "" # Add comment to issue comment="$date - create pull request branch $issue_branch_name to $preprod_branch - $github_name" From 9befbddb3246dae68aa68fa3a3cfec9801fa6325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:25:40 +0100 Subject: [PATCH 4/7] fix pr title --- izigit.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/izigit.sh b/izigit.sh index 39afe25..6f6c54f 100644 --- a/izigit.sh +++ b/izigit.sh @@ -68,10 +68,11 @@ PrIssueToPreprod() { pr_title=$(gh issue view $2 --json title --jq .title) # remove special characters from pr_title pr_title=${issue_title//[^a-zA-Z0-9 ]/} + pr_title= "$2" + " $pr_title" # Create a pull request from the issue branch to the target branch (preprod) - gh pr create --base preprod --head $issue_branch_name -t "${$2} ${$pr_title}" -b "" + gh pr create --base preprod --head $issue_branch_name -t "$pr_title" -b "" # Add comment to issue comment="$date - create pull request branch $issue_branch_name to $preprod_branch - $github_name" From cdb45bbfe52221a0bdb09b2d80c597b0f29fb986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:28:10 +0100 Subject: [PATCH 5/7] zddz --- izigit.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/izigit.sh b/izigit.sh index 6f6c54f..e30f760 100644 --- a/izigit.sh +++ b/izigit.sh @@ -68,11 +68,10 @@ PrIssueToPreprod() { pr_title=$(gh issue view $2 --json title --jq .title) # remove special characters from pr_title pr_title=${issue_title//[^a-zA-Z0-9 ]/} - pr_title= "$2" + " $pr_title" # Create a pull request from the issue branch to the target branch (preprod) - gh pr create --base preprod --head $issue_branch_name -t "$pr_title" -b "" + gh pr create --base preprod --head $issue_branch_name -t "${2} ${pr_title}" -b "" # Add comment to issue comment="$date - create pull request branch $issue_branch_name to $preprod_branch - $github_name" From 923ad9fa2635c72b00599b6465f81fd38fc74c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:29:25 +0100 Subject: [PATCH 6/7] zdzddz --- izigit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/izigit.sh b/izigit.sh index e30f760..c33e421 100644 --- a/izigit.sh +++ b/izigit.sh @@ -71,7 +71,7 @@ PrIssueToPreprod() { # Create a pull request from the issue branch to the target branch (preprod) - gh pr create --base preprod --head $issue_branch_name -t "${2} ${pr_title}" -b "" + gh pr create --base preprod --head $issue_branch_name -t "'${2} ${pr_title}'" -b "" # Add comment to issue comment="$date - create pull request branch $issue_branch_name to $preprod_branch - $github_name" From 1ca5b873108955d5d7112040656b758cf5ba68bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Guillaume?= Date: Wed, 18 Jan 2023 14:30:24 +0100 Subject: [PATCH 7/7] fix pr title --- izigit.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/izigit.sh b/izigit.sh index c33e421..74fe0d9 100644 --- a/izigit.sh +++ b/izigit.sh @@ -67,11 +67,10 @@ PrIssueToPreprod() { # Get issue title pr_title=$(gh issue view $2 --json title --jq .title) # remove special characters from pr_title - pr_title=${issue_title//[^a-zA-Z0-9 ]/} - + pr_title=${pr_title//[^a-zA-Z0-9 ]/} # Create a pull request from the issue branch to the target branch (preprod) - gh pr create --base preprod --head $issue_branch_name -t "'${2} ${pr_title}'" -b "" + gh pr create --base preprod --head $issue_branch_name -t "$2 $pr_title" -b "" # Add comment to issue comment="$date - create pull request branch $issue_branch_name to $preprod_branch - $github_name"