diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 15:20:18 +0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 15:44:49 +0400 |
| commit | d987dd137bac8dca9b0015763d3106f48bb8a596 (patch) | |
| tree | ef887505b3c904c548d58ec9bb6f4970a0877042 /scripts/setlocalversion | |
| parent | c85251f8562095cd6fd63ae786354283c5318303 (diff) | |
| parent | 211c17aaee644bb808fbdeef547ac99db92c01ed (diff) | |
| download | linux-d987dd137bac8dca9b0015763d3106f48bb8a596.tar.xz | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 4d403844e137..bd6dca8a0ab2 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -75,8 +75,7 @@ scm_version() [ -w . ] && git update-index --refresh --unmerged > /dev/null # Check for uncommitted changes - if git diff-index --name-only HEAD | grep -v "^scripts/package" \ - | read dummy; then + if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then printf '%s' -dirty fi |