diff options
| author | Russell Belfer <rb@github.com> | 2012-11-08 16:56:34 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-09 13:52:07 -0800 |
| commit | 55cbd05b18960e761a4d237ce5f1ff06455da98d (patch) | |
| tree | ef602ca15261aa1d5ff6be6ea043d74d5fc45459 /src/submodule.c | |
| parent | 2e3d4b96c08f1b0e2ee9b248c53aec523d70fd25 (diff) | |
| download | libgit2-55cbd05b18960e761a4d237ce5f1ff06455da98d.tar.gz | |
Some diff refactorings to help code reuse
There are some diff functions that are useful in a rewritten
checkout and this lays some groundwork for that. This contains
three main things:
1. Share the function diff uses to calculate the OID for a file
in the working directory (now named `git_diff__oid_for_file`
2. Add a `git_diff__paired_foreach` function to iterator over
two diff lists concurrently. Convert status to use it.
3. Move all the string/prefix/index entry comparisons into
function pointers inside the `git_diff_list` object so they
can be switched between case sensitive and insensitive
versions. This makes them easier to reuse in various
functions without replicating logic. As part of this, move
a couple of index functions out of diff.c and into index.c.
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 d69559dc2..1364b6881 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -371,7 +371,7 @@ int git_submodule_add_to_index(git_submodule *sm, int write_index) memset(&entry, 0, sizeof(entry)); entry.path = sm->path; - git_index__init_entry_from_stat(&st, &entry); + git_index_entry__init_from_stat(&entry, &st); /* calling git_submodule_open will have set sm->wd_oid if possible */ if ((sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) == 0) { |