utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-15 09:56:19 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Simplify the code.

Browse source
This commit is contained in:
Rémy HUBSCHER 2020-03-20 11:33:00 +01:00
parent b85fc019ca
commit 91b3e47243
No known key found for this signature in database
GPG key ID: A500E24B95405094
1 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bin/git-cp
View file

@ -32,33 +32,9 @@ elif [[ "$CURRENT_FILENAME" == "" ]]; then
usage
exit 10 # Missing arguments CURRENT_FILENAME
else
if [ ! -e "$DESTINATION_FILENAME" ]; then
echo 1>&2 "$DESTINATION_FILENAME already exists."
echo 1>&2 "Make sure to remove the destination first."
exit 40
fi
echo "Coping $CURRENT_FILENAME into $DESTINATION_FILENAME"
INTERMEDIATE_FILENAME="${CURRENT_FILENAME//\//__}-move-to-${DESTINATION_FILENAME//\//__}"
cp -r "${CURRENT_FILENAME}" "${DESTINATION_FILENAME}"
# We keep the existing file on the side in a commit
git mv "${CURRENT_FILENAME}" "${INTERMEDIATE_FILENAME}"
git commit -nm "Keep $CURRENT_FILENAME"
SAVED=$(git rev-parse HEAD)
# We come back to the previous state
git reset --hard HEAD^ # Revert that change
# We move the file to its new destination
git mv "${CURRENT_FILENAME}" "${DESTINATION_FILENAME}"
git add "${DESTINATION_FILENAME}"
git commit -nm "Copy $CURRENT_FILENAME into $DESTINATION_FILENAME"
# We get back our copy
git merge "${SAVED}"
git commit -a -m "Duplicate ${CURRENT_FILENAME} history." # Keeping both files
# We get back our original name
git mv "${INTERMEDIATE_FILENAME}" "${CURRENT_FILENAME}"
git commit -nm "Set back $CURRENT_FILENAME file."
git add "$DESTINATION_FILENAME"
git commit -m "Duplicate ${CURRENT_FILENAME} history in ${DESTINATION_FILENAME} history." -n
fi