mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
48313592bf
The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own commit ancestry chain to the current tree. Revert applies the diff in reverse while cherry-pick applies it forward. They share the same logic, just different messages and merge direction. Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano <junkio@cox.net>
27 lines
557 B
Bash
Executable file
27 lines
557 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Set up GIT_DIR and GIT_OBJECT_DIRECTORY
|
|
# and return true if everything looks ok
|
|
#
|
|
: ${GIT_DIR=.git}
|
|
: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
|
|
|
|
die() {
|
|
echo "$@" >&2
|
|
exit 1
|
|
}
|
|
|
|
check_clean_tree() {
|
|
dirty1_=`git-update-cache -q --refresh` && {
|
|
dirty2_=`git-diff-cache --name-only --cached HEAD`
|
|
case "$dirty2_" in '') : ;; *) (exit 1) ;; esac
|
|
} || {
|
|
echo >&2 "$dirty1_"
|
|
echo "$dirty2_" | sed >&2 -e 's/^/modified: /'
|
|
(exit 1)
|
|
}
|
|
}
|
|
|
|
[ -h "$GIT_DIR/HEAD" ] &&
|
|
[ -d "$GIT_DIR/refs" ] &&
|
|
[ -d "$GIT_OBJECT_DIRECTORY/00" ]
|