mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/blame-commit-label'

Browse Source 
"git blame HEAD -- missing" failed to correctly say "HEAD" when it
tried to say "No such path 'missing' in HEAD".

* jk/blame-commit-label:
  blame.c: fix garbled error message
  use xstrdup_or_null to replace ternary conditionals
  builtin/commit.c: use xstrdup_or_null instead of envdup
  builtin/apply.c: use xstrdup_or_null instead of null_strdup
  git-compat-util: add xstrdup_or_null helper
This commit is contained in:
Junio C Hamano
2015-02-11 13:39:50 -08:00
parent 5c9c3dfaff a46442f167
commit 092c4be7f5
11 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
grep.c
View File

@ -1661,8 +1661,8 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
const void *identifier)
{
gs->type = type;
gs->name = name ? xstrdup(name) : NULL;
gs->path = path ? xstrdup(path) : NULL;
gs->name = xstrdup_or_null(name);
gs->path = xstrdup_or_null(path);
gs->buf = NULL;
gs->size = 0;
gs->driver = NULL;