mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'pa/auto-gc-mac-osx'
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
This commit is contained in:
commit
3072ec397c
|
@ -33,7 +33,7 @@ elif grep -q "AC Power \+: 1" /proc/pmu/info 2>/dev/null
|
||||||
then
|
then
|
||||||
exit 0
|
exit 0
|
||||||
elif test -x /usr/bin/pmset && /usr/bin/pmset -g batt |
|
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
|
then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue