Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

hooks/pre-commit: check .top* files in the to-be-commited tree

We currently check fo these files only in the working tree. But we should check
what would be commited. We use write-tree to be able to utilize ls-tree and
check the result.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  • Loading branch information...
commit 1fb84a0250902fdf93bb0de335625975bd69734b 1 parent 294846d
@bertwesarg bertwesarg authored Uwe Kleine-König committed
Showing with 31 additions and 5 deletions.
  1. +31 −5 hooks/pre-commit.sh
View
36 hooks/pre-commit.sh
@@ -29,10 +29,36 @@ else
exit 0;
fi
-# TODO: check the index, not the working copy
-[ -s "$root_dir/.topdeps" ] ||
- die ".topdeps is missing"
-[ -s "$root_dir/.topmsg" ] ||
- die ".topmsg is missing"
+check_topfile()
+{
+ local tree file ls_line type size
+ tree=$1
+ file=$2
+
+ ls_line="$(git ls-tree --long "$tree" "$file")" ||
+ die "Can't ls tree for $file"
+
+ [ -n "$ls_line" ] ||
+ die "$file is missing"
+
+ # check for type and size
+ set -- $ls_line
+ type=$2
+ size=$4
+
+ # check file is of type blob (file)
+ [ "x$type" = "xblob" ] ||
+ die "$file is not a file"
+
+ # check for positive size
+ [ "$size" -gt 0 ] ||
+ die "$file has empty size"
+}
+
+tree=$(git write-tree) ||
+ die "Can't write tree"
+
+check_topfile "$tree" ".topdeps"
+check_topfile "$tree" ".topmsg"
# TODO: Verify .topdeps for valid branch names and against cycles
Please sign in to comment.
Something went wrong with that request. Please try again.