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 die "What are you talking about?" ;;
25 while case "$#" in 0) break ;; esac
28 -n|--n|--no|--no-|--no-c|--no-co|--no-com|--no-comm|\
29 --no-commi|--no-commit)
32 -e|--e|--ed|--edi|--edit)
35 --n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
40 -x|--i-really-want-to-expose-my-private-commit-object-name)
53 test "$me,$replay" = "revert,t" && usage
57 # We do not intend to commit immediately. We just want to
58 # merge the differences in.
59 head=$(git-write-tree) ||
60 die "Your index file is unmerged."
63 head=$(git-rev-parse --verify HEAD) ||
64 die "You do not have a valid HEAD"
65 files=$(git-diff-index --cached --name-only $head) || exit
67 die "Dirty index: cannot $me (dirty: $files)"
72 rev=$(git-rev-parse --verify "$@") &&
73 commit=$(git-rev-parse --verify "$rev^0") ||
74 die "Not a single commit $@"
75 prev=$(git-rev-parse --verify "$commit^1" 2>/dev/null) ||
76 die "Cannot run $me a root commit"
77 git-rev-parse --verify "$commit^2" >/dev/null 2>&1 &&
78 die "Cannot run $me a multi-parent commit."
80 # "commit" is an existing commit. We would want to apply
81 # the difference it introduces since its first parent "prev"
82 # on top of the current HEAD if we are cherry-pick. Or the
83 # reverse of it if we are revert.
87 git-rev-list --pretty=oneline --max-count=1 $commit |
92 echo "This reverts commit $commit."
93 test "$rev" = "$commit" ||
94 echo "(original 'git revert' arguments: $@)"
95 base=$commit next=$prev
101 s/'\''/'\''\\'\'\''/g
103 s/^author \([^<]*\) <[^>]*> .*$/\1/
105 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
108 s/^author [^<]* <\([^>]*\)> .*$/\1/
110 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
113 s/^author [^<]* <[^>]*> \(.*\)$/\1/
115 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
119 set_author_env=`git-cat-file commit "$commit" |
120 LANG=C LC_ALL=C sed -ne "$pick_author_script"`
121 eval "$set_author_env"
122 export GIT_AUTHOR_NAME
123 export GIT_AUTHOR_EMAIL
124 export GIT_AUTHOR_DATE
126 git-cat-file commit $commit | sed -e '1,/^$/d'
129 echo "(cherry picked from commit $commit)"
130 test "$rev" = "$commit" ||
131 echo "(original 'git cherry-pick' arguments: $@)"
134 base=$prev next=$commit
139 # This three way merge is an interesting one. We are at
140 # $head, and would want to apply the change between $commit
141 # and $prev on top of us (when reverting), or the change between
142 # $prev and $commit on top of us (when cherry-picking or replaying).
144 echo >&2 "First trying simple merge strategy to $me."
145 git-read-tree -m -u --aggressive $base $head $next &&
146 result=$(git-write-tree 2>/dev/null) || {
147 echo >&2 "Simple $me fails; trying Automatic $me."
148 git-merge-index -o git-merge-one-file -a || {
149 mv -f .msg "$GIT_DIR/MERGE_MSG"
154 git ls-files --unmerged |
155 sed -e 's/^[^ ]* / /' |
157 } >>"$GIT_DIR/MERGE_MSG"
158 echo >&2 "Automatic $me failed. After resolving the conflicts,"
159 echo >&2 "mark the corrected paths with 'git-add <paths>'"
160 echo >&2 "and commit the result."
163 echo >&2 "You may choose to use the following when making"
164 echo >&2 "the commit:"
165 echo >&2 "$set_author_env"
169 result=$(git-write-tree) || exit
171 echo >&2 "Finished one $me."
173 # If we are cherry-pick, and if the merge did not result in
174 # hand-editing, we will hit this commit and inherit the original
175 # author date and name.
176 # If we are revert, or if our cherry-pick results in a hand merge,
177 # we had better say that the current user is responsible for that.
181 git-commit -n -F .msg $edit