diff options
| author | unknown <guilhem@gbichot4.local> | 2007-08-08 11:36:41 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-08-08 11:36:41 +0200 |
| commit | 62b30a1922f12f098043d76336466c89ea37e7bd (patch) | |
| tree | bc883848db02be83547be5193b208feded19f50f /BitKeeper | |
| parent | 1ad3a05dd7353cc7106d57de1acf777cbd0368c0 (diff) | |
| download | mariadb-git-62b30a1922f12f098043d76336466c89ea37e7bd.tar.gz | |
propagation to maria_repair_by_sort() and maria_repair_parallel()
of bugfix made to maria_repair() yesterday.
Fail "bk delta" (and thus "bk citool") if an added or modified line
of a C/C++ file has white space at end of line
BitKeeper/triggers/pre-delta:
detection gave false alarm on added newline
storage/maria/ma_check.c:
propagation to maria_repair_by_sort() and maria_repair_parallel()
of bugfix made to maria_repair() yesterday. No effect now as
those two repair variants are never used with BLOCK_RECORD.
Diffstat (limited to 'BitKeeper')
| -rwxr-xr-x | BitKeeper/triggers/pre-delta | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/BitKeeper/triggers/pre-delta b/BitKeeper/triggers/pre-delta index cd861703bb5..d6afe0905e7 100755 --- a/BitKeeper/triggers/pre-delta +++ b/BitKeeper/triggers/pre-delta @@ -20,3 +20,18 @@ then exit 1 fi +# detect if C/C++ files have new trailing white space +trailingblank=`echo $BK_FILE | egrep '\.(c|.h)'` +if [ -n "$trailingblank" ] +then + trailingblank=`bk diffs $BK_FILE | grep '^> .*[[:space:]]$'` + if [ -n "$trailingblank" ] + then + echo "bk diffs $BK_FILE | grep '^> .*[[:space:]]$'" + echo "reported white space at end of some added/modified lines" + echo "" + echo "Checkin FAILED!" + echo "Fix the problem and retry." + exit 1 + fi +fi |