undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/status-read-branch-name-fix' into maint

Browse Source 
Code to read branch name from various files in .git/ directory
would have misbehaved if the code to write them left an empty file.

* jk/status-read-branch-name-fix:
  read_and_strip_branch: fix typo'd address-of operator
This commit is contained in:
Junio C Hamano 2015-02-24 22:10:21 -08:00
commit 93baadb138
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wt-status.c
View File

@ -1140,7 +1140,7 @@ static char *read_and_strip_branch(const char *path)
if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0) if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
goto got_nothing; goto got_nothing;
while (&sb.len && sb.buf[sb.len - 1] == '\n') while (sb.len && sb.buf[sb.len - 1] == '\n')
strbuf_setlen(&sb, sb.len - 1); strbuf_setlen(&sb, sb.len - 1);
if (!sb.len) if (!sb.len)
goto got_nothing; goto got_nothing;