diff options
| author | Tzafrir Cohen <tzafrir@cohens.org.il> | 2010-08-03 17:14:53 +0300 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir@cohens.org.il> | 2010-08-03 17:14:53 +0300 |
| commit | 99c733fef96b6fbc920285a498a19ead9c539fce (patch) | |
| tree | 1178dc4470f9e43b458b72ed16eee2d64c4f0217 | |
| parent | b59f1eb4596a7e6668838515a3cb6e0714f4aaa6 (diff) | |
version_hack: fix PROJ_PAT; ignore .version
* A typo prevented PROJ_PAT from working for libpri and asterisk
* Also ignore the generated .version on dahdi-tools and asterisk.
* What about libpri?
| -rw-r--r-- | asterisk_gitignore | 5 | ||||
| -rw-r--r-- | dahdi-tools_gitignore | 5 | ||||
| -rwxr-xr-x | version_hook | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/asterisk_gitignore b/asterisk_gitignore index b342e05..ebb6ebb 100644 --- a/asterisk_gitignore +++ b/asterisk_gitignore @@ -92,3 +92,8 @@ doc/tex/asterisk.log doc/tex/asterisk.out doc/tex/asterisk.pdf doc/tex/asterisk.toc + +# Allow us to have a .version file that will not clash with the one from the +# tags: +# Also ignores the obsolete xpp version file. +.version diff --git a/dahdi-tools_gitignore b/dahdi-tools_gitignore index 7a1e3b4..beeb59c 100644 --- a/dahdi-tools_gitignore +++ b/dahdi-tools_gitignore @@ -51,3 +51,8 @@ xpp/perlcheck xpp/test_parse xpp/xpp_blink.8 xpp/xpp_sync.8 + +# Allow us to have a .version file that will not clash with the one from the +# tags: +# Also ignores the obsolete xpp version file. +.version diff --git a/version_hook b/version_hook index e3a813a..f7bc4d3 100755 --- a/version_hook +++ b/version_hook @@ -6,7 +6,7 @@ # Originally by Shaun Ruffel # FIXME: Nicer formatting. Preprocess? -PROJ_PAT="\(dahdi/linux\|dahdi/tools\|asterisk\/libpri\)" +PROJ_PAT="\(dahdi/linux\|dahdi/tools\|asterisk\|libpri\)" # Do not update the .version file if it's part of the repository # This normally means we're on a tags/ branch. |