Ticket #6653 (closed: fixed)
Create some high-level git macros to support our new workflow
| Reported by: | Martyn Gigg | Owned by: | Martyn Gigg |
|---|---|---|---|
| Priority: | major | Milestone: | Release 2.5 |
| Component: | Mantid | Keywords: | |
| Cc: | Blocked By: | ||
| Blocking: | Tester: | Russell Taylor |
Description
The commands listed [www.mantidproject.org/Git_Workflow here] could be simplified if wrapped up in suitable macros in a similar way to https://github.com/nvie/gitflow.
Change History
comment:2 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: df1cdc69279a48df710afd7a2f88e15f057b9814
comment:3 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: 4c71f20cb0e835392ebc58e7169a167c4afbb75b
comment:4 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: df1cdc69279a48df710afd7a2f88e15f057b9814
comment:5 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: 4c71f20cb0e835392ebc58e7169a167c4afbb75b
comment:6 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 6924acad708bea520703461f255fe843ca78e5e7
comment:7 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: a066697cdd9a10503393d4bbe18bd6e4e1c5b162
comment:8 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: fab3df01ed7c1a6103a7a0a44a5fa1ee5cfcdab4
comment:9 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: edbbc91c4de38238197c9b414002326241dc42cd
comment:10 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 34d7d3a0ce4124940d369714709fef1a85a5c2f0
comment:11 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 853ae906c106b95e45d5aa93be901c5895e52d1c
comment:12 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: 9ab0b03f000c8c9a9f0aa8cc81c99eac9257d99b
comment:13 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1db0b13c7466d03543db194d438634bd1b7fd469
comment:14 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 20f0cd7de14944e4f63d8372595b26fc1a3a58e8
comment:15 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: a4efd894d1ba0f1a16169222a5f993e59e1b1ab2
comment:16 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: e0a3cd6670f5e09db9202553c690f6eb3a200227
comment:17 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: 3c2646dddf649843666ad35ce64769974d70d9c6
comment:18 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 2acf6f9def1c046073ad7446742cd6535c5090c3
comment:19 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: a066697cdd9a10503393d4bbe18bd6e4e1c5b162
comment:20 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: fab3df01ed7c1a6103a7a0a44a5fa1ee5cfcdab4
comment:21 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: edbbc91c4de38238197c9b414002326241dc42cd
comment:22 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 34d7d3a0ce4124940d369714709fef1a85a5c2f0
comment:23 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 853ae906c106b95e45d5aa93be901c5895e52d1c
comment:24 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: 9ab0b03f000c8c9a9f0aa8cc81c99eac9257d99b
comment:25 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1db0b13c7466d03543db194d438634bd1b7fd469
comment:26 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 20f0cd7de14944e4f63d8372595b26fc1a3a58e8
comment:27 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: a4efd894d1ba0f1a16169222a5f993e59e1b1ab2
comment:28 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: e0a3cd6670f5e09db9202553c690f6eb3a200227
comment:29 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: 3c2646dddf649843666ad35ce64769974d70d9c6
comment:30 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 2acf6f9def1c046073ad7446742cd6535c5090c3
comment:31 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: c872a6c466e1d768155919beaaf19857c2658c10
comment:32 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: 6c773d10c82b36cfaebba0e3ce0406b738d2f0c4
comment:33 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 0712cc5b01906f3507c3581c3e81161dfcfdafc9
comment:34 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: d31ea4bcc0710e56ed5b1828cf6b2c17b2fb856f
comment:35 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 6e0624b7fd6b17287130575b65b37a6aec2a27b7
comment:36 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 922994345b2b1a418cd5ab1ee5ee1667538a0ee6
comment:37 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: 61d265d39bc5803df5519cae7681bd832b8ed6cd
comment:38 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: c60ad97b1bf1cda199b951927756a052daeddcd0
comment:39 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 4101880835e645dd7b24ab7e7f46a7c06e7c67a6
comment:40 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 7229f0734ccd94a45e6ba0cdf8259ef4de2a166a
comment:41 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 08bf251b57727e93700faa0ec19acb4dcecd1df8
comment:42 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: abe034c93ba991ffccc8cd25dc1427a51abf96fa
comment:43 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1263738e3520649184a37051e2c2f90847f096b5
comment:44 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 64f76b1cadfcec2336c6cdd4b30e30222f451d8a
comment:45 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 892fc1d3de51e87f1c1b2b9d086011676721ae6f
comment:46 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 7c3b9513facca46cfe46f02d969c8f196216096a
comment:47 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: a14e88ce7fb5ed1e2995faa71d61486384802f3a
comment:48 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 105b9543979f0222fa903b9bcf2caf1a75f3aedc
comment:49 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 062876bfc8942906143dd3a0ef0981bd8226966b
comment:50 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: b1f07680dfb01763082be5b8ee0e26ee3c018392
comment:51 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 8a11f199e813e24131587d8d7dda6ed7696bfc44
comment:52 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: b4995839d4e2d3f7de0b96bbef81a2c4b2afc736
comment:53 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 2397c960836874745e64f1a8c371df417df8932e
comment:54 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: edcbaf9ab1e1d0155ed26ad7ca92ebcac5e24aa9
comment:55 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 78c3fe0cc50e02f24f41cdd1c9023c4cfa5f7ce1
comment:56 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 10433cb86d55f973aa9f8bc60b82c2f03ed36d8b
comment:57 Changed 8 years ago by Martyn Gigg
- Status changed from new to accepted
- Owner set to Martyn Gigg
comment:58 Changed 8 years ago by Martyn Gigg
- Status changed from accepted to verify
- Resolution set to fixed
Tester: See setup section at www.mantidproject.org/Git_Workflow for more details
Branch: feature/6653_workflow_macros
I strongly advise testing this on new sandbox repository that you can create under your user account on github as it does involve pushing to the remote in places and if anything is wrong then it would be better not to potentially mess up the main code repo.
comment:59 Changed 8 years ago by Russell Taylor
- Status changed from verify to verifying
- Tester set to Russell Taylor
comment:60 Changed 8 years ago by Russell Taylor
Early observations from testing.
- If your remote isn't called 'origin' things don't work at all. I deliberately made that happen - don't know if it could happen 'by accident'.
- I wonder if git test start could accept just the ticket number?
- On the mac I'm getting a text editor thrown up for every merge commit, which is a bit annoying but I guess something independent of these macros.
comment:61 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:62 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:63 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:64 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:65 Changed 8 years ago by Russell Taylor
- Status changed from verifying to closed
This is really nice and I haven't managed to break this in any significant way. I used the macros to complete the testing of this ticket!
Some comments and issues to address in a future ticket:
- The log of the diff doesn't work on Windows (git bash or command window). There's an error message in there about an ambiguous redirect. This is a pity as this is the only platform where I can't click on the URL either.
- I'd like git test start to check that the branch has been merged to develop. We'll have to figure out how to handle this if develop has been reset.
- It seems like it might be possible to add these commands to git-gui (see Tools->Add), but I didn't get it to fully work (it called, e.g., git new but not correctly).
- The developer still has to delete their local branch themselves. I think this is good as they will need to go back to it if testing fails, but it should be documented somewhere.
- Things error out if a developer does not have a local develop branch. This is not a problem now, but may cause confusion in the future for new clones or developers.
- I was wondering if this could hook into trac as well, but maybe we don't want to go there.
comment:66 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: 61d265d39bc5803df5519cae7681bd832b8ed6cd
comment:67 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: c60ad97b1bf1cda199b951927756a052daeddcd0
comment:68 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 4101880835e645dd7b24ab7e7f46a7c06e7c67a6
comment:69 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 7229f0734ccd94a45e6ba0cdf8259ef4de2a166a
comment:70 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 08bf251b57727e93700faa0ec19acb4dcecd1df8
comment:71 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: abe034c93ba991ffccc8cd25dc1427a51abf96fa
comment:72 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1263738e3520649184a37051e2c2f90847f096b5
comment:73 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 64f76b1cadfcec2336c6cdd4b30e30222f451d8a
comment:74 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 892fc1d3de51e87f1c1b2b9d086011676721ae6f
comment:75 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 7c3b9513facca46cfe46f02d969c8f196216096a
comment:76 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: a14e88ce7fb5ed1e2995faa71d61486384802f3a
comment:77 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 105b9543979f0222fa903b9bcf2caf1a75f3aedc
comment:78 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 062876bfc8942906143dd3a0ef0981bd8226966b
comment:79 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: b1f07680dfb01763082be5b8ee0e26ee3c018392
comment:80 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 8a11f199e813e24131587d8d7dda6ed7696bfc44
comment:81 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: b4995839d4e2d3f7de0b96bbef81a2c4b2afc736
comment:82 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 2397c960836874745e64f1a8c371df417df8932e
comment:83 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: edcbaf9ab1e1d0155ed26ad7ca92ebcac5e24aa9
comment:84 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 78c3fe0cc50e02f24f41cdd1c9023c4cfa5f7ce1
comment:85 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 10433cb86d55f973aa9f8bc60b82c2f03ed36d8b
comment:86 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:87 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:88 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: 61d265d39bc5803df5519cae7681bd832b8ed6cd
comment:89 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: c60ad97b1bf1cda199b951927756a052daeddcd0
comment:90 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 4101880835e645dd7b24ab7e7f46a7c06e7c67a6
comment:91 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 7229f0734ccd94a45e6ba0cdf8259ef4de2a166a
comment:92 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 08bf251b57727e93700faa0ec19acb4dcecd1df8
comment:93 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: abe034c93ba991ffccc8cd25dc1427a51abf96fa
comment:94 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1263738e3520649184a37051e2c2f90847f096b5
comment:95 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 64f76b1cadfcec2336c6cdd4b30e30222f451d8a
comment:96 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 892fc1d3de51e87f1c1b2b9d086011676721ae6f
comment:97 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 7c3b9513facca46cfe46f02d969c8f196216096a
comment:98 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: a14e88ce7fb5ed1e2995faa71d61486384802f3a
comment:99 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 105b9543979f0222fa903b9bcf2caf1a75f3aedc
comment:100 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 062876bfc8942906143dd3a0ef0981bd8226966b
comment:101 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: b1f07680dfb01763082be5b8ee0e26ee3c018392
comment:102 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 8a11f199e813e24131587d8d7dda6ed7696bfc44
comment:103 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: b4995839d4e2d3f7de0b96bbef81a2c4b2afc736
comment:104 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 2397c960836874745e64f1a8c371df417df8932e
comment:105 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: edcbaf9ab1e1d0155ed26ad7ca92ebcac5e24aa9
comment:106 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 78c3fe0cc50e02f24f41cdd1c9023c4cfa5f7ce1
comment:107 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 10433cb86d55f973aa9f8bc60b82c2f03ed36d8b
comment:108 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:109 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:110 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: 61d265d39bc5803df5519cae7681bd832b8ed6cd
comment:111 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: c60ad97b1bf1cda199b951927756a052daeddcd0
comment:112 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 4101880835e645dd7b24ab7e7f46a7c06e7c67a6
comment:113 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 7229f0734ccd94a45e6ba0cdf8259ef4de2a166a
comment:114 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 08bf251b57727e93700faa0ec19acb4dcecd1df8
comment:115 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: abe034c93ba991ffccc8cd25dc1427a51abf96fa
comment:116 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1263738e3520649184a37051e2c2f90847f096b5
comment:117 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 64f76b1cadfcec2336c6cdd4b30e30222f451d8a
comment:118 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 892fc1d3de51e87f1c1b2b9d086011676721ae6f
comment:119 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 7c3b9513facca46cfe46f02d969c8f196216096a
comment:120 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: a14e88ce7fb5ed1e2995faa71d61486384802f3a
comment:121 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 105b9543979f0222fa903b9bcf2caf1a75f3aedc
comment:122 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 062876bfc8942906143dd3a0ef0981bd8226966b
comment:123 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: b1f07680dfb01763082be5b8ee0e26ee3c018392
comment:124 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 8a11f199e813e24131587d8d7dda6ed7696bfc44
comment:125 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: b4995839d4e2d3f7de0b96bbef81a2c4b2afc736
comment:126 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 2397c960836874745e64f1a8c371df417df8932e
comment:127 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: edcbaf9ab1e1d0155ed26ad7ca92ebcac5e24aa9
comment:128 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 78c3fe0cc50e02f24f41cdd1c9023c4cfa5f7ce1
comment:129 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 10433cb86d55f973aa9f8bc60b82c2f03ed36d8b
comment:130 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:131 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:132 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: ebb7ef28890496067ec43f8dfc4798914238a2fb
comment:133 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: b92c7de47b57fe815987bdc7de2ad6a1cf864a06
comment:134 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 3389215567ad8b5054227b46df9314bdd3cdaa6a
comment:135 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 9e9b408b2b9e0d59607e50ff8b11084f7a9a1cc1
comment:136 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: d9597c087dc432f88ef3d14b270290551229d8f8
comment:137 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: 301aa885d5be9434e65cbf2717a6e23cf2956f17
comment:138 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 5cccf6468f3eadb8109c5e195c2f6c8514d28c95
comment:139 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 25d9bc9faf769a96e001613b5a112eff0990c869
comment:140 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 464cb9cb9647f519cd0b660301d96fcca60a828b
comment:141 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 1f5ae9d1203383f6ec4f867d5d1cc8790523f7fe
comment:142 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: 157da66afa74d3f76d5533b6e1bce4a8ab538b7a
comment:143 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 8b0ebd7e9b4159ba6247ff9083644bd39c18ad53
comment:144 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 4e17efb08ae35e67a837de1df60e9a13e1efd9b6
comment:145 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: 50f16a0c6023d603afab6ec4e11de1c3b5f78dbb
comment:146 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 35320aae14f8b9e5b1d50d91b51354d0d43fc1a9
comment:147 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: ae78626009e55dbc36654300038d968fe24bae62
comment:148 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 4cc0def74748e990e4bd79c68a2c135f078def11
comment:149 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: 51877bcbdfdb20b26a0b4424c1799cbf3e703ce0
comment:150 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 238c7198c1a0897bc649d83f1fa02bedfe4947e2
comment:151 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: bb5f0cda745f5b6d7f280fb546e14b94699c479d
comment:152 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: e8a08b9f748393aa63824ffca5d3bf8a8aec9332
comment:153 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: e07bcf8b4a97a6a8dfee9dfc34a7b1278262569b
comment:154 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: 61d265d39bc5803df5519cae7681bd832b8ed6cd
comment:155 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: c60ad97b1bf1cda199b951927756a052daeddcd0
comment:156 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 4101880835e645dd7b24ab7e7f46a7c06e7c67a6
comment:157 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 7229f0734ccd94a45e6ba0cdf8259ef4de2a166a
comment:158 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 08bf251b57727e93700faa0ec19acb4dcecd1df8
comment:159 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: abe034c93ba991ffccc8cd25dc1427a51abf96fa
comment:160 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1263738e3520649184a37051e2c2f90847f096b5
comment:161 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 64f76b1cadfcec2336c6cdd4b30e30222f451d8a
comment:162 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 892fc1d3de51e87f1c1b2b9d086011676721ae6f
comment:163 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 7c3b9513facca46cfe46f02d969c8f196216096a
comment:164 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: a14e88ce7fb5ed1e2995faa71d61486384802f3a
comment:165 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 105b9543979f0222fa903b9bcf2caf1a75f3aedc
comment:166 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 062876bfc8942906143dd3a0ef0981bd8226966b
comment:167 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: b1f07680dfb01763082be5b8ee0e26ee3c018392
comment:168 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 8a11f199e813e24131587d8d7dda6ed7696bfc44
comment:169 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: b4995839d4e2d3f7de0b96bbef81a2c4b2afc736
comment:170 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 2397c960836874745e64f1a8c371df417df8932e
comment:171 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: edcbaf9ab1e1d0155ed26ad7ca92ebcac5e24aa9
comment:172 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 78c3fe0cc50e02f24f41cdd1c9023c4cfa5f7ce1
comment:173 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 10433cb86d55f973aa9f8bc60b82c2f03ed36d8b
comment:174 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:175 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:176 Changed 8 years ago by Martyn Gigg
Skeleton structure for workflow macro git-new. Refs #6653
Just prints usage.
Changeset: 61d265d39bc5803df5519cae7681bd832b8ed6cd
comment:177 Changed 8 years ago by Martyn Gigg
Fleshing out git-new & git-checkbuild. Refs #6653
Changeset: c60ad97b1bf1cda199b951927756a052daeddcd0
comment:178 Changed 8 years ago by Martyn Gigg
Implemented git-new. Refs #6653
Changeset: 4101880835e645dd7b24ab7e7f46a7c06e7c67a6
comment:179 Changed 8 years ago by Martyn Gigg
Cleanup arg checking and add auto stash. Refs #6653
Changeset: 7229f0734ccd94a45e6ba0cdf8259ef4de2a166a
comment:180 Changed 8 years ago by Martyn Gigg
Factor out helper routines. Refs #6653
Changeset: 08bf251b57727e93700faa0ec19acb4dcecd1df8
comment:181 Changed 8 years ago by Martyn Gigg
Add git checkbuild command. Refs #6653
Changeset: abe034c93ba991ffccc8cd25dc1427a51abf96fa
comment:182 Changed 8 years ago by Martyn Gigg
Add batch file to install on Windows. Refs #6653
Minor fixes for windows paths Update readme with install instructions
Changeset: 1263738e3520649184a37051e2c2f90847f096b5
comment:183 Changed 8 years ago by Martyn Gigg
Add git finish command file. Refs #6653
Needs additional check as to whether branch is fully merged to develop.
Changeset: 64f76b1cadfcec2336c6cdd4b30e30222f451d8a
comment:184 Changed 8 years ago by Martyn Gigg
Implement 'git finish'. Refs #6653
Changeset: 892fc1d3de51e87f1c1b2b9d086011676721ae6f
comment:185 Changed 8 years ago by Martyn Gigg
Normalise line endings in workflow scripts. Refs #6653
Replacing tabs with spaces and using 4 spaces consistently
Changeset: 7c3b9513facca46cfe46f02d969c8f196216096a
comment:186 Changed 8 years ago by Martyn Gigg
Start implementation of git test. Refs #6653
Changeset: a14e88ce7fb5ed1e2995faa71d61486384802f3a
comment:187 Changed 8 years ago by Martyn Gigg
Finish git test macro. Refs #6653
Changeset: 105b9543979f0222fa903b9bcf2caf1a75f3aedc
comment:188 Changed 8 years ago by Martyn Gigg
Add Linux Makefile Refs #6653.
Changeset: 062876bfc8942906143dd3a0ef0981bd8226966b
comment:189 Changed 8 years ago by Martyn Gigg
Alter git-checkbuild to delete local develop first and then recreate
it from origin/develop before merging. Refs #6653
Changeset: b1f07680dfb01763082be5b8ee0e26ee3c018392
comment:190 Changed 8 years ago by Martyn Gigg
Fix variable reference in git-checkbuild. Refs #6653
Changeset: 8a11f199e813e24131587d8d7dda6ed7696bfc44
comment:191 Changed 8 years ago by Martyn Gigg
git checkbuild detects forced updates of develop. Refs #6653.
It deletes the local copy and stops.
Changeset: b4995839d4e2d3f7de0b96bbef81a2c4b2afc736
comment:192 Changed 8 years ago by Martyn Gigg
Rework git-checkbuild to account for failed merges and
forced updates. Refs #6653
Changeset: 2397c960836874745e64f1a8c371df417df8932e
comment:193 Changed 8 years ago by Martyn Gigg
git-finish now requires branch to be merged to develop. Refs #6653
Changeset: edcbaf9ab1e1d0155ed26ad7ca92ebcac5e24aa9
comment:194 Changed 8 years ago by Martyn Gigg
Use git config --unset instead. Refs #6653
This doesn't print an error if it doesn't exist
Changeset: 78c3fe0cc50e02f24f41cdd1c9023c4cfa5f7ce1
comment:195 Changed 8 years ago by Martyn Gigg
Improve "git test" macro Refs #6653
It now
- asks if you're sure you wish to push when passing a test (just in
case of a mistyping)
- prints a list of changes on the branch & directs tester to a pretty
view on github
Changeset: 10433cb86d55f973aa9f8bc60b82c2f03ed36d8b
comment:196 Changed 8 years ago by Martyn Gigg
Force git to automerge silently if merge succeeded. Refs #6653
Changeset: f4a302054f6ab83c4ed0b5bd03066c142b87acff
comment:197 Changed 8 years ago by Martyn Gigg
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Changeset: f264404b7e57c31b34bc83fc5dd0eeecf6c6056b
comment:198 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 7499
Skeleton structure for git extensions. Refs #6653