diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-14 05:58:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-14 05:58:51 (GMT) |
| commit | 8311158c66e0d83df950ea837fb1cb332c51f798 (patch) | |
| tree | d36f54375886bb0939416986d92aa8842ce29711 /builtin/apply.c | |
| parent | 10dd3b2bf1444695416c0dac951297acf7d4e5e4 (diff) | |
| parent | 66c11f02b031aca6f1756086fefdf4b8a5575c56 (diff) | |
| download | git-8311158c66e0d83df950ea837fb1cb332c51f798.zip git-8311158c66e0d83df950ea837fb1cb332c51f798.tar.gz git-8311158c66e0d83df950ea837fb1cb332c51f798.tar.bz2 | |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
Git 1.7.7.5
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
checkout,merge: loosen overwriting untracked file check based on info/exclude
cast variable in call to free() in builtin/diff.c and submodule.c
apply: get rid of useless x < 0 comparison on a size_t type
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
builtin/fetch.c
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 84a8a0b..b3b59db 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -250,9 +250,6 @@ static int fuzzy_matchlines(const char *s1, size_t n1, const char *last2 = s2 + n2 - 1; int result = 0; - if (n1 < 0 || n2 < 0) - return 0; - /* ignore line endings */ while ((*last1 == '\r') || (*last1 == '\n')) last1--; |