diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 11:41:17 -0700 |
| commit | 7c621186bae3204af11ed60984ff3d1df0eddb44 (patch) | |
| tree | 93c223dc758a685649d9097ae004f39c0f03c335 | |
| parent | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint (diff) | |
| parent | hooks/pre-auto-gc: adjust power checking for newer OS X (diff) | |
| download | tgif-7c621186bae3204af11ed60984ff3d1df0eddb44.tar.xz | |
Merge branch 'pa/auto-gc-mac-osx' into maint
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
| -rwxr-xr-x | contrib/hooks/pre-auto-gc-battery | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/hooks/pre-auto-gc-battery b/contrib/hooks/pre-auto-gc-battery index 9d0c2d1990..6a2cdebdb7 100755 --- a/contrib/hooks/pre-auto-gc-battery +++ b/contrib/hooks/pre-auto-gc-battery @@ -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 |