Archive for the ‘git’ Category
Posted by jpluimers on 2020/06/18
Based on [WayBack] tfs – How to retrieve the hash for the current commit in Git? – Stack Overflow
Get current hash:
git rev-parse HEAD
Show summary of current commit, including hash:
git show --summary
Show all hashes of all branches (both in heads and in remotes) and tags:
git show-ref
Get current hash with a * marking if it is dirty:
git describe --always --abbrev=0 --match "NOT A TAG" --dirty="*"
The last one was [WayBack] answered by [WayBack] Rado:
display the full sha1 of the commit, but append an asterisk to the end if the working directory is not clean. …
Here is the one liner that does:
git describe --always --abbrev=0 --match "NOT A TAG" --dirty="*"
Result: f5366ccb21588c0d7a5f7d9fa1d3f85e9f9d1ffe*
Explanation: describes (using annotated tags) the current commit, but only with tags containing “NOT A TAG”. Since tags cannot have spaces, this never matches a tag and since we want to show a result --always, the command falls back displaying the full (--abbrev=0) sha1 of the commit and it appends an asterisk if the working directory is --dirty.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/05/26
It’s a few steps as per [WayBack] How to move Git submodule to sub-directory? – Stack Overflow, so I’m not sure it is the best solution, but it at least works (thanks Philzen):
Had the same problem just the moment ago and ended up deleting the submodule reference (as outlined in this article) and recreating it where i wanted it to go.
To follow your example of moving submodule jquery into repos/jquery
- Delete the (typically three lines) submodule reference from
.gitmodules.
- Check
.git/config for references to the submodule and remove them, if existent
- do
git rm --cached jquery to cut the submodule reference out of the repository
- remove the old submodule folder
- recreate you submodule reference (as you possibly did before) with
git submodule add git://github.com/jquery/jquery.git repos/jquery
In case your submodule was set to specific tag, respectively commit (which you’ll surely have in a stable project) you will have set it again.
Due to this complex process i am strongly hoping there is (or will be, at least on the git roadmap) a more straightforward way of achieving this. If not, surely some scripts could be fumbled together to do this quicker…
References:
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/04/30
Based on [WayBack] version control – How do I do an initial push to a remote repository with Git? – Stack Overflow, this is what I do:
On the server
mkdir my_project.git
cd my_project.git
git --bare init
On the client
mkdir my_project
cd my_project
touch .gitignore
git init
git add . git
commit -m "Initial commit"
git remote add origin youruser@yourserver.com:/path/to/my_project.git
git push --set-upstream origin master
The last one is important, especially when you have multiple remotes.
Some servers allow you to skip the server part, as they run them automatically when pushing a new repository from the client.
This can be both an advantage and a disadvantage, for instance when you have typos when adding the remote.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/04/14
I’ve used these excellent posts to find out which youtube-dl version started to exhibit troublesome NPO downloads, then later find the actual failing commit:
Why the effort? I needed an as recent as possible youtube-dl working on as many sites as possible because of some work preparation.
The first link is very important because brew versions and alternatives have stopped working some 6 years ago, even though they turn up high on Google searches for brew install specific version. Hence the quote from the first link:
Installing software packages on Mac is very easy with homebrew. You typically get the latest version, however often in production you do not have the latest version of a software package. Another use case is when you upgrade to the latest and you find out there is bug which blocks you doing something. In this case you would like to downgrade to the previous version until the bug is fixed.In both cases you need to install a specific version of a software package with homebrew on your Mac, which tends to be not that trivial. There is a lot of discussion about this on stackoverflow but some of them are outdated based on brew versions which is not available anymore.
Read the rest of this entry »
Posted in Apple, Conference Topics, Conferences, Development, DVCS - Distributed Version Control, Event, git, Home brew / homebrew, Power User, SocialMedia, Software Development, Source Code Management, YouTube | Leave a Comment »
Posted by jpluimers on 2020/04/07
At the time of writing:
- Rendering svg files at gitlab is impossible, as they are served with a http result 404; see
- Rendering svg files on gitea is possible either, despite a co-worker suggesting to remove the below DOCTYPE from the .svg file, see
<!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:
- Press
Cmd–Shift–P
- Type
show git output
- Press enter
–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 deinit
git 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>
deinit
Un-register the given submodules, i.e. remove the whole submodule.$name
section from .git/config together with their work tree.
Further calls to git submodule update, git submodule foreach and git submodule sync will 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 --force is 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/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.
Read the rest of this entry »
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management | Leave a Comment »
The Wiert Corner - irregular stream of stuff 