summaryrefslogtreecommitdiff
path: root/src/diff_output.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-01-15 09:46:50 -0800
committerRussell Belfer <rb@github.com>2013-01-15 09:46:50 -0800
commit230010d19b20764b5f73636c900bd3ff84295100 (patch)
treee4961e5c86a084b9212a5578a63345db563c0260 /src/diff_output.c
parent848d77dc8314895d6ad1a9b36f30a36fc505e230 (diff)
parent5b524d6902b50dc2eebcce760de614edc2ab4cf4 (diff)
downloadlibgit2-230010d19b20764b5f73636c900bd3ff84295100.tar.gz
Merge pull request #1238 from nulltoken/fix/checkout-index
checkout: Teach checkout to cope with orphaned Head
Diffstat (limited to 'src/diff_output.c')
-rw-r--r--src/diff_output.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/diff_output.c b/src/diff_output.c
index 933d44ee5..e79bf30d2 100644
--- a/src/diff_output.c
+++ b/src/diff_output.c
@@ -842,7 +842,7 @@ static int diff_patch_line_cb(
{
git_diff_patch *patch = payload;
diff_patch_hunk *hunk;
- diff_patch_line *last, *line;
+ diff_patch_line *line;
GIT_UNUSED(delta);
GIT_UNUSED(range);
@@ -872,8 +872,6 @@ static int diff_patch_line_cb(
patch->lines_asize = new_size;
}
- last = (patch->lines_size > 0) ?
- &patch->lines[patch->lines_size - 1] : NULL;
line = &patch->lines[patch->lines_size++];
line->ptr = content;