16 Commits

Author SHA1 Message Date
dahn
6790371fe2
fix merge diff display (#7047) 2023-01-09 11:43:32 +01:00
dahn
3106dba28c
git-pr py3 compatible (#6961)
* py3 print statement

* python3
2022-12-13 15:45:13 +05:30
Remi Bergsma
52edbbb6cc Show actual diff in commits after merge 2015-12-12 11:22:32 +01:00
Remi Bergsma
1e6df1b775 fixed hardcoded merge message location
This would be empty if run from another directory, resulting
in a merge message with only a 'signed-off by' line.
2015-08-24 16:16:16 +02:00
Remi Bergsma
9a24109f95 fix bug where the countdown would be on multiple lines
Example of problem:

ATTENTION: Merging pull request #731 from remibergsma/centos7-kvm into 'master' branch in 5 seconds. CTRL+c to abort..
-n 5
-n 4
-n 3
-n 2
-n 1
-n 0

Should be compatible with more environments if printf is used instead.
2015-08-24 16:00:48 +02:00
Remi Bergsma
fed5c2b06a make it work with any Apache repository mirrored on GitHub 2015-08-24 16:00:30 +02:00
Remi Bergsma
23b9365996 Improve error/help message in case of missing git remote 2015-08-24 11:52:03 +02:00
Miguel Ferreira
9211202bab Add git merge scripts 2015-08-19 17:22:45 +02:00
Rohit Yadav
2491630f51 git: don't let db-police hook fail for no changes in setup/db
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-08 15:52:07 +02:00
Rohit Yadav
8d27c19ae2 tools/git: add git hook to help self police schema changes
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-06 22:37:22 +02:00
Marcus Sorensen
7330deeb2f Summary: Add default newline after summary in prepare-commit-msg
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360171397 -0700
2013-02-06 10:23:17 -07:00
Marcus Sorensen
dc7578c72c Summary: Make prepare-commit-msg hook more compatible with operating systems
Detail: Was using sed -i, which breaks on Mac

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170672 -0700
2013-02-06 10:11:12 -07:00
Marcus Sorensen
6e23cad126 Summary: Add Bugfix-for line to prepare-commit-msg
Detail: This reminds us to tag commits that should be considered for a bugfix
release, making them easier to find/apply and less likely to slip through the
cracks. Individual committers really should know best which things need to be
pushed as an immediate bugfix anyway, this makes it easy to tag things as such.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1352308027 -0700
2012-11-07 10:07:07 -07:00
Chip Childers
4cb934dfa9 Added license header to a new file.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-19 09:41:53 -04:00
Marcus Sorensen
a3c9a2b22d Summary: prepare-commit-msg skip merges, -m flag, squash, template
Detail: prepare-commit-msg now is skipped if -m flag is supplied, if user has
a template defined, if commit is a squash or a merge.

BUG-ID : none
Reviewed-by: Marcus Sorensen <marcus@betterservers.com>
Reported-by: Marcus Sorensen <marcus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1350600822 -0600
2012-10-18 16:53:42 -06:00
Marcus Sorensen
9ba7509c70 Summary: add git prepare-commit-msg file
Detail: CloudStack committers can optionally use this file to prepopulate their
commits with a standard form. The idea was that it would help us get better
commit messages. It is set up locally up by running the following from the root
of the repo:

'ln -s ../../tools/git/prepare-commit-msg .git/hooks/prepare-commit-msg'

Additionally, a different prepare-commit-msg could potentially be committed for
each branch and the link will always point to the one that's checked out.

BUG-ID : none
Reviewed-by: Marcus Sorensen <marcus@betterservers.com>
Reported-by: Rohit Yadav <rohit.yadav@citrix.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1350596087 -0600
2012-10-18 15:34:47 -06:00