Skip to content

Commit

Permalink
Merge branch 'pa/auto-gc-mac-osx' into maint
Browse files Browse the repository at this point in the history
Recent Mac OS X updates breaks the logic to detect that the machine
is on the AC power in the sample pre-auto-gc script.

* pa/auto-gc-mac-osx:
  hooks/pre-auto-gc: adjust power checking for newer OS X
  • Loading branch information
Junio C Hamano committed Jul 15, 2015
2 parents 93eba05 + c54c7b3 commit 7c62118
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/hooks/pre-auto-gc-battery
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ elif grep -q "AC Power \+: 1" /proc/pmu/info 2>/dev/null
then
exit 0
elif test -x /usr/bin/pmset && /usr/bin/pmset -g batt |
grep -q "Currently drawing from 'AC Power'"
grep -q "drawing from 'AC Power'"
then
exit 0
fi
Expand Down

0 comments on commit 7c62118

Please sign in to comment.