t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
[git] / git-rebase--am.sh
1 # This shell script fragment is sourced by git-rebase to implement
2 # its default, fast, patch-based, non-interactive mode.
3 #
4 # Copyright (c) 2010 Junio C Hamano.
5 #
6
7 git_rebase__am () {
8
9 case "$action" in
10 continue)
11         git am --resolved --resolvemsg="$resolvemsg" \
12                 ${gpg_sign_opt:+"$gpg_sign_opt"} &&
13         move_to_original_branch
14         return
15         ;;
16 skip)
17         git am --skip --resolvemsg="$resolvemsg" &&
18         move_to_original_branch
19         return
20         ;;
21 show-current-patch)
22         exec git am --show-current-patch
23         ;;
24 esac
25
26 if test -z "$rebase_root"
27         # this is now equivalent to ! -z "$upstream"
28 then
29         revisions=$upstream...$orig_head
30 else
31         revisions=$onto...$orig_head
32 fi
33
34 ret=0
35 rm -f "$GIT_DIR/rebased-patches"
36
37 git format-patch -k --stdout --full-index --cherry-pick --right-only \
38         --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
39         --pretty=mboxrd --topo-order \
40         $git_format_patch_opt \
41         "$revisions" ${restrict_revision+^$restrict_revision} \
42         >"$GIT_DIR/rebased-patches"
43 ret=$?
44
45 if test 0 != $ret
46 then
47         rm -f "$GIT_DIR/rebased-patches"
48         case "$head_name" in
49         refs/heads/*)
50                 git checkout -q "$head_name"
51                 ;;
52         *)
53                 git checkout -q "$orig_head"
54                 ;;
55         esac
56
57         cat >&2 <<-EOF
58
59         git encountered an error while preparing the patches to replay
60         these revisions:
61
62             $revisions
63
64         As a result, git cannot rebase them.
65         EOF
66         return $ret
67 fi
68
69 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
70         --patch-format=mboxrd \
71         $allow_rerere_autoupdate \
72         ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
73 ret=$?
74
75 rm -f "$GIT_DIR/rebased-patches"
76
77 if test 0 != $ret
78 then
79         test -d "$state_dir" && write_basic_state
80         return $ret
81 fi
82
83 move_to_original_branch
84
85 }