diff options
| author | Russell Belfer <rb@github.com> | 2013-05-07 04:32:17 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-05-07 04:32:17 -0700 |
| commit | e35e2684f693f28afb7a8f28028b4cb8bdd19f49 (patch) | |
| tree | 95b1a7c9a41145a6495535cdc1f8b840d241dca0 /src/diff_output.c | |
| parent | 3405f78754703948475b4677d03fcdbfb099b6a4 (diff) | |
| download | libgit2-e35e2684f693f28afb7a8f28028b4cb8bdd19f49.tar.gz | |
Add GIT_DIFF_LINE_CONTEXT_EOFNL
This adds a new line origin constant for the special line that
is used when both files end without a newline.
In the course of writing the tests for this, I was having problems
with modifying a file but not having diff notice because it was
the same size and modified less than one second from the start of
the test, so I decided to start working on nanosecond timestamp
support. This commit doesn't contain the nanosecond support, but
it contains the reorganization of maybe_modified and the hooks so
that if the nanosecond data were being read by stat() (or rather
being copied by git_index_entry__init_from_stat), then the nsec
would be taken into account.
This new stuff could probably use some more tests, although there
is some amount of it here.
Diffstat (limited to 'src/diff_output.c')
| -rw-r--r-- | src/diff_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff_output.c b/src/diff_output.c index bac8622c8..dda0f534d 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -726,7 +726,7 @@ static int diff_patch_cb(void *priv, mmbuffer_t *bufs, int len) char origin = (*bufs[0].ptr == '+') ? GIT_DIFF_LINE_DEL_EOFNL : (*bufs[0].ptr == '-') ? GIT_DIFF_LINE_ADD_EOFNL : - GIT_DIFF_LINE_CONTEXT; + GIT_DIFF_LINE_CONTEXT_EOFNL; if (ctxt->data_cb != NULL && ctxt->data_cb(patch->delta, &ctxt->range, |