diff options
Diffstat (limited to 'lib-src/mr/config')
| -rw-r--r-- | lib-src/mr/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config index 3bfe55f7..94baf8a8 100644 --- a/lib-src/mr/config +++ b/lib-src/mr/config @@ -555,8 +555,8 @@ fixups = # update from upstream master deliberately, not as part of automated updates. pull = git checkout "$hostname" \ && git pull --rebase --autostash origin master -skip = lazy || [ "$1" = pull ] \ - && [ -z "$(git for-each-ref '[r]efs/heads/'$hostname)" ] +skip = lazy || ( [ "$1" = pull ] \ + && [ -z "$(git for-each-ref '[r]efs/heads/'$hostname)" ] ) # myrepos git_status assumes a separate registration for each worktree. # Empty update action to prevent fetching from remotes over and over again. |