Git SVN Gateway
|
b945a74f9b
|
Bail out when pushing to the git repository fails.
|
2009-11-23 18:47:00 +01:00 |
Gerard Krol
|
2786cfc1e9
|
Add the --squash flag to gitsvngateway. With --squash it will not try to unravel any merges but instead commit it as one change.
|
2009-04-20 19:53:13 +02:00 |
|
Gerard Krol
|
3000958bca
|
Swap the order of the arguments when calling same_commit to check if we need to push, because only old..new seems to work correctly.
|
2009-03-19 00:57:29 +01:00 |
|
Gerard Krol
|
31d09e583c
|
Replace slashes by underscores for the gitsvngateway merge filename, and don't make it return a non-zero exit code when the --dry-run was successful.
|
2009-03-18 18:37:17 +01:00 |
|
Gerard Krol
|
596f6c38a1
|
Add a --no-fetch option to gitsvngateway to increase the speed of running it over a lot of branches.
|
2009-03-18 18:13:41 +01:00 |
|
Gerard Krol
|
4d230332a1
|
Add an --automatic switch to gitsvngateway, where it will not ask to merge changes but instead abort.
|
2009-03-18 17:58:42 +01:00 |
|
Gerard Krol
|
c11e05a058
|
Use getopt to parse options for gitsvngateway and add the --dry-run, --prefix and --remote options.
|
2009-03-18 17:58:33 +01:00 |
|
Gerard Krol
|
0abfe13c4c
|
Use the _gitsvngateway prefix for internally used branches.
|
2009-03-18 15:19:58 +01:00 |
|
Gerard Krol
|
e58d41d67a
|
gitsvngateway no longer uses a file to store its state but instead determines it by checking if certain branches exist.
|
2009-03-18 14:44:35 +01:00 |
|
Gerard Krol
|
b43712ec75
|
Add some checks to gitsvngateway to speed up execution when there are no changes.
|
2009-03-18 14:01:04 +01:00 |
|
Gerard Krol
|
799ce310e1
|
Small changes to make gitsvngateway work with Git 1.6.0.6.
|
2009-03-18 13:17:52 +01:00 |
|
Gerard Krol
|
64d4b710c2
|
Use a slightly more robust way of detecting merges. It still is ugly though.
|
2009-03-17 20:16:05 +01:00 |
|
Gerard Krol
|
0a3467af02
|
Small cleanup of gitsvngateway, the code should be more robust now.
|
2009-03-17 16:50:18 +01:00 |
|
Gerard Krol
|
bd0d42dcc0
|
The gitsvngateway now uses git cherry-pick instead of git merge --squash to prevent merge conflicts.
|
2009-03-17 16:23:45 +01:00 |
|
Gerard Krol
|
0f53e9ecf0
|
Use colour to print the messages from gitsvngateway to better separate them from the output from the Git commands.
|
2009-03-17 14:20:12 +01:00 |
|
Gerard Krol
|
f52d181826
|
The gitsvngateway script now allows you to check what it is about to commit. It also tries to unravel a merge and commit the individual changes to SVN.
|
2009-03-17 13:53:31 +01:00 |
|
Gerard Krol
|
1b5816f89b
|
Add "gitsvngateway", a script to pass commits from Git to SVN and from SVN to Git.
|
2009-03-17 11:20:25 +01:00 |