Modernize git invocations & fix a few bugs along the way - #128
Merged
jamiew merged 8 commits intoJun 3, 2026
Merged
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
- checkout → switch (git 2.23+) - branch parsing via sed/grep/tr → branch --show-current (git 2.22+) - egrep → grep -E (egrep is deprecated)
jamiew
marked this pull request as ready for review
April 20, 2026 19:01
sapegin
added a commit
to sapegin/dotfiles
that referenced
this pull request
Apr 22, 2026
nicksp
added a commit
to nicksp/dotfiles
that referenced
this pull request
Apr 23, 2026
- branch: use 'git show-ref --verify --quiet' for branch existence checks instead of parsing 'git branch --no-color | grep'
- branch, merge: use 'git rev-parse --abbrev-ref @{upstream}' for tracking detection instead of parsing 'git branch -vv | awk'
- push: use 'git remote get-url --push' instead of parsing 'git remote show | grep Push | awk'
- drop the stray 'echo tracking=' debug line in merge
- branch: propagate exit code from 'git branch -d/-D' so failures (nonexistent branch, unmerged with -d) return non-zero - branch: quote $branch in git switch calls so names with spaces don't break (slashes already worked) - branch: drop redundant `[ -n "$x" ] && [ \! "$x" == '' ]` duplications - push: fix `[ -z $* ]` glob bug by switching to `$#` and an args array, so passthrough args with spaces/globs no longer misbehave - pull: replace locale-fragile "No local changes to save" string match with a refs/stash before/after comparison; bug would have caused 'git stash pop' to run against the wrong stash on localized git installs - pull, push: swap deprecated `which` for `command -v` - pull, push, merge: detect detached HEAD up-front with a friendly error instead of falling through to confusing git output and bogus exit codes - install.sh: add -fL to curl so HTTP errors fail loudly and redirects are followed, and quote paths
- branch: quote $branch in the list-mode test so weird names don't trip it - pull: simplify has_changed to drop the outer $(...). same behavior either way (bash propagates the inner exit code when the substitution is empty, and grep --quiet always is) but the unwrapped form doesn't depend on that quirk to read correctly
sapegin
added a commit
to sapegin/dotfiles
that referenced
this pull request
Jun 2, 2026
* Expand CI test coverage + add shellcheck job
new test steps:
- branch -d on a nonexistent branch must exit non-zero (was silently exit 0)
- branch name with `/` in it (common feature/* flow, never tested)
- detached HEAD: pull/push/merge must fail cleanly (was confusing fallthrough)
- pull: skips `git stash pop` when nothing was stashed
- pull: pop runs exactly once when something was stashed
- pull: package-manager install hooks (yarn) don't fire when their lockfile didn't change
- push: passthrough flag (--force-with-lease) doesn't get mangled
also a separate shellcheck job (warning-level) so we catch unquoted vars and similar before they ship.
stacked on top of modernize-git-commands — most of these tests rely on those fixes.
* Fix shellcheck warnings across scripts
- branch: replace `remotes=($(git remote))` with a portable while-read loop (mapfile isn't in macOS /bin/bash 3.2)
- pull: quote `cd "$(dirname ...)"` and add `|| return 1` on both `cd` calls
- push: use `grep -F '*'` for the literal-asterisk match, and unquote the rhs of `=~` so github.com matches as a regex
- install.sh: iterate with `"${FILES[@]}"` instead of `${FILES[*]}`
* Fix flaky CI test by resetting working tree after stash test
The "stash - passthrough arguments" test runs `stash pop` which reapplies its modification to file.txt, leaving every subsequent test running on a dirty working tree. That made the "pull - skips pop when nothing was stashed" assertion fail because pull correctly stashed the lingering modification.
- restore file.txt at the end of the stash passthrough test so later steps start clean
Copy link
Copy Markdown
Collaborator
Author
|
working OK for me so far on modern macOS and Ubuntu Linux 25 |
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
quick swap of legacy git incantations across the 5 scripts for modern equivalents:
git 2.23 (Aug 2019) becomes the new floor, which feels safe.
to test: