Pick the best available clang-format version

and also, update copyright info

diff --git a/tools/git-hooks/clang-format.pre-commit b/tools/git-hooks/clang-format.pre-commit
index ed62682..65ff57f 100755 (executable)
--- a/tools/git-hooks/clang-format.pre-commit
+++ b/tools/git-hooks/clang-format.pre-commit
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #!/usr/bin/env bash

-# Copyright (c) 2015, David Martin
-# All rights reserved.
+# Copyright (c) 2015, David Martin. All rights reserved.
+# Copyright (c) 2017, The SimGrid team. All rights reserved.

 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:


@@ -27,11 +27,13 @@
 #   - abort commit when commit does not comply with the style guidelines
 #   - create a patch of the proposed style changes
 
 #   - abort commit when commit does not comply with the style guidelines
 #   - create a patch of the proposed style changes
 

-# modifications for clang-format by rene.milk@wwu.de
+# Modifications for clang-format by rene.milk@wwu.de

 # This file is part of a set of unofficial pre-commit hooks available
 # at github.
 # Link:    https://github.com/githubbrowser/Pre-commit-hooks
 # This file is part of a set of unofficial pre-commit hooks available
 # at github.
 # Link:    https://github.com/githubbrowser/Pre-commit-hooks

-# Contact: David Martin, david.martin.mailbox@googlemail.com
+
+# Modifications for modern clang formats and other improvements as part of the SimGrid project.
+# See git logs for the detail of changes.

 
 ##################################################################
 # Settings
 
 ##################################################################
 # Settings


@@ -50,7 +52,7 @@ FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx"
 
 ##################################################################
 # Potential names for clang-format (debian...)
 
 ##################################################################
 # Potential names for clang-format (debian...)

-CLANG_FMT_PNAMES=(clang-format clang-format-3.8 clang-format-3.9 clang-format-4.0 clang-format-5.0)
+CLANG_FMT_PNAMES=(clang-format clang-format-5.0 clang-format-4.0 clang-format-3.9 clang-format-3.8)

 CLANG_FMT_CMD="NOT-FOUND"
 GIT_CLANG_FMT_CMD="NOT-FOUND"
 
 CLANG_FMT_CMD="NOT-FOUND"
 GIT_CLANG_FMT_CMD="NOT-FOUND"