diff options
author | Junio C Hamano <junkio@cox.net> | 2006-09-02 17:10:16 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-09-02 17:10:16 -0700 |
commit | 1bbb2cff62a7c9ff136d17723b30951159e6291a (patch) | |
tree | 61f46f0a8b9659b95b6096a8d6c3bb92fadf01ba /diff.c | |
parent | 7cf67205ca68a157c6ffdb4e5a4ff231217c0871 (diff) | |
parent | 6ce4e61f1be690681f6494eb5ca26540c2316f81 (diff) | |
download | git-1bbb2cff62a7c9ff136d17723b30951159e6291a.tar.gz git-1bbb2cff62a7c9ff136d17723b30951159e6291a.tar.xz |
Merge branch 'master' into cc/trace
* master:
Trace into a file or an open fd and refactor tracing code.
Replace uses of strdup with xstrdup.
consolidate two copies of new style object header parsing code.
Documentation: Fix howto/revert-branch-rebase.html generation
fmt-merge-msg: fix off-by-one bug
git-rev-list(1): group options; reformat; document more options
Constness tightening for move/link_temp_to_file()
gitweb: Fix git_blame
Include config.mak.autogen in the doc Makefile
Use xmalloc instead of malloc
git(7): move gitk(1) to the list of porcelain commands
gitk: Fix some bugs in the new cherry-picking code
gitk: Improve responsiveness while reading and layout out the graph
gitk: Update preceding/following tag info when creating a tag
gitk: Add a menu item for cherry-picking commits
gitk: Fix a couple of buglets in the branch head menu items
gitk: Add a context menu for heads
gitk: Add a row context-menu item for creating a new branch
gitk: Recompute ancestor/descendent heads/tags when rereading refs
gitk: Minor cleanups
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -216,7 +216,7 @@ static char *quote_one(const char *str) return NULL; needlen = quote_c_style(str, NULL, NULL, 0); if (!needlen) - return strdup(str); + return xstrdup(str); xp = xmalloc(needlen + 1); quote_c_style(str, xp, NULL, 0); return xp; @@ -658,7 +658,7 @@ static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat, x->is_renamed = 1; } else - x->name = strdup(name_a); + x->name = xstrdup(name_a); return x; } |