diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2023-10-14 19:05:21 -0600 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2023-10-14 19:05:21 -0600 |
| commit | c6ba01f3f27872a7e9479ec4cd3da018f231b556 (patch) | |
| tree | 57c307936bb30734cc29e64e3495ec441ea94380 /bin/gitify | |
| parent | a76e7458aa34ebe08cbf7048df5d6b183f5bbaef (diff) | |
| parent | e35a01b00eb39366b6c8b1294c6a766838313f38 (diff) | |
Merge branch 'lukeshu/tidy'
Diffstat (limited to 'bin/gitify')
| -rwxr-xr-x | bin/gitify | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -82,7 +82,7 @@ main() { HACK_NAME='Luke Shumaker' HACK_EMAIL='lukeshu@lukeshu.com' - gitdate="$(sed -r 's/(....)(..)(..)(..)(..)(..)/\1-\2-\3T\4:\5:\6 '"$HACK_TZ"'/' <<<"$time")" + gitdate="$(sed -E 's/(....)(..)(..)(..)(..)(..)/\1-\2-\3T\4:\5:\6 '"$HACK_TZ"'/' <<<"$time")" git add . @@ -99,11 +99,11 @@ main() { lastbranch="$branch" fi if [[ "$branch" == PROGRAMS/CVTUTF ]] && git log -n1 --stat|grep -qF 'ExpectedOutput.txt'; then - git filter-branch -f --parent-filter 'cat; echo " -p BETA/CVTUTF-1-3"' HEAD^..HEAD + FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --parent-filter 'cat; echo " -p BETA/CVTUTF-1-3"' HEAD^..HEAD git update-ref -d refs/original/refs/heads/"$branch" fi if [[ "$branch" == PROGRAMS/CVTUTF.OLD ]] && git log -n1 --stat|grep -qi '.*\.c\s'; then - git filter-branch -f --parent-filter 'cat; echo " -p PROGRAMS/CVTUTF^"' HEAD^..HEAD + FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --parent-filter 'cat; echo " -p PROGRAMS/CVTUTF^"' HEAD^..HEAD git update-ref -d refs/original/refs/heads/"$branch" fi fi |