Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 29f049a0c277be72637f74f1f90a89dccd3475bc authored by Junio C Hamano on 15 October 2006, 06:37:41 UTC, committed by Junio C Hamano on 15 October 2006, 06:38:01 UTC 
Revert "move pack creation to version 3"
 
This reverts commit 16854571aae6302f457c5fbee41ac64669b09595.
Git as recent as v1.1.6 do not understand version 3 delta.

v1.2.0 is Ok and I personally would say it is old enough, but
the improvement between version 2 and version 3 delta is not
bit enough to justify breaking older clients.

We should resurrect this later, but when we do so we shold
make it conditional.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 0a24657
Raw File
Tip revision: 29f049a0c277be72637f74f1f90a89dccd3475bc authored by Junio C Hamano on 15 October 2006, 06:37:41 UTC
Revert "move pack creation to version 3"
Tip revision: 29f049a
git-merge-ours.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top