summaryrefslogtreecommitdiff
path: root/contrib/hooks
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:58 (GMT)
commit3072ec397c06af6abb693287928e39f3b8f3ae4d (patch)
treea5591db69f0c53287a5c369e2d094964cbc44210 /contrib/hooks
parentb3689ce31ca24ef945299317dd3283533125baee (diff)
parentc54c7b376d73d2b3780475b18a6039721019aaba (diff)
downloadgit-3072ec397c06af6abb693287928e39f3b8f3ae4d.zip
git-3072ec397c06af6abb693287928e39f3b8f3ae4d.tar.gz
git-3072ec397c06af6abb693287928e39f3b8f3ae4d.tar.bz2
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
Diffstat (limited to 'contrib/hooks')
-rwxr-xr-xcontrib/hooks/pre-auto-gc-battery2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/hooks/pre-auto-gc-battery b/contrib/hooks/pre-auto-gc-battery
index 9d0c2d1..6a2cdeb 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