From 369d845187c1bb00d14f1e59cfe214917063ab19 Mon Sep 17 00:00:00 2001
From: deepshekhardas <deepshekharadas1234@gmail.com>
Date: Sun, 19 Jul 2026 14:41:06 +0530
Subject: [PATCH] fix: apply PRs #13868, #13867, #13866

- fix(aws): quote dirname in state file path check to handle spaces (#13868)
- Add gcbc helper to copy current git branch name (#13867)
- fix(archlinux): remove unnecessary sudo from paclsorphans (#13866)
---
 plugins/archlinux/README.md            | 2 +-
 plugins/archlinux/archlinux.plugin.zsh | 2 +-
 plugins/aws/aws.plugin.zsh             | 4 ++--
 plugins/git/README.md                  | 1 +
 plugins/git/git.plugin.zsh             | 8 ++++++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 5e015dbaa..bfa7205ca 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -21,7 +21,7 @@ plugins=(... archlinux)
 | pacloc       | `pacman -Qi`                           | Display information about a package in the local database        |
 | paclocs      | `pacman -Qs`                           | Search for packages in the local database                        |
 | paclr        | `sudo pacman -Scc`                     | Remove all files from the cache                                  |
-| paclsorphans | `sudo pacman -Qdt`                     | List all orphaned packages                                       |
+| paclsorphans | `pacman -Qdt`                          | List all orphaned packages                                       |
 | pacmir       | `sudo pacman -Syy`                     | Force refresh of all package lists after updating mirrorlist     |
 | pacre        | `sudo pacman -R`                       | Remove packages, keeping its settings and dependencies           |
 | pacrem       | `sudo pacman -Rns`                     | Remove packages, including its settings and dependencies         |
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 7abd7c2f6..585b6cd7f 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -16,7 +16,7 @@ alias pacloc='pacman -Qi'
 alias paclocs='pacman -Qs'
 alias pacinsd='sudo pacman -S --asdeps'
 alias pacmir='sudo pacman -Syy'
-alias paclsorphans='sudo pacman -Qdt'
+alias paclsorphans='pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -F'
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 677bf3236..f2c7765ff 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -9,14 +9,14 @@ function agr() {
 # Update state file if enabled
 function _aws_update_state() {
   if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
-    test -d $(dirname ${AWS_STATE_FILE}) || return 1
+    test -d "$(dirname "${AWS_STATE_FILE}")" || return 1
     echo "${AWS_PROFILE} ${AWS_REGION}" > "${AWS_STATE_FILE}"
   fi
 }
 
 function _aws_clear_state() {
   if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
-    test -d $(dirname ${AWS_STATE_FILE}) || return 1
+    test -d "$(dirname "${AWS_STATE_FILE}")" || return 1
     echo -n > "${AWS_STATE_FILE}"
   fi
 }
diff --git a/plugins/git/README.md b/plugins/git/README.md
index c0a651375..7511adc44 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -255,6 +255,7 @@ receive further support.
 | `git_develop_branch`     | Returns the name of the “development” branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
 | `git_main_branch`        | Returns the name of the main branch: `main` if it exists, `master` otherwise                                   |
 | `grename <old> <new>`    | Renames branch `<old>` to `<new>`, including on the origin remote                                              |
+| `gcbc`                   | Copies the current branch name to the system clipboard (uses `clipcopy`)                                       |
 | `gbda`                   | Deletes all merged branches                                                                                    |
 | `gbds`                   | Deletes all squash-merged branches (**Note: performance degrades with number of branches**)                    |
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9ef60d69a..a4e84080c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -159,6 +159,14 @@ alias gbg='LANG=C git branch -vv | grep ": gone\]"'
 alias gco='git checkout'
 alias gcor='git checkout --recurse-submodules'
 alias gcb='git checkout -b'
+function gcbc() {
+  local branch=$(git branch --show-current 2>/dev/null) || return
+  if [[ -z "$branch" ]]; then
+    print -u2 "gcbc: not on a branch"
+    return 1
+  fi
+  print -rn -- "$branch" | clipcopy
+}
 alias gcB='git checkout -B'
 alias gcd='git checkout $(git_develop_branch)'
 alias gcm='git checkout $(git_main_branch)'