Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: harden utimes, use single quotes #1109

Merged
merged 5 commits into from
Nov 23, 2023
Merged

Fix: harden utimes, use single quotes #1109

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7e1ebd
Fix: harden utimes, use single quotes
rasa Nov 11, 2023
d51d773
Remove passing --posix to bash
rasa Nov 11, 2023
361c6b5
Remove double-quotes and backslashes
rasa Nov 12, 2023
f2b0031
Fix: patch git-utimes (fixes #1118)
rasa Nov 21, 2023
5bc0c30
Fix formatting issue in git-utimes
rasa Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions bin/git-utimes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# shellcheck disable=SC2312,SC2248,SC2250,SC2064,SC2086
# shellcheck disable=SC2312
#
# Change files modification time to their last commit date
#
Expand Down Expand Up @@ -34,13 +34,6 @@ fi
if bash --help 2>&1 | grep -q -- '--norc'; then
bash_opts="${bash_opts} --norc"
fi
# sanity check, not required:
if bash --help 2>&1 | grep -q -- '--posix'; then
bash_opts="${bash_opts} --posix"
fi
rasa marked this conversation as resolved.
Show resolved Hide resolved

prefix="$(git rev-parse --show-prefix) "
strip="${#prefix}"

status_opts=
whatchanged_opts=
Expand All @@ -55,16 +48,22 @@ if git status --help 2>&1 | grep -q -- "--ignored"; then
status_opts="${status_opts} --ignored=no"
fi

prefix="$(git rev-parse --show-prefix) "
strip="${#prefix}"

tmpfile=$(mktemp)
# shellcheck disable=SC2064
trap "rm -f '${tmpfile}'" 0

# prefix is stripped:
# shellcheck disable=SC2086
git --no-pager status --porcelain --short ${status_opts} . |
cut -c 4- >"${tmpfile}"

# prefix is not stripped:
# shellcheck disable=SC1003,SC2086,SC2248
git --no-pager whatchanged ${whatchanged_opts} --format='%ct' . |
awk $awk_flags \
awk ${awk_flags} \
-F'\t' \
-v date_flags="${date_flags}" \
-v op="${op}" \
Expand All @@ -80,7 +79,7 @@ git --no-pager whatchanged ${whatchanged_opts} --format='%ct' . |
print " echo \"+ touch -h -d@$1 $2\""
print " touch -h -d@$1 \"$2\""
} else {
printf(" t=$(date %s$1 \"+%Y%m%d%H%M.%S\")\n", date_flags)
print " t=$(date -r$1 \"+%Y%m%d%H%M.%S\")"
print " echo \"+ touch -h -t $t $2\""
print " touch -h -t $t \"$2\""
}
Expand All @@ -107,8 +106,13 @@ FILENAME==tmpfile {
next
}
seen[$2]=1
# escape quotes:
gsub(/"/, "\\\"", $2)
printf("t %s \"%s\"\n", ct, $2)
# remove double quotes and backslashes that git adds:
if (substr($2, 1, 1) == "\"" && substr($2, length($2), 1) == "\"") {
$2 = substr($2, 2, length($2) - 2)
gsub(/\\/, "", $2)
}
# escape single quotes:
gsub(/'\''/, "'\''\\'\'''\''", $2)
printf("t %s '\''%s'\''\n", ct, $2)
}
' "${tmpfile}" - | BASH_ENV='' bash ${bash_opts} /dev/stdin
Loading