summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2015-12-21 21:47:10 +0000
committerCarlos Martín Nieto <cmn@dwim.me>2015-12-21 21:47:10 +0000
commite9c0d7962b07be30826c8d112ea98c70dd548195 (patch)
tree5451909583611917bd35045c974f5cb91a49d0d2
parent9ec6839a72db4c013c9bb9da07d37a782bccc7d0 (diff)
parent91f0d186b4efee8ccd5d0bbedf6b806a4f5e2a3a (diff)
downloadlibgit2-e9c0d7962b07be30826c8d112ea98c70dd548195.tar.gz
Merge pull request #3554 from olshevskiy87/master
typos in comments
-rw-r--r--src/tag.c2
-rw-r--r--tests/index/racy.c2
-rw-r--r--tests/submodule/lookup.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tag.c b/src/tag.c
index 6e69d760d..c4bce1f22 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -358,7 +358,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu
git_odb_object_free(target_obj);
/** Ensure the tag name doesn't conflict with an already existing
- * reference unless overwriting has explictly been requested **/
+ * reference unless overwriting has explicitly been requested **/
if (error == 0 && !allow_ref_overwrite) {
giterr_set(GITERR_TAG, "Tag already exists");
return GIT_EEXISTS;
diff --git a/tests/index/racy.c b/tests/index/racy.c
index a24d47a10..e2275ea14 100644
--- a/tests/index/racy.c
+++ b/tests/index/racy.c
@@ -79,7 +79,7 @@ void test_index_racy__write_index_just_after_file(void)
cl_git_mkfile(path.ptr, "B");
/*
- * Pretend this index' modification happend a second after the
+ * Pretend this index' modification happened a second after the
* file update, and rewrite the file in that same second.
*/
times[0].tv_sec = index->stamp.mtime.tv_sec + 2;
diff --git a/tests/submodule/lookup.c b/tests/submodule/lookup.c
index 38e0fa314..148f9273e 100644
--- a/tests/submodule/lookup.c
+++ b/tests/submodule/lookup.c
@@ -357,7 +357,7 @@ void test_submodule_lookup__renamed(void)
cl_git_pass(git_index_add_bypath(idx, ".gitmodules"));
}
- /* Change the worktree info in the the submodule's config */
+ /* Change the worktree info in the submodule's config */
{
git_config *cfg;