test_git_error.sh

#!/bin/bash
set -e
[ -d /tmp/test ] && rm -Rf /tmp/test || true
mkdir -p /tmp/test
cd /tmp/test
git init
touch test.txt
echo "123" >> test.txt
echo "000" >> test.txt
echo "456" >> test.txt
echo "000" >> test.txt
echo "789" >> test.txt
cat test.txt
git add .
git commit -a -m "Initial commit"
git checkout -b staging
sed -i -e 's/456/abc/g' test.txt
cat test.txt
git commit -a -m "Added staging change."
git checkout master
git checkout -b hotfix
git merge staging
sed -i -e 's/789/xyz/g' test.txt
cat test.txt
git commit -a -m "Added hotfix change."
VALUE=`git rev-parse HEAD`
echo $VALUE
git checkout master
git cherry-pick $VALUE
cat test.txt