3 ms·
This is awesome, but with all due respect I also wish git itself was also improved. Goddamn merge commits, and always have to go googling "oh shit how do I era
by dheera 6y ago
This is awesome, but with all due respect I also wish git itself was also improved.
Goddamn merge commits, and always have to go googling "oh shit how do I erase the last commit" when I accidentally commit to master. It should at least spit out a warning if you created a branch and then try to commit to master. Git lfs and git-crypt should be a feature of the main product and not plugins. Files over a certain size should be transparently LFSed without some need to "track" them or install a plugin to fetch them. It's too hard to accidentally forget to encrypt something or LFS something. Gitignore is easy to screw up and accidentally commit a sensitive credentials file. And "git rm" also removes the file locally with no recourse -- that should not be the default behavior.
Also, the whole UX around submodules REALLY sucks ... is it git submodule update --recursive --init? git submodule init --update --recursive? git init submodule --recursive? I can't remember for the life of me. Why can't it auto-clone all submodules when you clone the parent repo, seeing as you kind of need them to do anything? The UX is so bad that I often just copy the contents of the repo instead of using submodules.
- rendall 6y agoThere are "hooks" in git that can be used to modify its behavior, to e.g. "spit out a warning if you created a branch and then try to commit to master" This seems to be a good resource https://githooks.com/ https://githooks.com/
- matkoniecz 6y ago> "spit out a warning if you created a branch and then try to commit to master" How this one may be done? It sounds wonderful but I have no idea how to implement such thing (and if not included in git already, I hope that I can reuse code rather than reimplement it)
- deleted 6y ago[deleted]
- rendall 6y agoOh, hey now. Look at the very bottom of the resource I sent you, under "Snippets" https://githooks.com/ https://githooks.com/
- matkoniecz 6y ago"A pre-push hook that prevents direct code push to master branch" and I would want "spit out a warning if you created a branch and then try to commit to master" Sometimes I would want to commit to master, I want an overridable warning iff I just created branch.
- xmodem 6y agoHow about #!/bin/sh BRANCHES_POINTING_TO_HEAD=$(git branch --contains HEAD |wc -l) CURRENT_BRANCH=$(git branch --show-current) if [ "$BRANCHES_POINTING_TO_HEAD" -gt 1 ]; then if [ "$CURRENT_BRANCH" = "master" ]; then echo "You're committing to master even though other branches exist." echo "override with git commit --no-verify" exit 1 fi fi You'll need git 2.22 for the --show-current git option. But also I would suggest instead using git checkout -b <new_branch> to create and switch branches in one command
- dheera 6y agoA better UX would be $ git checkout <new_branch> <new_brach> doesn't exist. Would you like to create it (Y/n): The real problem with "git" is just way too many options. For automated tools there can be a "-n" non-interactive option that fails with an error code and doesn't ask questions.