From: teor <teor@torproject.org>
Date: Thu, 29 Aug 2019 12:56:19 +0000 (+1000)
Subject: scripts/git: fix an env var typo in git-merge-forward.sh
X-Git-Tag: tor-0.4.2.1-alpha~50^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=340ff7f5f8c4e59cb55ea507ece273794be786e4;p=thirdparty%2Ftor.git

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

Part of 31314.
---

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index 720320c9fe..cbd2f3c3bd 100755
--- 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"