Commits

Commit:
69c6accf47680d70def917cbab0e761177d8264b
From:
Omar Polo <op@omarpolo.com>
Date:
include sha2.h where sha1.h was included
diff | patch | tree
Commit:
b90054ed55f30ebe28115abf5ad9cecc2b925713
From:
Stefan Sperling <stsp@stsp.name>
Date:
use mkstemps(3) instead of mkstemp(3) for opening named temporary files Allows 'got commit' to use a ".diff" suffix for temporary diff files. ok op@
diff | patch | tree
Commit:
d671c3138b0a55e515557fd21584dd92c4b42a14
From:
Tom Jones <thj@freebsd.org>
Via:
Stefan Sperling <stsp@stsp.name>
Date:
switch diff output mode from "edscript" to "plain" for diff3 getchange() in diff3.c takes any line that starts with an integer and treats it as a hunk header. It doesn't actually require ed script instructions, and traditional ed script diff output would break it. Thus, changing Got's diff3 to rely on plain diff output mode paves the way for implementing traditional ed-script style output in diff.git. Patch by Tom Jones
diff | patch | tree
Commit:
4b752015b5208a96c2d1b6c1c6b8589884b8b2b6
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch 'tog diff' and 'tog blame' to Myers diff for speed Make the choice of diff algorithm configurable by diff API users. The got and gotweb programs keep using Patience diffs which are prettier than Myers. But tog should be as fast as possible since it is being used interactively. If performance of Patience diff gets improved later we can consider switching tog back over to it. ok tracey jamsek
diff | patch | tree
Commit:
d7b5a0e827bb38e5c8502f0ba8d7838fedaba19b
From:
Stefan Sperling <stsp@stsp.name>
Date:
inline struct got_object_id in struct got_object_qid Saves us from doing a malloc/free call for every item on the list. ok op@
diff | patch | tree
Commit:
c0df59665de91324eeab1808c6c4e41343f21789
From:
Stefan Sperling <stsp@stsp.name>
Date:
wrap overlong lines
diff | patch | tree
Commit:
00fe21f262ab567bb792120514b49b37236c5422
From:
Stefan Sperling <stsp@stsp.name>
Date:
add "e" (close-on-exec) flag to fopen(3) calls suggested by millert ok thomas_adam
diff | patch | tree
Commit:
0e039681388d7ec1f832edcbb108ac28db95ae1e
From:
Stefan Sperling <stsp@stsp.name>
Date:
preverse binary files during updates and merges
diff | patch | tree
Commit:
15a5c949ff1919c186b5ebf2bfcadcaca4939e04
From:
Stefan Sperling <stsp@stsp.name>
Date:
set oldo.to in diff3.c's duplicate() even if the file contains no newlines
diff | patch | tree
Commit:
8383a50b870f78d970e3d7efa1addf07c3d4ef4a
From:
Stefan Sperling <stsp@stsp.name>
Date:
always initialize output parameter "n" of get_line() in diff3.c
diff | patch | tree
Commit:
4f18c4000896c6ade7e7bd662d05f75686d338b2
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
fix another segfault in edscript() Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1. ok stsp
diff | patch | tree
Commit:
90de04bc7f1b85b9c491bcd124f6178fad005de1
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix a segfault in edscript() introduced by my previous commit Found by our cherrypick regression tests.
diff | patch | tree
Commit:
f10244c07ff073c7f69ecf2044ac34e85f0666a0
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix merging of files which contain a dot on a line by itself Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert
diff | patch | tree
Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
indentation fixes
diff | patch | tree
Commit:
fdf3c2d3876d076bf098461a4d147227126588b4
From:
Stefan Sperling <stsp@stsp.name>
Date:
use Patience diff for merging during cherrypick/backout/histedit/rebase This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.
diff | patch | tree