summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2010-08-15 07:20:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-17 01:31:37 (GMT)
commit34597c1f5a77c710dae33092cb8a7cb01c6b21c1 (patch)
tree8d9ec7281371366dd225e639960118bc4d5a33a8 /git-rebase--interactive.sh
parent64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff)
downloadgit-34597c1f5a77c710dae33092cb8a7cb01c6b21c1.zip
git-34597c1f5a77c710dae33092cb8a7cb01c6b21c1.tar.gz
git-34597c1f5a77c710dae33092cb8a7cb01c6b21c1.tar.bz2
hash binary sha1 into patch id
Since commit 2f82f760 (Take binary diffs into account for "git rebase"), binary files are included in patch ID computation. Binary files are diffed using the text diff algorithm, however, which has a huge impact on performance. The following tests performance for a 50000 line file marked as binary in .gitattributes. $ git format-patch --stdout --ignore-if-in-upstream master real 0m0.367s user 0m0.354s sys 0m0.010s Instead of diffing the binary files, hash the pre- and post-image sha1, which is just as unique. As a result, performance is much improved. $ git format-patch --stdout --ignore-if-in-upstream master real 0m0.016s user 0m0.015s sys 0m0.001s Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions