Posted by jpluimers on 2020/04/07
At the time of writing:
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">–jeroen
Posted in Development, DVCS - Distributed Version Control, git, gitea, GitHub, GitLab, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/03/31
Since the Git output by default is not shown, here is how to enable it:
[WayBack] Version Control in Visual Studio Code: Git output window
You can always peek under the hood to see the Git commands we are using. This is helpful if something strange is happening or if you are just curious. :)
To open the Git output window, run View > Output and select Git from the dropdown.
Or shorter on MacOS:
Cmd–Shift–Pshow git output–jeroen
Posted in .NET, Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, Visual Studio and tools, vscode Visual Studio Code | Leave a Comment »
Posted by jpluimers on 2020/03/12
There is git submodule add, but no git submodule remove. That one is called git submodule deinit, but still a lot of links on the internet do not mention it, so I’m glad there is a good answer to [WayBack] github – What is the current way to remove a git submodule? – Stack Overflow:
You have the
git submodule deinitgit submodule deinit <asubmodule> git rm <asubmodule> # Note: asubmodule (no trailing slash) # or, if you want to leave it in your working tree git rm --cached <asubmodule> rm -rf .git/modules/<asubmodule>
deinitUn-register the given submodules, i.e. remove the whole
submodule.$name
section from.git/configtogether with their work tree.Further calls to
git submodule update,git submodule foreachandgit submodule syncwill skip any unregistered submodules until they are initialized again, so use this command if you don’t want to have a local checkout of the submodule in your work tree anymore.If you really want to remove a submodule from the repository and commit that use
git rminstead.If
--forceis specified, the submodule’s work tree will be removed even if it contains local modifications.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/03/11
Since the “account.json” SourceTree search did not help me much, below are the steps for installing SourceTree for Windows 3.x on an air-gapped machine.
Prerequisites:
Steps:
"%LocalAppData%\Google\Chrome\Application\chrome.exe" -- "https://bitbucket.org/site/oauth2/authorize?response_type=code&client_id=123456789012345678&state=authenticated&redirect_uri=http://localhost:34106/"https://bitbucket.org/site/oauth2/authorize?response_type=code&client_id=123456789012345678&state=authenticated&redirect_uri=http://localhost:34106/ over and paste it on a machine that has internet accesshttp://localhost:34106/?state=authenticated&code=876543210987654321Now a new file should be in %LocalAppData%\Atlassian\SourceTree\accounts.json suitable for SourceTree 3.x. In the future you might be lucky enough to copy that to a target system before installing.
I was not so lucky, because my accounts.json was SourceTree 2.x based, which the SourceTree 3.x setup modifies, but is still not happy with.
Note these number differ on each request:
123456789012345678 is a base64 encoded request ID876543210987654321 is a base64 encoded response ID34106 is a random TCP port where the installer is listening on to get the authentication informationInitially, I had Fiddler steps in the above, but found out I did not need those. One thing that complicated this is that Fiddler had been removed from Chocolatey for a while, so I was not sure it would stay as a product:
Now has an MSI installer:
Has old steps for 2.x versions to get around the above hoopla:
–jeroen
Posted in Development, DVCS - Distributed Version Control, Software Development, Source Code Management, SourceTree | Leave a Comment »
Posted by jpluimers on 2020/01/30
February 1st, the start commences of Sunsetting Mercurial support in Bitbucket – Bitbucket [WayBack]. Starting June 1st, only git is supported by Bitbucket, despite them having started with and focused mainly Mercurial at first.
Here are the major dates of the sunset:
- February 1, 2020: users will no longer be able to create new Mercurial repositories
- June 1, 2020: users will not be able to use Mercurial features in Bitbucket or via its API and all Mercurial repositories will be removed.
All current Mercurial functionality in Bitbucket will be available through May 31, 2020.
So by now you should have started migrating from Mercurial to git, probably away from BitBucket.
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/01/21
Via [WayBack] Git tips and tricks | GitLab “Handy Git commands for everyday use” I learned these:
git config --global status.submoduleSummary true~/.gitconfig:
[status]
submoduleSummary = true
–jeroen
Via: [WayBack] GitLab on Twitter: Ready to get #backtowork? Brush up on a few tips and tricks we use at GitLab everyday: https://t.co/W8zFjxnSN6
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2019/12/04
I like that you can add git repositories inside eachother using git submodule add but when it’s time to say goodbye to a submodule you need some convoluted statements. So I really wish one day there will be git submodule remove.
Until then, these links will help you to get rid of a git submodule:
TL;DR you have to manually edit the below files:
.gitmodules.git/configThen you need to:
.git/modules–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Posted by jpluimers on 2019/11/27
Since I tend to forget the exact statements for starting a fresh repository and push it to a git hoster like GitHub or GitLab: [WayBack] Git: Push a new or existing repo to Github · GitHub
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, GitHub, GitLab, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2019/11/21
Some interesting thoughts on DVCS: [WayBack] Unorthodocs: Abandon your DVCS and Return to Sanity – bitquabit
Besides the very good point it raises about DVCS (Git, Mercurial and most other DVCSes treat the whole state of the repository as the atom) it also indicates quite a few shortcomings:
I see many other advantages of DVCS systems (for instance that you only need to locally have the branches you are interested in, way better tooling for DVCS systems, ditto for sites hosting DVCS), but it always a good thing to know the weak spots of what you are working with.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2019/11/20
When working with git, often the brevity of a solution is remarkable. Remembering how it can be so short is the hard part. An explanation why helps, for instance with [WayBack] git tag – How to delete a git remote tag? – Stack Overflow by markdorison.
He explains why you end up with:
git push --delete <origin> <tagname>
Here, <origin> is your remote, and <tagname> the tag to delete.
He explains other ways, which is done by [WayBack] gist.github.com/mobilemind/7883996 as well:
| # delete local tag '12345' | |
| git tag -d 12345 | |
| # delete remote tag '12345' (eg, GitHub version too) | |
| git push origin :refs/tags/12345 | |
| # alternative approach | |
| git push –delete origin tagName | |
| git tag -d tagName |
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
The Wiert Corner - irregular stream of stuff 