On 5/20/07, Michael <barra_cuda@xxxxxxxxxxxx> wrote:
Signed-off-by: Michele Ballabio <barra_cuda@xxxxxxxxxxxx> --- ...is this correct? src/git_startup.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/git_startup.cpp b/src/git_startup.cpp index a99edba..17312f9 100644 --- a/src/git_startup.cpp +++ b/src/git_startup.cpp @@ -329,7 +329,7 @@ void Git::parseDiffFormatLine(RevFile& rf, SCRef line, int parNum) { // TODO rename/copy is not supported for combined merges appendFileName(rf, line.section('\t', -1)); - setStatus(rf, line.section(' ', 6, 6).left(1)); + setStatus(rf, line.section('\t', -2, -2).right(1)); rf.mergeParent.append(parNum); } else { // faster parsing in normal case -- 1.5.1.2
Where do you see the ASSERT? could you link me to the test repository when you see that warnings? I would like to understand better what causes the warnings. Thanks Marco - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html