mirror of
https://github.com/git/git.git
synced 2024-05-25 19:26:38 +02:00
f9f99b3f7d
The grafts feature was a convenient way to "stitch together" ancient
history to the fresh start of linux.git.
Its implementation is, however, not up to Git's standards, as there are
too many ways where it can lead to surprising and unwelcome behavior.
For example, when pushing from a repository with active grafts, it is
possible to miss commits that have been "grafted out", resulting in a
broken state on the other side.
Also, the grafts feature is limited to "rewriting" commits' list of
parents, it cannot replace anything else.
The much younger feature implemented as `git replace` set out to remedy
those limitations and dangerous bugs.
Seeing as `git replace` is pretty mature by now (since 4228e8bc98
(replace: add --graft option, 2014-07-19) it can perform the graft
file's duties), it is time to deprecate support for the graft file, and
to retire it eventually.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
123 lines
2.6 KiB
Bash
Executable File
123 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Revision traversal vs grafts and path limiter'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
mkdir subdir &&
|
|
echo >fileA fileA &&
|
|
echo >subdir/fileB fileB &&
|
|
git add fileA subdir/fileB &&
|
|
git commit -a -m "Initial in one history." &&
|
|
A0=$(git rev-parse --verify HEAD) &&
|
|
|
|
echo >fileA fileA modified &&
|
|
git commit -a -m "Second in one history." &&
|
|
A1=$(git rev-parse --verify HEAD) &&
|
|
|
|
echo >subdir/fileB fileB modified &&
|
|
git commit -a -m "Third in one history." &&
|
|
A2=$(git rev-parse --verify HEAD) &&
|
|
|
|
rm -f .git/refs/heads/master .git/index &&
|
|
|
|
echo >fileA fileA again &&
|
|
echo >subdir/fileB fileB again &&
|
|
git add fileA subdir/fileB &&
|
|
git commit -a -m "Initial in alternate history." &&
|
|
B0=$(git rev-parse --verify HEAD) &&
|
|
|
|
echo >fileA fileA modified in alternate history &&
|
|
git commit -a -m "Second in alternate history." &&
|
|
B1=$(git rev-parse --verify HEAD) &&
|
|
|
|
echo >subdir/fileB fileB modified in alternate history &&
|
|
git commit -a -m "Third in alternate history." &&
|
|
B2=$(git rev-parse --verify HEAD) &&
|
|
: done
|
|
'
|
|
|
|
check () {
|
|
type=$1
|
|
shift
|
|
|
|
arg=
|
|
which=arg
|
|
rm -f test.expect
|
|
for a
|
|
do
|
|
if test "z$a" = z--
|
|
then
|
|
which=expect
|
|
child=
|
|
continue
|
|
fi
|
|
if test "$which" = arg
|
|
then
|
|
arg="$arg$a "
|
|
continue
|
|
fi
|
|
if test "$type" = basic
|
|
then
|
|
echo "$a"
|
|
else
|
|
if test "z$child" != z
|
|
then
|
|
echo "$child $a"
|
|
fi
|
|
child="$a"
|
|
fi
|
|
done >test.expect
|
|
if test "$type" != basic && test "z$child" != z
|
|
then
|
|
echo >>test.expect $child
|
|
fi
|
|
if test $type = basic
|
|
then
|
|
git rev-list $arg >test.actual
|
|
elif test $type = parents
|
|
then
|
|
git rev-list --parents $arg >test.actual
|
|
elif test $type = parents-raw
|
|
then
|
|
git rev-list --parents --pretty=raw $arg |
|
|
sed -n -e 's/^commit //p' >test.actual
|
|
fi
|
|
test_cmp test.expect test.actual
|
|
}
|
|
|
|
for type in basic parents parents-raw
|
|
do
|
|
test_expect_success 'without grafts' "
|
|
rm -f .git/info/grafts &&
|
|
check $type $B2 -- $B2 $B1 $B0
|
|
"
|
|
|
|
test_expect_success 'with grafts' "
|
|
echo '$B0 $A2' >.git/info/grafts &&
|
|
check $type $B2 -- $B2 $B1 $B0 $A2 $A1 $A0
|
|
"
|
|
|
|
test_expect_success 'without grafts, with pathlimit' "
|
|
rm -f .git/info/grafts &&
|
|
check $type $B2 subdir -- $B2 $B0
|
|
"
|
|
|
|
test_expect_success 'with grafts, with pathlimit' "
|
|
echo '$B0 $A2' >.git/info/grafts &&
|
|
check $type $B2 subdir -- $B2 $B0 $A2 $A0
|
|
"
|
|
|
|
done
|
|
|
|
test_expect_success 'show advice that grafts are deprecated' '
|
|
git show HEAD 2>err &&
|
|
test_i18ngrep "git replace" err &&
|
|
test_config advice.graftFileDeprecated false &&
|
|
git show HEAD 2>err &&
|
|
test_i18ngrep ! "git replace" err
|
|
'
|
|
|
|
test_done
|