[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] scripts/git: fix an env var typo in git-merge-forward.sh



commit 340ff7f5f8c4e59cb55ea507ece273794be786e4
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Thu Aug 29 22:56:19 2019 +1000

    scripts/git: fix an env var typo in git-merge-forward.sh
    
    Part of 31314.
---
 scripts/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
index 720320c9f..cbd2f3c3b 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"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits