Shawn O. Pearce schrieb: > git-gui: Fix diff parsing for lines starting with "--" or "++" > > Languages like Lua and SQL use "--" to mark a line as commented out. > If this appears at column 0 and is part of the pre-image we may see > "--- foo" in the diff, indicating that the line whose content is > "-- foo" has been removed from the new version. > > git-gui was incorrectly parsing "--- foo" as the old file name > in the file header, causing it to generate a bad patch file when > the user tried to stage or unstage a hunk or the selected line. > We need to keep track of where we are in the parsing so that we do > not misread a deletion or addition record as part of the header. This (slightly) breaks parsing of new files and removed files that are staged by showing the file names in the diff header: new file mode 100644 --- /dev/null +++ b/foo @@ -0,0 +1 @@ +foo -- Hannes -- 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
