summaryrefslogtreecommitdiff
path: root/import-gnulib.sh
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2010-04-02 12:19:46 +0100
committerJames Youngman <jay@gnu.org>2010-04-03 10:07:29 +0100
commit6115892b3346ad6081eb6285cae4889d26886fb8 (patch)
treeb2c4523cf8d65bc5cb889e1bafabec0f93b6ec2a /import-gnulib.sh
parentbe821d9d8797dc411870e51f466a80e6f8f2a0e1 (diff)
downloadfindutils-6115892b3346ad6081eb6285cae4889d26886fb8.tar.gz
Fix some space-followed-by-tab sequences.
* NEWS: Change space-tab sequences to just spaces. * build-aux/check-testfiles.sh (main): Likewise * build-aux/src-sniff.py (checkers): Likewise. * find/Makefile.am: Likewise. * find/testsuite/find.posix/sv-bug-25359.exp: Likewise. * import-gnulib.sh (check_merge_driver): Likewise. * m4/withfts.m4 (FIND_WITH_FTS): Likewise. * cfg.mk (false_positives): Explain why we can't enable the sc_space_tab check (xargs .xo test files). Signed-off-by: James Youngman <jay@gnu.org>
Diffstat (limited to 'import-gnulib.sh')
-rwxr-xr-ximport-gnulib.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/import-gnulib.sh b/import-gnulib.sh
index e1ae2f7f..5fa376d9 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -276,8 +276,8 @@ Example:
label="Warning"
fi
if git config --get merge.merge-changelog.name >/dev/null ; then
- driver="$(git config --get merge.merge-changelog.driver |
- sed -e 's/[ ].*//')"
+ driver="$(git config --get merge.merge-changelog.driver |
+ sed -e 's/[ ].*//')"
if [[ $? -eq 0 ]]; then
if ! [[ -x "$driver" ]]; then
echo "ERROR: Merge driver $driver is not executable." >&2