diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-18 04:56:57 +0400 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-18 04:56:57 +0400 |
| commit | ddcb28a41f3774e26fc6ae0a7174a5565e4749ce (patch) | |
| tree | a80eb78456d71dadeb13da82a53a31022b697f94 /src/submodule.c | |
| parent | 3a93ab90658ea46fd2f581172b313a1de711ce65 (diff) | |
| parent | 25743bd7c5f14f2287d9c4fdf953c978e3b16916 (diff) | |
Merge pull request #1239 from ethomson/index_remove
add an index_remove_bypath that removes conflicts
Diffstat (limited to 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/submodule.c b/src/submodule.c index 5283322f2..2be179303 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -332,7 +332,7 @@ int git_submodule_add_finalize(git_submodule *sm) assert(sm); if ((error = git_repository_index__weakptr(&index, sm->owner)) < 0 || - (error = git_index_add_from_workdir(index, GIT_MODULES_FILE)) < 0) + (error = git_index_add_bypath(index, GIT_MODULES_FILE)) < 0) return error; return git_submodule_add_to_index(sm, true); |