]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
scripts/git: fix an env var typo in git-merge-forward.sh
authorteor <teor@torproject.org>
Thu, 29 Aug 2019 12:56:19 +0000 (22:56 +1000)
committerteor <teor@torproject.org>
Thu, 29 Aug 2019 12:58:53 +0000 (22:58 +1000)
Part of 31314.

scripts/git/git-merge-forward.sh

index 720320c9fedef71ccd8ec9316605802f243fd10d..cbd2f3c3bd96c813d065b6ac3fb873eaeed364ee 100755 (executable)
@@ -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"