tibo
/
mygitflow
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

202511201541

hotfix
Thibaud 1 month ago
parent
c68019a205
commit
689995449d
8 changed files with 11 additions and 25 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -3
      git_00_checkout_branch.sh
  2. +0
    -2
      git_00_status.sh
  3. +1
    -2
      git_01_quick_commit.sh
  4. +2
    -4
      git_02_add_branch.sh
  5. +3
    -5
      git_03_push_branch.sh
  6. +1
    -3
      git_04_merge_branch.sh
  7. +2
    -3
      git_05_delete_feature_branch.sh
  8. +1
    -3
      git_06_delete_all_features_branch.sh

00_checkout_branch.sh → git_00_checkout_branch.sh View File

@ -1,7 +1,5 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
git_current_branch() { git_current_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
} }
@ -13,7 +11,7 @@ then
CIBLE=$CUR_BRANCH CIBLE=$CUR_BRANCH
fi fi
$DIRNAME/01_quick_commit.sh
git_01_quick_commit.sh
if [ ! "$CIBLE" = "$CUR_BRANCH" ]; if [ ! "$CIBLE" = "$CUR_BRANCH" ];
then then

00_status.sh → git_00_status.sh View File

@ -1,7 +1,5 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
git_current_branch() { git_current_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
} }

01_quick_commit.sh → git_01_quick_commit.sh View File

@ -1,9 +1,8 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
TIMESTAMP=`date "+%Y%m%d%H%M"` TIMESTAMP=`date "+%Y%m%d%H%M"`
$DIRNAME/00_status.sh
git_00_status.sh
TEST=`git status | grep propre | wc -l` TEST=`git status | grep propre | wc -l`
if [ $TEST -eq 0 ] if [ $TEST -eq 0 ]

02_add_branch.sh → git_02_add_branch.sh View File

@ -1,14 +1,12 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
if [ "$1" == "" ] if [ "$1" == "" ]
then then
echo "Il faut préciser un nom de branche !" echo "Il faut préciser un nom de branche !"
exit 1 exit 1
fi fi
$DIRNAME/01_quick_commit.sh
git_01_quick_commit.sh
courante=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' | sed 's:(::g' | sed 's:)::g'` courante=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' | sed 's:(::g' | sed 's:)::g'`
if [ $courante != develop ] if [ $courante != develop ]
@ -18,7 +16,7 @@ then
echo # (optional) move to a new line echo # (optional) move to a new line
if [[ $REPLY =~ ^[YyOo]$ ]] if [[ $REPLY =~ ^[YyOo]$ ]]
then then
$DIRNAME/00_checkout_branch.sh develop
git_00_checkout_branch.sh develop
fi fi
fi fi

03_push_branch.sh → git_03_push_branch.sh View File

@ -1,7 +1,5 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
git_current_branch() { git_current_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
} }
@ -13,16 +11,16 @@ then
CIBLE=$CUR_BRANCH CIBLE=$CUR_BRANCH
fi fi
$DIRNAME/01_quick_commit.sh
git_01_quick_commit.sh
if [ ! "$CIBLE" = "$CUR_BRANCH" ]; if [ ! "$CIBLE" = "$CUR_BRANCH" ];
then then
$DIRNAME/00_checkout_branch.sh $CIBLE
git_00_checkout_branch.sh $CIBLE
fi fi
git push all git push all
if [ ! "$CIBLE" = "$CUR_BRANCH" ]; if [ ! "$CIBLE" = "$CUR_BRANCH" ];
then then
$DIRNAME/00_checkout_branch.sh $CUR_BRANCH
git_00_checkout_branch.sh $CUR_BRANCH
fi fi

04_merge_branch.sh → git_04_merge_branch.sh View File

@ -1,7 +1,5 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
echo "Il vaudrait mieux passer par https://git.topisto.net/topisto/suivi_projets" echo "Il vaudrait mieux passer par https://git.topisto.net/topisto/suivi_projets"
read -p "Are you sure ?" -n 1 -r read -p "Are you sure ?" -n 1 -r
echo # (optional) move to a new line echo # (optional) move to a new line
@ -10,7 +8,7 @@ then
# do dangerous stuff # do dangerous stuff
$DIRNAME/01_quick_commit.sh
git_01_quick_commit.sh
courante=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' | sed 's:(::g' | sed 's:)::g'` courante=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' | sed 's:(::g' | sed 's:)::g'`
cible=develop cible=develop

05_delete_feature_branch.sh → git_05_delete_feature_branch.sh View File

@ -1,5 +1,4 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
git_current_branch() { git_current_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
@ -26,7 +25,7 @@ delete_branch() {
esac esac
} }
$DIRNAME/03_push_branch.sh
git_03_push_branch.sh
if [ ! "$CUR_BRANCH" = "develop" ] if [ ! "$CUR_BRANCH" = "develop" ]
then then
@ -35,7 +34,7 @@ then
echo # (optional) move to a new line echo # (optional) move to a new line
if [[ $REPLY =~ ^[YyOo]$ ]] if [[ $REPLY =~ ^[YyOo]$ ]]
then then
$DIRNAME/00_checkout_branch.sh develop
git_00_checkout_branch.sh develop
fi fi
fi fi

06_delete_all_features_branch.sh → git_06_delete_all_features_branch.sh View File

@ -1,10 +1,8 @@
#!/bin/env bash #!/bin/env bash
DIRNAME=`dirname $0`
for branche in $(git branch | cut -c 3-) for branche in $(git branch | cut -c 3-)
do do
echo "branch $branche detected" echo "branch $branche detected"
$DIRNAME/05_delete_feature_branch.sh $branche
git_05_delete_feature_branch.sh $branche
done done

Write Preview
Loading…
Cancel
Save