Re: [PATCH 0/5] gitweb: git_patchset_body fixes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ok, I see that Junio has committed the fixes to "next" -- thanks!
That saved me time having to manually apply them.

Now, the results are that I see the same bug.

gitweb and gitcore as reported by the xml header
is 1.4.4.4.g7c5d, which is "next" as of a few minutes
ago, merged over twice into my branchA and branchB
(names changed).

The commit that fails looks is the attachment
with names and contents changed to protect the
innocent.

The complaint Firefox 2.0.0.1 says is the err.txt
file attached.

    Luben


XML Parsing Error: mismatched tag. Expected: </div>.
Location: http://lion.vitesse.com/git/?p=vhal.git;a=commitdiff;h=b4e81df5f58bc24bb690b5b3687fd36180e071b8;hp=bd5f8325508ee5151d84d65f50b72fd7f3ecc77a
Line Number 95, Column 3:

</body>
--^
$ git-diff-tree -r --no-commit-id --patch-with-raw --full-index b4e81df5f58bc24bb690b5b3687fd36180e071b8 > /tmp/diff.txt

:100644 100644 a4bf8891fc1153946b2d1531fdfe09f53a532c65 28929eb48708d0bc33d4c80c4349e753332ea4e1 M	fileA
:000000 100644 0000000000000000000000000000000000000000 36dec28bfc5ec04cff264fd1b7c4b47ab7bad3e3 A	fileB
:100644 000000 36dec28bfc5ec04cff264fd1b7c4b47ab7bad3e3 0000000000000000000000000000000000000000 D	fileC

diff --git a/fileA b/fileA
index a4bf8891fc1153946b2d1531fdfe09f53a532c65..28929eb48708d0bc33d4c80c4349e753332ea4e1 100644
--- a/fileA
+++ b/fileA
@@ -1,6 +1,6 @@

... one line change ...

diff --git a/fileB b/fileB
new file mode 100644
index 0000000000000000000000000000000000000000..36dec28bfc5ec04cff264fd1b7c4b47ab7bad3e3
--- /dev/null
+++ b/fileB
@@ -0,0 +1,89 @@

... it is obvious what happened here ...

diff --git a/fileC b/fileC
deleted file mode 100644
index 36dec28bfc5ec04cff264fd1b7c4b47ab7bad3e3..0000000000000000000000000000000000000000
--- a/fileC
+++ /dev/null
@@ -1,89 +0,0 @@

... again it is obvious what happened here ...


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]