|
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2006 Eric Wong
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='git rebase --merge --skip tests'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
# we assume the default git-am -3 --skip strategy is tested independently
|
|
|
|
|
# and always works :)
|
|
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
echo hello > hello &&
|
|
|
|
|
git add hello &&
|
|
|
|
|
git commit -m "hello" &&
|
|
|
|
|
git branch skip-reference &&
|
|
|
|
|
|
|
|
|
|
echo world >> hello &&
|
|
|
|
|
git commit -a -m "hello world" &&
|
|
|
|
|
echo goodbye >> hello &&
|
|
|
|
|
git commit -a -m "goodbye" &&
|
|
|
|
|
|
|
|
|
|
git checkout -f skip-reference &&
|
|
|
|
|
echo moo > hello &&
|
|
|
|
|
git commit -a -m "we should skip this" &&
|
|
|
|
|
echo moo > cow &&
|
|
|
|
|
git add cow &&
|
|
|
|
|
git commit -m "this should not be skipped" &&
|
|
|
|
|
git branch pre-rebase skip-reference &&
|
|
|
|
|
git branch skip-merge skip-reference
|
|
|
|
|
'
|
|
|
|
|
|
apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
In "git-apply", we have a few sanity checks and heuristics that
expects that the patch fed to us is a unified diff with at least
one line of context.
* When there is no leading context line in a hunk, the hunk
must apply at the beginning of the preimage. Similarly, no
trailing context means that the hunk is anchored at the end.
* We learn a patch deletes the file from a hunk that has no
resulting line (i.e. all lines are prefixed with '-') if it
has not otherwise been known if the patch deletes the file.
Similarly, no old line means the file is being created.
And we declare an error condition when the file created by a
creation patch already exists, and/or when a deletion patch
still leaves content in the file.
These sanity checks are good safety measures, but breaks down
when people feed a diff generated with --unified=0. This was
recently noticed first by Matthew Wilcox and Gerrit Pape.
This adds a new flag, --unified-zero, to allow bypassing these
checks. If you are in control of the patch generation process,
you should not use --unified=0 patch and fix it up with this
flag; rather you should try work with a patch with context. But
if all you have to work with is a patch without context, this
flag may come handy as the last resort.
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
test_expect_failure 'rebase with git am -3 (default)' '
|
|
|
|
|
git rebase master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rebase --skip with am -3' '
|
|
|
|
|
git reset --hard HEAD &&
|
|
|
|
|
git rebase --skip
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
|
|
|
|
|
|
|
|
|
|
test_expect_failure 'rebase with --merge' 'git rebase --merge master'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rebase --skip with --merge' '
|
|
|
|
|
git reset --hard HEAD &&
|
|
|
|
|
git rebase --skip
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge and reference trees equal' \
|
|
|
|
|
'test -z "`git-diff-tree skip-merge skip-reference`"'
|
|
|
|
|
|
|
|
|
|
test_debug 'gitk --all & sleep 1'
|
|
|
|
|
|
|
|
|
|
test_done
|
|
|
|
|
|
