I am making a small automation to add all the .java files in my current directory but it has some flaws.
It pushes each file instead of pushing them all at once, it's okay If it asks the commit message for each file but I tried to git push the files outside the for loop.
#!/bin/bash
javafile=*.java
for i in $javafile;
do
if [[ "$i" == "$javafile" ]]
then
echo "No .java files"
else
git add $i
echo
echo "File $i added"
echo
echo "Write a message to commit"
read message
git commit -m "$message"
git push origin master
echo
echo "#############################################"
echo "$i pushed successfully"
echo "#############################################"
fi
done
The problem is the git push origin master inside the loop, consider the following script;
#!/bin/bash
javafile=*.java
filesCommit=0
# For each java file
for i in $javafile; do
if [[ "$i" == "$javafile" ]]; then
echo "No .java files"
else
# Add current file
git add $i
echo
echo "File $i added"
# Ask for commit message
echo
echo "Write a message to commit"
read message
# Commit single file with message
git commit -m "$message"
# Bumb counter to remember number of items
((filesCommit++))
fi
done
# If we've had atleast 1 file, push
if [[ "$filesCommit" -ge 0 ]]; then
git push origin master
echo
echo "#############################################"
echo "Pushed successfully; $filesCommit files"
echo "#############################################"
fi
Here I'm using a variable to count the number of files we've commited. Then, after the loop, we can push all those files
Related
I was able to run a pipeline to check if rebased was required or not when a commit is merged onto master, but once the commit is rebased and synced with master branch, it passes the pipeline. My script is comparing the 2 parents commits when the merge is done. Searching for ways to make the pipeline fail if commit was rebased and merged onto bitbucket master branch.
My script is as follows:
#!/bin/bash
trg=$1
itg=$2
parent_commit_count=$(git cat-file -p $BITBUCKET_COMMIT | grep -o -i parent | wc -l)
echo "Number of parent commits:"$parent_commit_count
if [ "${parent_commit_count}" = "2" ]
then
echo "Validating master branch graph shape"
fi
if [[ -z $trg ]]; then
trg=HEAD
fi
if [[ -z $itg ]]; then
itg=master
fi
ret=$(git rev-list $trg..$itg)
if [[ -z $ret ]]; then
echo "No rebase required, sexy graph is maintained."
else
echo "Commit $BITBUCKET_COMMIT needs to be rebased to absorb the following changes:"
for r in $ret
do
echo $r
done
exit 1
fi
Pipeline:
branches:
master:
- step:
name: Branch Trigger to Master
script:
- echo "Checking Merge Commit"
- chmod +x MergeCommitCheck.sh && ./MergeCommitCheck.sh
I was doing a script for myself to summarize commands I use daily in one handy script. So basically I ended doing it with a conditional checking if the .git folder exists first but I'd like to make it more interesting and like so understand better the loop. My desire is to have a variable like:
"output=$(git status)" and if the result is 0, continue depending on the statement. If the result is other than 0, break the loop and end the script with a message like "the actual directory hasn't a .git repo".
I let you my first idea of it but without the git status as I don't know how to add it neither where to. Thank you guys!
set -e
gitrepo=true
while [ $gitrepo == true ]; do
if [[ $? -ne 0 ]]; then
echo "not a git directory"
$gitrepo=false
else
read -p "Commit message: " commit
git commit -am "$commit"
fi
done
Try this: I did as Cyrus suggested:
#!/usr/bin/env bash
set -e
gitrepo=True
while [[ $gitrepo ]]; do
if [[ ! $? ]]; then
echo "not a git directory"
gitrepo=False
else
read -p "Commit message: " -r commit
git commit -am "$commit"
exit 0
fi
done
I have a pre-receive hook to check the naming convention for running Git project:
valid_branch_regex="^(master|release-[0-9]{4}-[0-9]{2}|[A-Z|0-9]{3,6}-[0-9]+-.*)"
while read oldrev newrev refname; do
echo "$refname : $oldrev ~ $newrev"
current_branch=$refname
short_current_branch="$(echo $current_branch | sed 's/refs\/heads\///g')"
done
message="There is something wrong with your branch name. Branch names in this project must adhere to this contract:\
$valid_branch_regex. Your commit will be rejected. You should rename your branch to a valid name and try again."
if [[ ! $short_current_branch =~ $valid_branch_regex ]]
then
echo "$message"
exit 1
fi
exit 0
The problem is that I want to bypass the branches which have been pushed before the script has been applied. Any idea to improve my current logic?
Thank you!
This might be a solution to this question:
valid_branch_regex="^(master|release-[0-9]{4}-[0-9]{2}|[A-Z|0-9]{3,6}-[0-9]+-.*)"
zero_commit="0000000000000000000000000000000000000000"
message="There is something wrong with your branch name. Branch names in this project must adhere to this contract: \
$valid_branch_regex. Your commit will be rejected. You should rename your branch to a valid name and try again."
while read oldrev newrev refname; do
echo "$refname : $oldrev ~ $newrev"
current_branch=$refname
short_current_branch="$(echo $current_branch | sed 's/refs\/heads\///g')"
done
message="There is something wrong with your branch name. Branch names in this project must adhere to this contract:\
$valid_branch_regex. Your commit will be rejected. You should rename your branch to a valid name and try again."
# Check for new branch or tag
if [ "$oldrev" == "$zero_commit" ]; then
short_current_branch="$(echo $current_branch | sed 's/refs\/heads\///g')"
else
echo "This is an existing branch, wont check the naming convention. \
Please be aware that the branch name should follow this contract: $valid_branch_regex"
exit 0
fi
if [[ ! $short_current_branch =~ $valid_branch_regex ]]
then
echo "$message"
exit 1
fi
exit 0
if [[ ! $short_current_branch =~ $valid_branch_regex ]]
then
echo "$message"
exit 1
fi
done
exit 0
Is there a way in Git Bash to check if the working tree is clean, that is no uncommitted changes or untracked files?
I'm working on a bash script for my group to automate the process of daily rebasing working branches. Unclean working trees is a common problem. I can manually correct the problem by executing git checkout .. This would have the desired result most of the time, but not always, so I need to be able to have my script programatically check that the working directory/tree is clean.
The git-sh-setup script included with git contains a number of useful functions for working with git repositories. Among them is require_clean_work_tree:
require_clean_work_tree () {
git rev-parse --verify HEAD >/dev/null || exit 1
git update-index -q --ignore-submodules --refresh
err=0
if ! git diff-files --quiet --ignore-submodules
then
echo >&2 "Cannot $1: You have unstaged changes."
err=1
fi
if ! git diff-index --cached --quiet --ignore-submodules HEAD --
then
if [ $err = 0 ]
then
echo >&2 "Cannot $1: Your index contains uncommitted changes."
else
echo >&2 "Additionally, your index contains uncommitted changes."
fi
err=1
fi
if [ $err = 1 ]
then
test -n "$2" && echo >&2 "$2"
exit 1
fi
}
This is in addition to being able to check the output from git status --porcelain and/or git status -z if you need to be more specific about what the state currently is.
I am writing a script to automate setting up new projects for me.
this includes pulling down a github repository.
What I want to do is have some output from my script, then call git clone $repo
I want to show the output from that command while it is running, but then when it has run if it has run successfully replace it's output (note just the git commands output, I still want the output from before that to be there) with repository successfully cloned and if failed just leave the output there, and print repository cloning failed.
How can I do this?
Below is my current (rather simple) script.
#! /bin/bash
# -p project name
templateurl="git#bitbucket.org:xxx/xxx-site-template.git"
while getopts ":p:" opt; do #eventually I'll add more options here
case $opt in
p)
project=$OPTARG
;;
\?)
echo "Invalid option: -$OPTARG" >&2
exit 1
;;
:)
echo "Option -$OPTARG requires an argument." >&2
exit 1
;;
esac
done
if [ -z "$project" ]; then
echo "Project name required"
exit 1
fi
clear
echo "|==========================|"
echo "| New xxx Project Creator |"
echo "|==========================|"
echo "Project: $project"
if [ -d "$project" ]; then
echo "Directory $project already exists!"
exit 1
fi
mkdir $project
if [ ! -d "$project" ]; then
echo "Failed to create project directory!"
exit 1
fi
echo "Cloning xxx Template repository"
git clone $templateurl $project
git clone does provide a exit code you can read with $? like follows:
git clone user#server:repo
echo $?
This will print 0 if everything worked just fine. If for example the folder is not a git repository you will get the exit code 128.
you can check if the clone worked as follows:
git clone user#server:repo localrepo --quiet
success=$?
if [[ $success -eq 0 ]];
then
echo "Repository successfully cloned."
else
echo "Something went wrong!"
fi
--quietwill suppress any output from git, as long as there are no errors. So if you just remove the else-branch you will get you positive output or the error produced by git.
git clone user#server:repo localrepo > git.log 2>&1
if [[ $? eq 0 ]];
then
echo Repository successfully cloned.
else
cat git.log
echo Repository cloning failed.
fi
rm git.log
Explanation:
git clone user#server:repo localrepo > git.log 2>&1
Redirects stdout and stderr streams to git.log. > git.log redirects stdout to git.log 2>&1 redirects stderr to the same place as stdout(thus, git.log).
$? eq 0 Checks the retcode of git which should be 0 if the clone was successful.
cat git.log outputs the contents of the git.log file.