Add more aliases for signed tags/commits

[max/saltfiles.git] / states / git / init.sls

diff --git a/states/git/init.sls b/states/git/init.sls
index 4d80ea07115339265a2c8d3ba358555ffb2fd208..4e2764a97c52869c9e1fc8aec031003d29bd22f2 100644 (file)
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -2,7 +2,7 @@ include:
   - git.{{ grains['os'] | lower }}
 
 
-{% set git_vars = {
+{% set git_confs = {
   'color.ui': 'true',
   'color.branch': 'always',
   'color.status': 'always',
@@ -20,15 +20,29 @@ include:
   'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
   'alias.struct': 'struct = log --graph --full-history --all --pretty=format:\'%ad %s %Creset %C(yellow)%d%Creset\' --date=short --simplify-by-decoration',
   'alias.co': 'checkout',
-  'alias.ci': 'commit',
+  'alias.ci': 'commit -S',
+  'alias.commit': 'commit -S',
   'alias.st': 'status',
+  'alias.vh': 'verify-commit HEAD',
+  'alias.vc': 'verify-commit',
+  'alias.vt': 'tag -v',
+  'alias.tag': 'tag -s',
+  'alias.t': 'tag -s',
 }
 %}
 
-{% for var,val in git_vars.items() %}
+{% for var,val in git_confs.items() %}
 {{ var }}:
   git.config_set:
     - value: {{ val }}
     - global: True
     - user: {{ grains['user'] }}
 {% endfor %}
+
+global gitignore:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.gitignore
+    - source: {{ grains['stateroot'] }}/git/files/gitignore
+    - mode: 644
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}