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

Signal if the destination already exists.

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

9
bin/git-cp
View file

@ -1,4 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail
PROGRAM=$0
CURRENT_FILENAME=""
DESTINATION_FILENAME=""
@ -30,6 +32,12 @@ 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//\//__}"
@ -47,7 +55,6 @@ else
git commit -nm "Copy $CURRENT_FILENAME into $DESTINATION_FILENAME"
# We get back our copy
rm -f "${DESTINATION_FILENAME}" # Make sure the file doesn't exists somehow
git merge "${SAVED}"
git commit -a -m "Duplicate ${CURRENT_FILENAME} history." # Keeping both files

2
bin/git-psykorebase
View file

@ -1,6 +1,4 @@
#!/usr/bin/env bash
set -euo pipefail
PROGRAM=$0
PRIMARY_BRANCH=""
SECONDARY_BRANCH=""