Skip to content

fix(git-bulk): fix workspace selection when cd fails #1197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 26, 2025
Merged

fix(git-bulk): fix workspace selection when cd fails #1197

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
433c488
fix(git-bulk): fix workspace selection when cd fails
Feb 15, 2025
7daedfd
fix(git-bulk): replace weak eval for better variable substitution
Feb 20, 2025
145ecdd
fix(git-bulk): missing check about empty environnement variable
Feb 24, 2025
b6e359d
style(git-bulk): typo
Feb 24, 2025
ebb6d37
docs(Commands.md): git-bulk env var feature
Feb 24, 2025
4054cb3
docs(man/git-bulk): git-bulk env var feature
Feb 24, 2025
0e4b6c4
docs(man/git-bulk): mention .gitconfig for config storage
Feb 24, 2025
b2c7a9c
style(man/git-bulk): typo
Feb 24, 2025
9a731a8
docs(man/git-bulk): run make/ronn for .1 and .html
Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions bin/git-bulk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,14 @@ function checkWSName () {
# parse out wsname from workspacespec
function parseWsName () {
local wsspec="$1"
# Get the workspace value from its specification in the `.gitconfig`.
# May be an absolute path or a variable name of the form: `$VARNAME`
rwsdir=${wsspec#* }
if [[ ${rwsdir:0:1} == '$' ]]; then
# Dereference the `rwsdir` value which is a variable name.
rwsdir=${rwsdir:1}
rwsdir=${!rwsdir}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we exit 1 when $rwsdir is expanded to ""?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right! Fixed in 145ecdd. :)

fi
rwsname=${wsspec#*.} && rwsname=${rwsname%% *}
}

Expand Down Expand Up @@ -142,19 +149,19 @@ function executBulkOp () {
listall | while read -r workspacespec; do
parseWsName "$workspacespec"
if [[ -n $wsname ]] && [[ $rwsname != "$wsname" ]]; then continue; fi
eval cd "\"$rwsdir\""
cd "$rwsdir" || exit 1
local actual=$PWD
[ "${quiet?}" != "true" ] && echo 1>&2 "Executing bulk operation in workspace ${inverse}$actual${reset}"

allGitFolders=( $(eval find -L . -name ".git") )

for line in "${allGitFolders[@]}"; do
local gitrepodir=${line::${#line}-5} # cut the .git part of find results to have the root git directory of that repository
eval cd "\"$gitrepodir\"" # into git repo location
cd "$gitrepodir" || exit 1 # into git repo location
local curdir=$PWD
local leadingpath=${curdir#"${actual}"}
guardedExecution "$@"
eval cd "\"$rwsdir\"" # back to origin location of last find command
cd "$rwsdir" || exit 1 # back to origin location of last find command
done
done
}
Expand Down
Loading