| commit | db43891ce60d0f713a41cfc46097262c73aa99d7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Nov 2015 20:18:15 +0000 (5 12:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Nov 2015 20:18:15 +0000 (5 12:18 -0800) | ||
| tree | 02f8dc4fd41fceaf38a5430ef4f3596445aaff6c | treesnapshot (tar.gz zip) |
| parent | f97aee1f941a08a741c7ce2b0dfb6db7d0cc042e | commitdiff |
| parent | c72b49dfab8381abfd947db53c1c9e2da9593ab6 | commitdiff |
Merge branch 'rs/wt-status-detached-branch-fix' into maint
"git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.
* rs/wt-status-detached-branch-fix:
wt-status: use skip_prefix() to get rid of magic string length constants
wt-status: don't skip a magical number of characters blindly
wt-status: avoid building bogus branch name with detached HEAD
wt-status: exit early using goto in wt_shortstatus_print_tracking()
t7060: add test for status --branch on a detached HEAD
"git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.
* rs/wt-status-detached-branch-fix:
wt-status: use skip_prefix() to get rid of magic string length constants
wt-status: don't skip a magical number of characters blindly
wt-status: avoid building bogus branch name with detached HEAD
wt-status: exit early using goto in wt_shortstatus_print_tracking()
t7060: add test for status --branch on a detached HEAD
| t/t7060-wtstatus.sh | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |