Merge pull request libgit2#4210 from pks-t/pks/misc-fixes

pks-t · web-flow · commit 0d2f6824ebf0 · 2017-04-21T15:39:03.000+02:00
Misc fixes
diff --git a/include/git2/global.h b/include/git2/global.h
@@ -14,7 +14,7 @@ GIT_BEGIN_DECL
 /**
  * Init the global state
  *
- * This function must the called before any other libgit2 function in
+ * This function must be called before any other libgit2 function in
  * order to set up global state and threading.
  *
  * This function may be called multiple times - it will return the number
diff --git a/tests/threads/diff.c b/tests/threads/diff.c
@@ -19,7 +19,9 @@ static git_repository *_repo;
 static git_tree *_a, *_b;
 static git_atomic _counts[4];
 static int _check_counts;
+#ifdef GIT_WIN32
 static int _retries;
+#endif
 
 #define THREADS 20
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ GIT_BEGIN_DECL`
`14`	`14`	`/**`
`15`	`15`	`* Init the global state`
`16`	`16`	`*`
`17`		`- * This function must the called before any other libgit2 function in`
	`17`	`+ * This function must be called before any other libgit2 function in`
`18`	`18`	`* order to set up global state and threading.`
`19`	`19`	`*`
`20`	`20`	`* This function may be called multiple times - it will return the number`