X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/722fec866aca165c9c2035b008579c5e7a344547..77c0face3a66d71cb73f4c5444d0c45bf3bb6aa1:/tools/git-hooks/clang-format.pre-commit diff --git a/tools/git-hooks/clang-format.pre-commit b/tools/git-hooks/clang-format.pre-commit index 65ff57fca1..ccaa385004 100755 --- a/tools/git-hooks/clang-format.pre-commit +++ b/tools/git-hooks/clang-format.pre-commit @@ -1,17 +1,17 @@ #!/usr/bin/env bash # Copyright (c) 2015, David Martin. All rights reserved. -# Copyright (c) 2017, The SimGrid team. All rights reserved. -# +# Copyright (c) 2017-2020. 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: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -198,7 +198,7 @@ printf "\nThe following differences were found between the code to commit " printf "and the clang-format rules:\n\n" cat "${patch}" -printf "\nYou can apply these changes and readd the files with:\n" +printf "\nYou can apply these changes and read the files with:\n" printf " git apply ${patch} && git apply --cached ${patch}\n" printf "(call this command from the root directory of your repository)\n" printf "\n\n\n"