Revision d616fbf256ef3102669d450ddadd8469fefcf95c authored by Eric Sunshine on 21 March 2016, 04:35:57 UTC, committed by Junio C Hamano on 21 March 2016, 16:18:07 UTC
Although changes by 5b442c4 (tree-diff: catch integer overflow in
combine_diff_path allocation, 2016-02-19) are perfectly valid, they
unfortunately trigger an internal compiler error in gcc 4.2.x:

    combine-diff.c: In function 'diff_tree_combined':
    combine-diff.c:1391: internal compiler error: Segmentation fault: 11

Experimentation reveals that changing st_add4()'s argument evaluation
order is sufficient to sidestep this problem.

Although st_add3() does not trigger the compiler bug, for style
consistency, change its argument evaluation order to match.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 935de81
History
File Mode Size
lib
macosx
po
windows
.gitattributes -rw-r--r-- 170 bytes
.gitignore -rw-r--r-- 97 bytes
GIT-VERSION-GEN -rwxr-xr-x 1.8 KB
Makefile -rw-r--r-- 11.4 KB
git-gui--askpass -rwxr-xr-x 1.3 KB
git-gui.sh -rwxr-xr-x 98.3 KB

back to top