diff options
| author | teor <teor@torproject.org> | 2019-08-29 22:56:19 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-29 22:58:53 +1000 |
| commit | 340ff7f5f8c4e59cb55ea507ece273794be786e4 (patch) | |
| tree | 33c0d04a9a96695aff1ce5aa39fb0a68712fe82b /scripts/git | |
| parent | d0e31b4d1f10279280ce7cc9ece71d17a79ed6b7 (diff) | |
| download | tor-340ff7f5f8c4e59cb55ea507ece273794be786e4.tar.gz tor-340ff7f5f8c4e59cb55ea507ece273794be786e4.zip | |
scripts/git: fix an env var typo in git-merge-forward.sh
Part of 31314.
Diffstat (limited to 'scripts/git')
| -rwxr-xr-x | scripts/git/git-merge-forward.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |