tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE
commit 340ff7f5f8c4e59cb55ea507ece273794be786e4
parent d0e31b4d1f10279280ce7cc9ece71d17a79ed6b7
Author: teor <teor@torproject.org>
Date:   Thu, 29 Aug 2019 22:56:19 +1000

scripts/git: fix an env var typo in git-merge-forward.sh

Part of 31314.

Diffstat:

Mscripts/git/git-merge-forward.sh | 2+-


1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
@@ -369,7 +369,7 @@ for ((i=0; i<COUNT; i++)); do
     fi
   fi
 
-  printf "%s Handling branch \\n" "$MARKER" "${BYEL}$target${CNRM}"
+  printf "%s Handling branch \\n" "$MARKER" "${BYEL}$target_current${CNRM}"
 
   # Go into the worktree to start merging.
   goto_repo "$repo_path"