patch.c 20.6 KB
Newer Older
1
#include "clar_libgit2.h"
2 3
#include "git2/sys/repository.h"

4
#include "diff_helpers.h"
5
#include "diff.h"
6 7
#include "repository.h"
#include "buf_text.h"
8 9 10 11 12 13 14 15 16 17 18 19

static git_repository *g_repo = NULL;

void test_diff_patch__initialize(void)
{
}

void test_diff_patch__cleanup(void)
{
	cl_git_sandbox_cleanup();
}

20
#define EXPECTED_HEADER "diff --git a/subdir.txt b/subdir.txt\n" \
21 22 23 24 25
	"deleted file mode 100644\n" \
	"index e8ee89e..0000000\n" \
	"--- a/subdir.txt\n" \
	"+++ /dev/null\n"

26 27
#define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n"

28
static int check_removal_cb(
29
	const git_diff_delta *delta,
30 31
	const git_diff_hunk *hunk,
	const git_diff_line *line,
32
	void *payload)
33
{
34
	switch (line->origin) {
35
	case GIT_DIFF_LINE_FILE_HDR:
36 37
		cl_assert_equal_s(EXPECTED_HEADER, line->content);
		cl_assert(hunk == NULL);
38 39 40
		goto check_delta;

	case GIT_DIFF_LINE_HUNK_HDR:
41
		cl_assert_equal_s(EXPECTED_HUNK, line->content);
42
		goto check_hunk;
43 44 45

	case GIT_DIFF_LINE_CONTEXT:
	case GIT_DIFF_LINE_DELETION:
46 47
		if (payload != NULL)
			return *(int *)payload;
48
		goto check_hunk;
49 50 51 52 53 54

	default:
		/* unexpected code path */
		return -1;
	}

55 56 57 58 59 60
check_hunk:
	cl_assert(hunk != NULL);
	cl_assert_equal_i(1, hunk->old_start);
	cl_assert_equal_i(2, hunk->old_lines);
	cl_assert_equal_i(0, hunk->new_start);
	cl_assert_equal_i(0, hunk->new_lines);
61

62
check_delta:
63 64
	cl_assert_equal_s("subdir.txt", delta->old_file.path);
	cl_assert_equal_s("subdir.txt", delta->new_file.path);
65
	cl_assert_equal_i(GIT_DELTA_DELETED, delta->status);
66

67
	return 0;
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
}

void test_diff_patch__can_properly_display_the_removal_of_a_file(void)
{
	/*
	* $ git diff 26a125e..735b6a2
	* diff --git a/subdir.txt b/subdir.txt
	* deleted file mode 100644
	* index e8ee89e..0000000
	* --- a/subdir.txt
	* +++ /dev/null
	* @@ -1,2 +0,0 @@
	* -Is it a bird?
	* -Is it a plane?
	*/

	const char *one_sha = "26a125e";
	const char *another_sha = "735b6a2";
	git_tree *one, *another;
87
	git_diff *diff;
88

89 90
	g_repo = cl_git_sandbox_init("status");

91 92 93
	one = resolve_commit_oid_to_tree(g_repo, one_sha);
	another = resolve_commit_oid_to_tree(g_repo, another_sha);

94
	cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL));
95

Russell Belfer committed
96 97
	cl_git_pass(git_diff_print(
		diff, GIT_DIFF_FORMAT_PATCH, check_removal_cb, NULL));
98

99
	git_diff_free(diff);
100 101 102 103

	git_tree_free(another);
	git_tree_free(one);
}
104

105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
void test_diff_patch__can_cancel_diff_print(void)
{
	const char *one_sha = "26a125e";
	const char *another_sha = "735b6a2";
	git_tree *one, *another;
	git_diff *diff;
	int fail_with;

	g_repo = cl_git_sandbox_init("status");

	one = resolve_commit_oid_to_tree(g_repo, one_sha);
	another = resolve_commit_oid_to_tree(g_repo, another_sha);

	cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL));

	fail_with = -2323;

	cl_git_fail_with(git_diff_print(
		diff, GIT_DIFF_FORMAT_PATCH, check_removal_cb, &fail_with),
		fail_with);

	fail_with = 45;

	cl_git_fail_with(git_diff_print(
		diff, GIT_DIFF_FORMAT_PATCH, check_removal_cb, &fail_with),
		fail_with);

	git_diff_free(diff);

	git_tree_free(another);
	git_tree_free(one);
}

138 139 140 141 142
void test_diff_patch__to_string(void)
{
	const char *one_sha = "26a125e";
	const char *another_sha = "735b6a2";
	git_tree *one, *another;
143 144
	git_diff *diff;
	git_patch *patch;
Nicolas Hake committed
145
	git_buf buf = GIT_BUF_INIT;
146 147
	const char *expected = "diff --git a/subdir.txt b/subdir.txt\ndeleted file mode 100644\nindex e8ee89e..0000000\n--- a/subdir.txt\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Is it a bird?\n-Is it a plane?\n";

148 149
	g_repo = cl_git_sandbox_init("status");

150 151 152
	one = resolve_commit_oid_to_tree(g_repo, one_sha);
	another = resolve_commit_oid_to_tree(g_repo, another_sha);

153
	cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL));
154

155
	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
156

Russell Belfer committed
157
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
158

Nicolas Hake committed
159
	cl_git_pass(git_patch_to_buf(&buf, patch));
160

Nicolas Hake committed
161
	cl_assert_equal_s(expected, buf.ptr);
162

163 164 165 166
	cl_assert_equal_sz(31, git_patch_size(patch, 0, 0, 0));
	cl_assert_equal_sz(31, git_patch_size(patch, 1, 0, 0));
	cl_assert_equal_sz(31 + 16, git_patch_size(patch, 1, 1, 0));
	cl_assert_equal_sz(strlen(expected), git_patch_size(patch, 1, 1, 1));
167

Nicolas Hake committed
168
	git_buf_free(&buf);
169 170
	git_patch_free(patch);
	git_diff_free(diff);
171 172 173
	git_tree_free(another);
	git_tree_free(one);
}
174

175 176 177 178 179
void test_diff_patch__config_options(void)
{
	const char *one_sha = "26a125e"; /* current HEAD */
	git_tree *one;
	git_config *cfg;
180 181
	git_diff *diff;
	git_patch *patch;
Nicolas Hake committed
182
	git_buf buf = GIT_BUF_INIT;
183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
	char *onefile = "staged_changes_modified_file";
	const char *expected1 = "diff --git c/staged_changes_modified_file i/staged_changes_modified_file\nindex 70bd944..906ee77 100644\n--- c/staged_changes_modified_file\n+++ i/staged_changes_modified_file\n@@ -1 +1,2 @@\n staged_changes_modified_file\n+staged_changes_modified_file\n";
	const char *expected2 = "diff --git i/staged_changes_modified_file w/staged_changes_modified_file\nindex 906ee77..011c344 100644\n--- i/staged_changes_modified_file\n+++ w/staged_changes_modified_file\n@@ -1,2 +1,3 @@\n staged_changes_modified_file\n staged_changes_modified_file\n+staged_changes_modified_file\n";
	const char *expected3 = "diff --git staged_changes_modified_file staged_changes_modified_file\nindex 906ee77..011c344 100644\n--- staged_changes_modified_file\n+++ staged_changes_modified_file\n@@ -1,2 +1,3 @@\n staged_changes_modified_file\n staged_changes_modified_file\n+staged_changes_modified_file\n";
	const char *expected4 = "diff --git staged_changes_modified_file staged_changes_modified_file\nindex 70bd9443ada0..906ee7711f4f 100644\n--- staged_changes_modified_file\n+++ staged_changes_modified_file\n@@ -1 +1,2 @@\n staged_changes_modified_file\n+staged_changes_modified_file\n";

	g_repo = cl_git_sandbox_init("status");
	cl_git_pass(git_repository_config(&cfg, g_repo));
	one = resolve_commit_oid_to_tree(g_repo, one_sha);
	opts.pathspec.count = 1;
	opts.pathspec.strings = &onefile;


	cl_git_pass(git_config_set_string(cfg, "diff.mnemonicprefix", "true"));

	cl_git_pass(git_diff_tree_to_index(&diff, g_repo, one, NULL, &opts));

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
Russell Belfer committed
202
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
Nicolas Hake committed
203 204
	cl_git_pass(git_patch_to_buf(&buf, patch));
	cl_assert_equal_s(expected1, buf.ptr);
205

Nicolas Hake committed
206
	git_buf_clear(&buf);
207 208
	git_patch_free(patch);
	git_diff_free(diff);
209 210 211 212

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
Russell Belfer committed
213
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
Nicolas Hake committed
214 215
	cl_git_pass(git_patch_to_buf(&buf, patch));
	cl_assert_equal_s(expected2, buf.ptr);
216

Nicolas Hake committed
217
	git_buf_clear(&buf);
218 219
	git_patch_free(patch);
	git_diff_free(diff);
220 221 222 223 224 225 226


	cl_git_pass(git_config_set_string(cfg, "diff.noprefix", "true"));

	cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
Russell Belfer committed
227
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
Nicolas Hake committed
228 229
	cl_git_pass(git_patch_to_buf(&buf, patch));
	cl_assert_equal_s(expected3, buf.ptr);
230

Nicolas Hake committed
231
	git_buf_clear(&buf);
232 233
	git_patch_free(patch);
	git_diff_free(diff);
234 235 236 237 238 239 240


	cl_git_pass(git_config_set_int32(cfg, "core.abbrev", 12));

	cl_git_pass(git_diff_tree_to_index(&diff, g_repo, one, NULL, &opts));

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
Russell Belfer committed
241
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
Nicolas Hake committed
242 243
	cl_git_pass(git_patch_to_buf(&buf, patch));
	cl_assert_equal_s(expected4, buf.ptr);
244

Nicolas Hake committed
245
	git_buf_clear(&buf);
246 247
	git_patch_free(patch);
	git_diff_free(diff);
248

Nicolas Hake committed
249
	git_buf_free(&buf);
250 251 252 253
	git_tree_free(one);
	git_config_free(cfg);
}

254 255
void test_diff_patch__hunks_have_correct_line_numbers(void)
{
256
	git_config *cfg;
257
	git_tree *head;
258
	git_diff_options opt = GIT_DIFF_OPTIONS_INIT;
259 260
	git_diff *diff;
	git_patch *patch;
261
	const git_diff_delta *delta;
262 263 264
	const git_diff_hunk *hunk;
	const git_diff_line *line;
	size_t hunklen;
265
	git_buf old_content = GIT_BUF_INIT, actual = GIT_BUF_INIT;
266
	const char *new_content = "The Song of Seven Cities\n------------------------\n\nI WAS Lord of Cities very sumptuously builded.\nSeven roaring Cities paid me tribute from afar.\nIvory their outposts were--the guardrooms of them gilded,\nAnd garrisoned with Amazons invincible in war.\n\nThis is some new text;\nNot as good as the old text;\nBut here it is.\n\nSo they warred and trafficked only yesterday, my Cities.\nTo-day there is no mark or mound of where my Cities stood.\nFor the River rose at midnight and it washed away my Cities.\nThey are evened with Atlantis and the towns before the Flood.\n\nRain on rain-gorged channels raised the water-levels round them,\nFreshet backed on freshet swelled and swept their world from sight,\nTill the emboldened floods linked arms and, flashing forward, drowned them--\nDrowned my Seven Cities and their peoples in one night!\n\nLow among the alders lie their derelict foundations,\nThe beams wherein they trusted and the plinths whereon they built--\nMy rulers and their treasure and their unborn populations,\nDead, destroyed, aborted, and defiled with mud and silt!\n\nAnother replacement;\nBreaking up the poem;\nGenerating some hunks.\n\nTo the sound of trumpets shall their seed restore my Cities\nWealthy and well-weaponed, that once more may I behold\nAll the world go softly when it walks before my Cities,\nAnd the horses and the chariots fleeing from them as of old!\n\n  -- Rudyard Kipling\n";
267 268 269

	g_repo = cl_git_sandbox_init("renames");

270 271
	cl_git_pass(git_config_new(&cfg));
	git_repository_set_config(g_repo, cfg);
272 273
	git_config_free(cfg);

274
	git_repository_reinit_filesystem(g_repo, false);
275

276 277 278
	cl_git_pass(
		git_futils_readbuffer(&old_content, "renames/songof7cities.txt"));

279
	cl_git_rewritefile("renames/songof7cities.txt", new_content);
280 281 282

	cl_git_pass(git_repository_head_tree(&head, g_repo));

283
	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, head, &opt));
284 285 286

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));

Russell Belfer committed
287 288
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
	cl_assert((delta = git_patch_get_delta(patch)) != NULL);
289 290

	cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status);
291
	cl_assert_equal_i(2, (int)git_patch_num_hunks(patch));
292 293 294 295

	/* check hunk 0 */

	cl_git_pass(
296
		git_patch_get_hunk(&hunk, &hunklen, patch, 0));
297 298 299

	cl_assert_equal_i(18, (int)hunklen);

300 301 302 303
	cl_assert_equal_i(6, (int)hunk->old_start);
	cl_assert_equal_i(15, (int)hunk->old_lines);
	cl_assert_equal_i(6, (int)hunk->new_start);
	cl_assert_equal_i(9, (int)hunk->new_lines);
304

305
	cl_assert_equal_i(18, (int)git_patch_num_lines_in_hunk(patch, 0));
306

307 308 309
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 0));
	cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
310
	cl_assert_equal_s("Ivory their outposts were--the guardrooms of them gilded,\n", actual.ptr);
311 312
	cl_assert_equal_i(6, line->old_lineno);
	cl_assert_equal_i(6, line->new_lineno);
313
	cl_assert_equal_i(-1, line->content_offset);
314

315 316 317
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 3));
	cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
318
	cl_assert_equal_s("All the world went softly when it walked before my Cities--\n", actual.ptr);
319 320
	cl_assert_equal_i(9, line->old_lineno);
	cl_assert_equal_i(-1, line->new_lineno);
321
	cl_assert_equal_i(252, line->content_offset);
322

323 324 325
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 12));
	cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
326
	cl_assert_equal_s("This is some new text;\n", actual.ptr);
327 328
	cl_assert_equal_i(-1, line->old_lineno);
	cl_assert_equal_i(9, line->new_lineno);
329
	cl_assert_equal_i(252, line->content_offset);
330 331 332

	/* check hunk 1 */

333
	cl_git_pass(git_patch_get_hunk(&hunk, &hunklen, patch, 1));
334 335 336

	cl_assert_equal_i(18, (int)hunklen);

337 338 339 340
	cl_assert_equal_i(31, (int)hunk->old_start);
	cl_assert_equal_i(15, (int)hunk->old_lines);
	cl_assert_equal_i(25, (int)hunk->new_start);
	cl_assert_equal_i(9, (int)hunk->new_lines);
341

342
	cl_assert_equal_i(18, (int)git_patch_num_lines_in_hunk(patch, 1));
343

344 345 346
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 1, 0));
	cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
347
	cl_assert_equal_s("My rulers and their treasure and their unborn populations,\n", actual.ptr);
348 349
	cl_assert_equal_i(31, line->old_lineno);
	cl_assert_equal_i(25, line->new_lineno);
350
	cl_assert_equal_i(-1, line->content_offset);
351

352 353 354
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 1, 3));
	cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
355
	cl_assert_equal_s("The Daughters of the Palace whom they cherished in my Cities,\n", actual.ptr);
356 357
	cl_assert_equal_i(34, line->old_lineno);
	cl_assert_equal_i(-1, line->new_lineno);
358
	cl_assert_equal_i(1468, line->content_offset);
359

360 361 362
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 1, 12));
	cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
363
	cl_assert_equal_s("Another replacement;\n", actual.ptr);
364 365
	cl_assert_equal_i(-1, line->old_lineno);
	cl_assert_equal_i(28, line->new_lineno);
366
	cl_assert_equal_i(1066, line->content_offset);
367

368 369
	git_patch_free(patch);
	git_diff_free(diff);
370 371 372 373 374 375 376 377 378 379

	/* Let's check line numbers when there is no newline */

	git_buf_rtrim(&old_content);
	cl_git_rewritefile("renames/songof7cities.txt", old_content.ptr);

	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, head, &opt));

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));

Russell Belfer committed
380 381
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
	cl_assert((delta = git_patch_get_delta(patch)) != NULL);
382 383

	cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status);
384
	cl_assert_equal_i(1, (int)git_patch_num_hunks(patch));
385 386 387

	/* check hunk 0 */

388
	cl_git_pass(git_patch_get_hunk(&hunk, &hunklen, patch, 0));
389 390 391

	cl_assert_equal_i(6, (int)hunklen);

392 393 394 395
	cl_assert_equal_i(46, (int)hunk->old_start);
	cl_assert_equal_i(4, (int)hunk->old_lines);
	cl_assert_equal_i(46, (int)hunk->new_start);
	cl_assert_equal_i(4, (int)hunk->new_lines);
396

397
	cl_assert_equal_i(6, (int)git_patch_num_lines_in_hunk(patch, 0));
398

399 400 401
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 1));
	cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
402
	cl_assert_equal_s("And the horses and the chariots fleeing from them as of old!\n", actual.ptr);
403 404
	cl_assert_equal_i(47, line->old_lineno);
	cl_assert_equal_i(47, line->new_lineno);
405

406 407 408
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 2));
	cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
409
	cl_assert_equal_s("\n", actual.ptr);
410 411
	cl_assert_equal_i(48, line->old_lineno);
	cl_assert_equal_i(48, line->new_lineno);
412

413 414 415
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 3));
	cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
416
	cl_assert_equal_s("  -- Rudyard Kipling\n", actual.ptr);
417 418
	cl_assert_equal_i(49, line->old_lineno);
	cl_assert_equal_i(-1, line->new_lineno);
419

420 421 422
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 4));
	cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
423
	cl_assert_equal_s("  -- Rudyard Kipling", actual.ptr);
424 425
	cl_assert_equal_i(-1, line->old_lineno);
	cl_assert_equal_i(49, line->new_lineno);
426

427 428 429
	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 5));
	cl_assert_equal_i(GIT_DIFF_LINE_DEL_EOFNL, (int)line->origin);
	cl_git_pass(git_buf_set(&actual, line->content, line->content_len));
430
	cl_assert_equal_s("\n\\ No newline at end of file\n", actual.ptr);
431 432
	cl_assert_equal_i(-1, line->old_lineno);
	cl_assert_equal_i(49, line->new_lineno);
433

434 435
	git_patch_free(patch);
	git_diff_free(diff);
436 437 438

	git_buf_free(&actual);
	git_buf_free(&old_content);
439 440
	git_tree_free(head);
}
441 442

static void check_single_patch_stats(
443
	git_repository *repo, size_t hunks,
444
	size_t adds, size_t dels, size_t ctxt, size_t *sizes,
445
	const char *expected)
446
{
447 448
	git_diff *diff;
	git_patch *patch;
449
	const git_diff_delta *delta;
450
	size_t actual_ctxt, actual_adds, actual_dels;
451 452 453 454 455

	cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, NULL));

	cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));

Russell Belfer committed
456 457
	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
	cl_assert((delta = git_patch_get_delta(patch)) != NULL);
458 459
	cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status);

460
	cl_assert_equal_i((int)hunks, (int)git_patch_num_hunks(patch));
461

462
	cl_git_pass( git_patch_line_stats(
463
		&actual_ctxt, &actual_adds, &actual_dels, patch) );
464

465
	cl_assert_equal_sz(ctxt, actual_ctxt);
466 467
	cl_assert_equal_sz(adds, actual_adds);
	cl_assert_equal_sz(dels, actual_dels);
468

469
	if (expected != NULL) {
Nicolas Hake committed
470 471 472 473
		git_buf buf = GIT_BUF_INIT;
		cl_git_pass(git_patch_to_buf(&buf, patch));
		cl_assert_equal_s(expected, buf.ptr);
		git_buf_free(&buf);
474

475
		cl_assert_equal_sz(
476
			strlen(expected), git_patch_size(patch, 1, 1, 1));
477 478 479 480
	}

	if (sizes) {
		if (sizes[0])
481
			cl_assert_equal_sz(sizes[0], git_patch_size(patch, 0, 0, 0));
482
		if (sizes[1])
483
			cl_assert_equal_sz(sizes[1], git_patch_size(patch, 1, 0, 0));
484
		if (sizes[2])
485
			cl_assert_equal_sz(sizes[2], git_patch_size(patch, 1, 1, 0));
486
	}
487

488 489 490
	/* walk lines in hunk with basic sanity checks */
	for (; hunks > 0; --hunks) {
		size_t i, max_i;
491 492
		const git_diff_line *line;
		int last_new_lineno = -1, last_old_lineno = -1;
493

494
		max_i = git_patch_num_lines_in_hunk(patch, hunks - 1);
495 496 497 498

		for (i = 0; i < max_i; ++i) {
			int expected = 1;

499 500
			cl_git_pass(
				git_patch_get_line_in_hunk(&line, patch, hunks - 1, i));
501

502 503 504
			if (line->origin == GIT_DIFF_LINE_ADD_EOFNL ||
				line->origin == GIT_DIFF_LINE_DEL_EOFNL ||
				line->origin == GIT_DIFF_LINE_CONTEXT_EOFNL)
505 506
				expected = 0;

507 508 509 510 511
			if (line->old_lineno >= 0) {
				if (last_old_lineno >= 0)
					cl_assert_equal_i(
						expected, line->old_lineno - last_old_lineno);
				last_old_lineno = line->old_lineno;
512
			}
513 514 515 516 517 518

			if (line->new_lineno >= 0) {
				if (last_new_lineno >= 0)
					cl_assert_equal_i(
						expected, line->new_lineno - last_new_lineno);
				last_new_lineno = line->new_lineno;
519 520 521 522
			}
		}
	}

523 524
	git_patch_free(patch);
	git_diff_free(diff);
525 526 527 528
}

void test_diff_patch__line_counts_with_eofnl(void)
{
529
	git_config *cfg;
530 531 532
	git_buf content = GIT_BUF_INIT;
	const char *end;
	git_index *index;
533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549
	const char *expected =
		/* below is pasted output of 'git diff' with fn context removed */
		"diff --git a/songof7cities.txt b/songof7cities.txt\n"
		"index 378a7d9..3d0154e 100644\n"
		"--- a/songof7cities.txt\n"
		"+++ b/songof7cities.txt\n"
		"@@ -42,7 +42,7 @@ With peoples undefeated of the dark, enduring blood.\n"
		" \n"
		" To the sound of trumpets shall their seed restore my Cities\n"
		" Wealthy and well-weaponed, that once more may I behold\n"
		"-All the world go softly when it walks before my Cities,\n"
		"+#All the world go softly when it walks before my Cities,\n"
		" And the horses and the chariots fleeing from them as of old!\n"
		" \n"
		"   -- Rudyard Kipling\n"
		"\\ No newline at end of file\n";
	size_t expected_sizes[3] = { 115, 119 + 115 + 114, 119 + 115 + 114 + 71 };
550 551 552

	g_repo = cl_git_sandbox_init("renames");

553 554
	cl_git_pass(git_config_new(&cfg));
	git_repository_set_config(g_repo, cfg);
555 556
	git_config_free(cfg);

557
	git_repository_reinit_filesystem(g_repo, false);
558

559
	cl_git_pass(git_futils_readbuffer(&content, "renames/songof7cities.txt"));
560 561 562 563 564

	/* remove first line */

	end = git_buf_cstr(&content) + git_buf_find(&content, '\n') + 1;
	git_buf_consume(&content, end);
565
	cl_git_rewritefile("renames/songof7cities.txt", content.ptr);
566

567
	check_single_patch_stats(g_repo, 1, 0, 1, 3, NULL, NULL);
568 569 570 571

	/* remove trailing whitespace */

	git_buf_rtrim(&content);
572
	cl_git_rewritefile("renames/songof7cities.txt", content.ptr);
573

574
	check_single_patch_stats(g_repo, 2, 1, 2, 6, NULL, NULL);
575 576 577 578

	/* add trailing whitespace */

	cl_git_pass(git_repository_index(&index, g_repo));
579
	cl_git_pass(git_index_add_bypath(index, "songof7cities.txt"));
580 581 582 583
	cl_git_pass(git_index_write(index));
	git_index_free(index);

	cl_git_pass(git_buf_putc(&content, '\n'));
584
	cl_git_rewritefile("renames/songof7cities.txt", content.ptr);
585

586
	check_single_patch_stats(g_repo, 1, 1, 1, 3, NULL, NULL);
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607

	/* no trailing whitespace as context line */

	{
		/* walk back a couple lines, make space and insert char */
		char *scan = content.ptr + content.size;
		int i;

		for (i = 0; i < 5; ++i) {
			for (--scan; scan > content.ptr && *scan != '\n'; --scan)
				/* seek to prev \n */;
		}
		cl_assert(scan > content.ptr);

		/* overwrite trailing \n with right-shifted content */
		memmove(scan + 1, scan, content.size - (scan - content.ptr) - 1);
		/* insert '#' char into space we created */
		scan[1] = '#';
	}
	cl_git_rewritefile("renames/songof7cities.txt", content.ptr);

608
	check_single_patch_stats(
609
		g_repo, 1, 1, 1, 6, expected_sizes, expected);
610 611

	git_buf_free(&content);
612
}