3 # Copyright (c) 2005 Linus Torvalds
4 # Copyright (c) 2005 Junio C Hamano
12 USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
17 USAGE='[--edit] [-n] [-r] [-x] <commit-ish>' ;;
19 echo >&2 "What are you talking about?"
23 SUBDIRECTORY_OK=Yes ;# we will cd up
29 while case "$#" in 0) break ;; esac
32 -n|--n|--no|--no-|--no-c|--no-co|--no-com|--no-comm|\
33 --no-commi|--no-commit)
36 -e|--e|--ed|--edi|--edit)
39 --n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
44 -x|--i-really-want-to-expose-my-private-commit-object-name)
57 test "$me,$replay" = "revert,t" && usage
61 # We do not intend to commit immediately. We just want to
62 # merge the differences in.
63 head=$(git-write-tree) ||
64 die "Your index file is unmerged."
67 head=$(git-rev-parse --verify HEAD) ||
68 die "You do not have a valid HEAD"
69 files=$(git-diff-index --cached --name-only $head) || exit
71 die "Dirty index: cannot $me (dirty: $files)"
76 rev=$(git-rev-parse --verify "$@") &&
77 commit=$(git-rev-parse --verify "$rev^0") ||
78 die "Not a single commit $@"
79 prev=$(git-rev-parse --verify "$commit^1" 2>/dev/null) ||
80 die "Cannot run $me a root commit"
81 git-rev-parse --verify "$commit^2" >/dev/null 2>&1 &&
82 die "Cannot run $me a multi-parent commit."
84 # "commit" is an existing commit. We would want to apply
85 # the difference it introduces since its first parent "prev"
86 # on top of the current HEAD if we are cherry-pick. Or the
87 # reverse of it if we are revert.
91 git-rev-list --pretty=oneline --max-count=1 $commit |
96 echo "This reverts commit $commit."
97 test "$rev" = "$commit" ||
98 echo "(original 'git revert' arguments: $@)"
99 base=$commit next=$prev
105 s/'\''/'\''\\'\'\''/g
107 s/^author \([^<]*\) <[^>]*> .*$/\1/
109 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
112 s/^author [^<]* <\([^>]*\)> .*$/\1/
114 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
117 s/^author [^<]* <[^>]*> \(.*\)$/\1/
119 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
123 set_author_env=`git-cat-file commit "$commit" |
124 LANG=C LC_ALL=C sed -ne "$pick_author_script"`
125 eval "$set_author_env"
126 export GIT_AUTHOR_NAME
127 export GIT_AUTHOR_EMAIL
128 export GIT_AUTHOR_DATE
130 git-cat-file commit $commit | sed -e '1,/^$/d'
133 echo "(cherry picked from commit $commit)"
134 test "$rev" = "$commit" ||
135 echo "(original 'git cherry-pick' arguments: $@)"
138 base=$prev next=$commit
143 # This three way merge is an interesting one. We are at
144 # $head, and would want to apply the change between $commit
145 # and $prev on top of us (when reverting), or the change between
146 # $prev and $commit on top of us (when cherry-picking or replaying).
148 echo >&2 "First trying simple merge strategy to $me."
149 git-read-tree -m -u --aggressive $base $head $next &&
150 result=$(git-write-tree 2>/dev/null) || {
151 echo >&2 "Simple $me fails; trying Automatic $me."
152 git-merge-index -o git-merge-one-file -a || {
153 mv -f .msg "$GIT_DIR/MERGE_MSG"
158 git ls-files --unmerged |
159 sed -e 's/^[^ ]* / /' |
161 } >>"$GIT_DIR/MERGE_MSG"
162 echo >&2 "Automatic $me failed. After resolving the conflicts,"
163 echo >&2 "mark the corrected paths with 'git-add <paths>'"
164 echo >&2 "and commit the result."
167 echo >&2 "You may choose to use the following when making"
168 echo >&2 "the commit:"
169 echo >&2 "$set_author_env"
173 result=$(git-write-tree) || exit
175 echo >&2 "Finished one $me."
177 # If we are cherry-pick, and if the merge did not result in
178 # hand-editing, we will hit this commit and inherit the original
179 # author date and name.
180 # If we are revert, or if our cherry-pick results in a hand merge,
181 # we had better say that the current user is responsible for that.
185 git-commit -n -F .msg $edit