Merge pull request nodegit#1175 from carlosmn/diff-0-ctx

arrbee · arrbee · commit 57e765b2e828 · 2013-03-09T08:09:17.000-08:00
Can't perform diff with no context lines
diff --git a/include/git2/diff.h b/include/git2/diff.h
@@ -289,7 +289,7 @@ typedef struct {
 } git_diff_options;
 
 #define GIT_DIFF_OPTIONS_VERSION 1
-#define GIT_DIFF_OPTIONS_INIT {GIT_DIFF_OPTIONS_VERSION}
+#define GIT_DIFF_OPTIONS_INIT {GIT_DIFF_OPTIONS_VERSION, GIT_DIFF_NORMAL, 3}
 
 /**
  * When iterating over a diff, callback that will be made per file.
diff --git a/src/diff.c b/src/diff.c
@@ -291,8 +291,11 @@ static git_diff_list *git_diff_list_alloc(
 	 * - diff.noprefix
 	 */
 
-	if (opts == NULL)
+	if (opts == NULL) {
+		/* Make sure we default to 3 lines */
+		diff->opts.context_lines = 3;
 		return diff;
+	}
 
 	memcpy(&diff->opts, opts, sizeof(git_diff_options));
 
diff --git a/src/diff_output.c b/src/diff_output.c
@@ -202,7 +202,7 @@ static void setup_xdiff_options(
 	memset(param, 0, sizeof(xpparam_t));
 
 	cfg->ctxlen =
-		(!opts || !opts->context_lines) ? 3 : opts->context_lines;
+		(!opts) ? 3 : opts->context_lines;
 	cfg->interhunkctxlen =
 		(!opts) ? 0 : opts->interhunk_lines;
 
diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c
@@ -10,6 +10,8 @@ static diff_expects expect;
 void test_diff_tree__initialize(void)
 {
 	GIT_INIT_STRUCTURE(&opts, GIT_DIFF_OPTIONS_VERSION);
+	/* The default context lines is set by _INIT which we can't use here */
+	opts.context_lines = 3;
 
 	memset(&expect, 0, sizeof(expect));
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ static diff_expects expect;`
`10`	`10`	`void test_diff_tree__initialize(void)`
`11`	`11`	`{`
`12`	`12`	`GIT_INIT_STRUCTURE(&opts, GIT_DIFF_OPTIONS_VERSION);`
	`13`	`+ /* The default context lines is set by _INIT which we can't use here */`
	`14`	`+ opts.context_lines = 3;`
`13`	`15`
`14`	`16`	`memset(&expect, 0, sizeof(expect));`
`15`	`17`