diff options
| author |  Torstein Hegge <hegge@resisty.net> | 2013-11-14 19:18:01 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-11-18 11:24:08 -0800 |
| commit | 6b364d48f2e72d6c37115e6aa4fe769a523dd1d4 (patch) | |
| tree | a93d71d4dc4482700970cc9f42fb9f6cad80e170 /git-pull.sh | |
| parent | status: always show tracking branch even no change (diff) | |
| download | tgif-6b364d48f2e72d6c37115e6aa4fe769a523dd1d4.tar.xz | |
branch: fix --verbose output column alignment
Commit f2e0873 (branch: report invalid tracking branch as gone) removed
an early return from fill_tracking_info() in the path taken when 'git
branch -v' lists a branch in sync with its upstream. This resulted in an
unconditionally added space in front of the subject line:
$ git branch -v
* master f5eb3da commit pushed to upstream
topic f935eb6 unpublished topic
Instead, only add the trailing space if a decoration have been added.
To catch this kind of whitespace breakage in the tests, be a bit less
smart when filtering the output through sed.
Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions