Blog
- Details
This is a series of posts which will list some useful apps for development and general usage of Windows. These are just some examples of what can be useful. Of course, use any app you already know or have.
git:
IntelliJ IDEA Git
https://www.jetbrains.com/idea/features/
IntelliJ IDEA provides a unified interface for major version control systems
Tower
https://www.git-tower.com/windows
Use all of Git's powerful feature set - in a GUI that makes you more productive
Git for Windows
https://gitforwindows.org/ aka https://git-scm.com/ eg command line
Git for Windows command line client
TortoiseGit
https://tortoisegit.org/
TortoiseGit provides overlay icons showing the file status, a powerful context menu for Git and much more
Git Extensions
https://gitextensions.github.io/
Git Extensions is a standalone UI tool for managing Git repositories
GitKraken
Unleash GitKraken! This intuitive Git GUI simplifies and streamlines Git processes
GitHub Desktop
https://desktop.github.com/
GitHub Desktop simplifies your development workflow
- Details
This is a series of posts which will list some useful apps for development and general usage of Windows. These are just some examples of what can be useful. Of course, use any app you already know or have.
windows terminal:
Cmder
Portable console emulator for Windows
Terminus
https://github.com/Eugeny/terminus
deprecated, replaced with Tabby
Tabby
https://github.com/Eugeny/tabby
Tabby is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux for the modern age
Git for Windows
Git for Windows includes a bash client
Windows Terminal
https://www.microsoft.com/en-us/p/windows-terminal/9n0dx20hk701
Windows Terminal is a modern, fast, efficient, powerful, and productive terminal application for users of command-line tools and shells like Command Prompt, PowerShell, and WSL.
- Details
This is a series of posts which will list some useful apps for development and general usage of Windows. These are just some examples of what can be useful. Of course, use any app you already know or have.
ssh terminal:
mRemoteNG
an open source, tabbed, multi-protocol, remote connections manager for Windows
PuTTY
http://www.chiark.greenend.org.uk/~sgtatham/putty/
PuTTY is a free implementation of SSH and Telnet for Windows and Unix platforms, along with an xterm terminal emulator.
MobaXterm
https://mobaxterm.mobatek.net/
Enhanced terminal for Windows with X11 server, tabbed SSH client, network tools and much more
Terminus
https://github.com/Eugeny/terminus
deprecated, replaced with Tabby
Tabby
https://github.com/Eugeny/tabby
Tabby is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux for the modern age
- Details
Git hooks are shell scripts that run automatically before or after Git executes an important command like Commit or Push. They can be used to enforce conventions around git actions, such as branch names and commit messages.
Git hooks reside in .git/hooks. To enable a hook, just remove the .sample extension
| Git Hook | Git Command | Description |
| applypatch-msg.sample | git am | When a patch message is changed |
| commit-msg.sample | git commit | To set the message of a commit action |
| fsmonitor-watchman.sample | launch watchman | To integrate watchman |
| post-update.sample | git push | By updating all data after the push |
| pre-applypatch.sample | git am | Before applying a patch |
| pre-commit.sample | git commit | Before committing |
| prepare-commit-msg.sample | git commit | When a commit message is set |
| pre-push.sample | git push | Before making a push |
| pre-rebase.sample | git rebase | Before making a pass or merge |
| pre-receive.sample | git push | When we push and get the data from the remote repository |
| update.sample | git push | By updating the remote data in a push |
Reference: https://www.hostinger.com/tutorials/how-to-use-git-hooks/
> git config core.hooksPath ./.githooks
Note: IntelliJIDE does not support custom hook locations, nor prepare-commit-msg
Branch Names
Having a common naming convention for branches can make it easier to determine what a branch is being used for.
Something like
ticket#-ShortDesc
is more useful than
as you can at least track back the branch back to the originating ticket
The git hook pre-commit can be used to enforce branch names
File pre-commit:
#!/usr/bin/env bash
local_branch="$(git rev-parse --abbrev-ref HEAD)"
#valid_branch_regex="^(feature|bugfix|improvement|library|prerelease|release|hotfix)\/[a-z0-9._-]+$"
valid_branch_regex="^#?[0-9]{6,10}-[a-zA-Z]+$"
error()
{
echo "GIT PRE-COMMIT HOOK ERROR:"
echo "$1"
echo ""
echo "Your commit will be rejected."
echo "You should rename your branch to a valid name and try again."
exit 1
}
if [[ ! $local_branch =~ $valid_branch_regex ]]
then
error "Branch names must match: $valid_branch_regex."
fi
exit 0
Commit Messages
As git tends to intermingle commits from different branches based on time, you can also enforce comments to contain ticket numbers too.
Something like
ticket# added audit log
as you can at least track back the commit back to the originating ticket
In general, you should try to make multiple commits grouped by concept, and commit every day or two.
The git hooks prepare-commit-msg and commit-msg
can be used to enforce ticket numbers in commits
File prepare-commit-msg:
#!/usr/bin/env bash
# commit message file
commit_msg_file="$1"
# condition the commit is invoked; none (git commit), message (git commit -m <msg>), template, merge, squash, or commit
# commit_source=$2
# commit hash
# sha1=$3
local_branch="$(git rev-parse --abbrev-ref HEAD)"
get_ticket_nbr="^#?([0-9]{6,10}).*"
valid_ticket_nbr="^[0-9]{6,10}$"
error()
echo "GIT PREPARE-COMMIT HOOK ERROR:"
echo "$1"
echo ""
}
# check if commit message already has the ticket # prepended
# if not, try to prepend
commit_msg=$(cat "$commit_msg_file")
if [[ ! $commit_msg =~ $get_ticket_nbr ]]
then
if [[ $local_branch =~ $get_ticket_nbr ]]
then
ticket="${BASH_REMATCH[1]}"
if [[ $ticket =~ $valid_ticket_nbr ]]
then
echo "#${ticket} " > "$commit_msg_file"
echo "$commit_msg" >> "$commit_msg_file"
fi
fi
fi
exit 0
File commit-msg:
#!/usr/bin/env bash
# commit message file
commit_msg_file="$1"
valid_comment_prefix="^#?[0-9]{6,10} .+"
error()
cp "$commit_msg_file" "_gitmsg.saved.txt"
echo "GIT COMMIT-MSG HOOK ERROR:"
echo "$1"
echo ""
echo "Original checkin message has been stored in '_gitmsg.saved.txt'"
echo "Your commit will be rejected."
echo "You should update your commit and try again."
exit 1
}
commit_msg=$(cat "$commit_msg_file")
if [[ ! $commit_msg =~ $valid_comment_prefix ]]
then
error "Comment must match: $valid_comment_prefix"
fi
exit 0
You should now have some ideas on how to enforce some consistency in your git actions.
Page 1 of 16
