Skip to content

macOS's stat does not support -c %s', use -f %z' instead #4

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

Open
clarkwang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

macOS's stat does not support -c %s', use -f %z' instead #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion guilt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,14 @@ must_commit_first()
return $?
}

stat_file_size()
{
case `uname -s` in
Darwin) stat -f %z "$1";;
*) stat -c %s "$1";;
esac
}

# usage: fold_patch patchname
fold_patch()
{
Expand All @@ -742,7 +750,7 @@ fold_patch()
do_get_full_header "$pnext" > "$TMP_NEXT"
do_get_patch "$pcur" > "$TMP_DIFF"

case "`stat -c %s \"$TMP_CUR\"`,`stat -c %s \"$TMP_NEXT\"`" in
case "`stat_file_size \"$TMP_CUR\"`,`stat_file_size \"$TMP_NEXT\"`" in
*,0)
# since the new patch header is empty, we
# don't have to do anything
Expand Down