Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100755 523 lines (488 sloc) 13.285 kB
59e6b23 [PATCH] git-rebase-script: rebase local commits to new upstream head.
Junio C Hamano authored
1 #!/bin/sh
2 #
3 # Copyright (c) 2005 Junio C Hamano.
4 #
5
15a147e rebase: use @{upstream} if no upstream specified
Martin von Zweigbergk authored
6 USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]'
031321c @loops Add --continue and --abort options to git-rebase.
loops authored
7 LONG_USAGE='git-rebase replaces <branch> with a new branch of the
8 same name. When the --onto option is provided the new branch starts
9 out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>
10 It then attempts to create a new commit for each commit from the original
11 <branch> that does not exist in the <upstream> branch.
69a60af @cworth-gh git-rebase: Clarify usage statement and copy it into the actual docum…
cworth-gh authored
12
031321c @loops Add --continue and --abort options to git-rebase.
loops authored
13 It is possible that a merge failure will prevent this process from being
14 completely automatic. You will have to resolve any such merge failure
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
15 and run git rebase --continue. Another option is to bypass the commit
5960bc9 rebase: clarify "restore the original branch"
Martin von Zweigbergk authored
16 that caused the merge failure with git rebase --skip. To check out the
51ef1da @dscho Rename .git/rebase to .git/rebase-apply
dscho authored
17 original <branch> and remove the .git/rebase-apply working files, use the
18 command git rebase --abort instead.
69a60af @cworth-gh git-rebase: Clarify usage statement and copy it into the actual docum…
cworth-gh authored
19
031321c @loops Add --continue and --abort options to git-rebase.
loops authored
20 Note that if <branch> is not specified on the command line, the
702088a @szeder update 'git rebase' documentation
szeder authored
21 currently checked out branch is used.
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
22
031321c @loops Add --continue and --abort options to git-rebase.
loops authored
23 Example: git-rebase master~1 topic
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
24
285c6cb @jonseymour misc-sh: fix up whitespace in some other .sh files.
jonseymour authored
25 A---B---C topic A'\''--B'\''--C'\'' topic
031321c @loops Add --continue and --abort options to git-rebase.
loops authored
26 / --> /
27 D---E---F---G master D---E---F---G master
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
28 '
533b703 Allow whole-tree operations to be started from a subdirectory
Junio C Hamano authored
29
30 SUBDIRECTORY_OK=Yes
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
31 OPTIONS_KEEPDASHDASH=
32 OPTIONS_SPEC="\
33 git rebase [-i] [options] [--onto <newbase>] [<upstream>] [<branch>]
34 git rebase [-i] [options] --onto <newbase> --root [<branch>]
35 git-rebase [-i] --continue | --abort | --skip
36 --
37 Available options are
38 v,verbose! display a diffstat of what changed upstream
39 q,quiet! be quiet. implies --no-stat
40 onto=! rebase onto given branch instead of upstream
41 p,preserve-merges! try to recreate merges instead of ignoring them
42 s,strategy=! use the given merge strategy
43 no-ff! cherry-pick all commits, even if unchanged
44 m,merge! use merging strategies to rebase
45 i,interactive! let the user edit the list of commits to rebase
46 f,force-rebase! force rebase even if branch is up to date
47 X,strategy-option=! pass the argument through to the merge strategy
48 stat! display a diffstat of what changed upstream
49 n,no-stat! do not show diffstat of what changed upstream
50 verify allow pre-rebase hook to run
51 rerere-autoupdate allow rerere to update index with resolved conflicts
52 root! rebase all reachable commits up to the root(s)
53 autosquash move commits that begin with squash!/fixup! under -i
54 committer-date-is-author-date! passed to 'git am'
55 ignore-date! passed to 'git am'
56 whitespace=! passed to 'git apply'
57 ignore-whitespace! passed to 'git apply'
58 C=! passed to 'git apply'
59 Actions:
5960bc9 rebase: clarify "restore the original branch"
Martin von Zweigbergk authored
60 continue! continue
61 abort! abort and check out the original branch
62 skip! skip current patch and continue
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
63 "
ae2b0f1 git-sh-setup: die if outside git repository.
Junio C Hamano authored
64 . git-sh-setup
f947413 @spearce Use GIT_REFLOG_ACTION environment variable instead.
spearce authored
65 set_reflog_action rebase
035b5bf @peff pull,rebase: handle GIT_WORK_TREE better
peff authored
66 require_work_tree_exists
533b703 Allow whole-tree operations to be started from a subdirectory
Junio C Hamano authored
67 cd_to_toplevel
4282c4f Teach format-patch, rebase and cherry a..b format
Junio C Hamano authored
68
61dfa1b @gitster "rebase --onto A...B" replays history on the merge base between A and B
authored
69 LF='
70 '
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
71 ok_to_skip_pre_rebase=
72 resolvemsg="
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
73 When you have resolved this problem run \"git rebase --continue\".
74 If you would prefer to skip this patch, instead run \"git rebase --skip\".
5960bc9 rebase: clarify "restore the original branch"
Martin von Zweigbergk authored
75 To check out the original branch and stop rebasing run \"git rebase --abort\".
cc12005 @loops Make git rebase interactive help match documentation.
loops authored
76 "
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
77 unset onto
9765b6a rebase: align variable content
Martin von Zweigbergk authored
78 strategy=
93ce190 @novas0x2a rebase: support -X to pass through strategy options
novas0x2a authored
79 strategy_opts=
58634db rebase: Allow merge strategies to be used when rebasing
Eric Wong authored
80 do_merge=
69a636a rebase: clearer names for directory variables
Martin von Zweigbergk authored
81 merge_dir="$GIT_DIR"/rebase-merge
82 apply_dir="$GIT_DIR"/rebase-apply
b758789 git-rebase: Add a -v option to show a diffstat of the changes upstrea…
Robert Shearman authored
83 verbose=
9474a02 rebase: only show stat if configured to true
Martin von Zweigbergk authored
84 diffstat=
85 test "$(git config --bool rebase.stat)" = true && diffstat=t
67dad68 add -C[NUM] to git-am
Michael S. Tsirkin authored
86 git_am_opt=
190f532 @trast rebase: learn to rebase root commit
trast authored
87 rebase_root=
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
88 force_rebase=
cb6020b @gitster Teach --[no-]rerere-autoupdate option to merge, revert and friends
authored
89 allow_rerere_autoupdate=
99de064 rebase: improve detection of rebase in progress
Martin von Zweigbergk authored
90 # Non-empty if a rebase was in progress when 'git rebase' was invoked
91 in_progress=
92 # One of {am, merge, interactive}
93 type=
94 # One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge}
95 state_dir=
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
96 # One of {'', continue, skip, abort}, as parsed from command line
97 action=
cf432ca rebase: factor out command line option processing
Martin von Zweigbergk authored
98 preserve_merges=
99 autosquash=
100 test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
58634db rebase: Allow merge strategies to be used when rebasing
Eric Wong authored
101
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
102 read_basic_state () {
02ac45f rebase: refactor reading of state
Martin von Zweigbergk authored
103 head_name=$(cat "$state_dir"/head-name) &&
104 onto=$(cat "$state_dir"/onto) &&
84df456 rebase: extract code for writing basic state
Martin von Zweigbergk authored
105 # We always write to orig-head, but interactive rebase used to write to
106 # head. Fall back to reading from head to cover for the case that the
107 # user upgraded git with an ongoing interactive rebase.
108 if test -f "$state_dir"/orig-head
2959c28 rebase: factor out sub command handling
Martin von Zweigbergk authored
109 then
110 orig_head=$(cat "$state_dir"/orig-head)
84df456 rebase: extract code for writing basic state
Martin von Zweigbergk authored
111 else
112 orig_head=$(cat "$state_dir"/head)
2959c28 rebase: factor out sub command handling
Martin von Zweigbergk authored
113 fi &&
7b37a7c rebase: remember verbose option
Martin von Zweigbergk authored
114 GIT_QUIET=$(cat "$state_dir"/quiet) &&
115 test -f "$state_dir"/verbose && verbose=t
80ff479 rebase: remember strategy and strategy options
Martin von Zweigbergk authored
116 test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
117 test -f "$state_dir"/strategy_opts &&
118 strategy_opts="$(cat "$state_dir"/strategy_opts)"
b3e4847 rebase -m: remember allow_rerere_autoupdate option
Martin von Zweigbergk authored
119 test -f "$state_dir"/allow_rerere_autoupdate &&
120 allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)"
02ac45f rebase: refactor reading of state
Martin von Zweigbergk authored
121 }
122
84df456 rebase: extract code for writing basic state
Martin von Zweigbergk authored
123 write_basic_state () {
124 echo "$head_name" > "$state_dir"/head-name &&
125 echo "$onto" > "$state_dir"/onto &&
126 echo "$orig_head" > "$state_dir"/orig-head &&
7b37a7c rebase: remember verbose option
Martin von Zweigbergk authored
127 echo "$GIT_QUIET" > "$state_dir"/quiet &&
128 test t = "$verbose" && : > "$state_dir"/verbose
80ff479 rebase: remember strategy and strategy options
Martin von Zweigbergk authored
129 test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
130 test -n "$strategy_opts" && echo "$strategy_opts" > \
131 "$state_dir"/strategy_opts
b3e4847 rebase -m: remember allow_rerere_autoupdate option
Martin von Zweigbergk authored
132 test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
133 "$state_dir"/allow_rerere_autoupdate
84df456 rebase: extract code for writing basic state
Martin von Zweigbergk authored
134 }
135
4974c2c rebase: make -v a tiny bit more verbose
Martin von Zweigbergk authored
136 output () {
137 case "$verbose" in
138 '')
139 output=$("$@" 2>&1 )
140 status=$?
141 test $status != 0 && printf "%s\n" "$output"
142 return $status
143 ;;
144 *)
145 "$@"
146 ;;
147 esac
148 }
149
6fd2f5e @dscho rebase: operate on a detached HEAD
dscho authored
150 move_to_original_branch () {
151 case "$head_name" in
152 refs/*)
153 message="rebase finished: $head_name onto $onto"
154 git update-ref -m "$message" \
155 $head_name $(git rev-parse HEAD) $orig_head &&
53f2ffa @peff rebase: write a reflog entry when finishing
peff authored
156 git symbolic-ref \
157 -m "rebase finished: returning to $head_name" \
158 HEAD $head_name ||
6fd2f5e @dscho rebase: operate on a detached HEAD
dscho authored
159 die "Could not move back to $head_name"
160 ;;
161 esac
162 }
163
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
164 run_specific_rebase () {
f8cca01 @ageric rebase: Support preserving merges in non-interactive mode
ageric authored
165 if [ "$interactive_rebase" = implied ]; then
166 GIT_EDITOR=:
167 export GIT_EDITOR
168 fi
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored
169 . git-rebase--$type
1b1dce4 @dscho Teach rebase an interactive mode
dscho authored
170 }
171
d70b4a8 Teach rebase -i to honor pre-rebase hook
Nanako Shiraishi authored
172 run_pre_rebase_hook () {
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
173 if test -z "$ok_to_skip_pre_rebase" &&
c442765 rebase --no-verify
Nanako Shiraishi authored
174 test -x "$GIT_DIR/hooks/pre-rebase"
d70b4a8 Teach rebase -i to honor pre-rebase hook
Nanako Shiraishi authored
175 then
bc2bbc4 @bebarino pull, rebase: simplify to use die()
bebarino authored
176 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
177 die "The pre-rebase hook refused to rebase."
d70b4a8 Teach rebase -i to honor pre-rebase hook
Nanako Shiraishi authored
178 fi
179 }
180
69a636a rebase: clearer names for directory variables
Martin von Zweigbergk authored
181 test -f "$apply_dir"/applying &&
9b752a6 @sbeyer Improve error output of git-rebase
sbeyer authored
182 die 'It looks like git-am is in progress. Cannot rebase.'
183
99de064 rebase: improve detection of rebase in progress
Martin von Zweigbergk authored
184 if test -d "$apply_dir"
185 then
186 type=am
187 state_dir="$apply_dir"
188 elif test -d "$merge_dir"
189 then
190 if test -f "$merge_dir"/interactive
191 then
192 type=interactive
193 interactive_rebase=explicit
194 else
195 type=merge
196 fi
197 state_dir="$merge_dir"
198 fi
199 test -n "$type" && in_progress=t
200
95135b0 rebase: stricter check of standalone sub command
Martin von Zweigbergk authored
201 total_argc=$#
822f7c7 Supplant the "while case ... break ;; esac" idiom
David Kastrup authored
202 while test $# != 0
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
203 do
204 case "$1" in
c442765 rebase --no-verify
Nanako Shiraishi authored
205 --no-verify)
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
206 ok_to_skip_pre_rebase=yes
c442765 rebase --no-verify
Nanako Shiraishi authored
207 ;;
7baf9c4 rebase: support --verify
Martin von Zweigbergk authored
208 --verify)
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
209 ok_to_skip_pre_rebase=
7baf9c4 rebase: support --verify
Martin von Zweigbergk authored
210 ;;
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
211 --continue|--skip|--abort)
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
212 test $total_argc -eq 2 || usage
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
213 action=${1##--}
031321c @loops Add --continue and --abort options to git-rebase.
loops authored
214 ;;
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
215 --onto)
216 test 2 -le "$#" || usage
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
217 onto="$2"
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
218 shift
219 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
220 -i)
cf432ca rebase: factor out command line option processing
Martin von Zweigbergk authored
221 interactive_rebase=explicit
222 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
223 -p)
cf432ca rebase: factor out command line option processing
Martin von Zweigbergk authored
224 preserve_merges=t
225 test -z "$interactive_rebase" && interactive_rebase=implied
226 ;;
227 --autosquash)
228 autosquash=t
229 ;;
230 --no-autosquash)
231 autosquash=
232 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
233 -M|-m)
58634db rebase: Allow merge strategies to be used when rebasing
Eric Wong authored
234 do_merge=t
235 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
236 -X)
237 shift
238 strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$1")"
93ce190 @novas0x2a rebase: support -X to pass through strategy options
novas0x2a authored
239 do_merge=t
9765b6a rebase: align variable content
Martin von Zweigbergk authored
240 test -z "$strategy" && strategy=recursive
93ce190 @novas0x2a rebase: support -X to pass through strategy options
novas0x2a authored
241 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
242 -s)
243 shift
244 strategy="$1"
58634db rebase: Allow merge strategies to be used when rebasing
Eric Wong authored
245 do_merge=t
246 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
247 -n)
a9c3821 @torarnv git-rebase: Add --stat and --no-stat for producing diffstat on rebase
torarnv authored
248 diffstat=
249 ;;
250 --stat)
251 diffstat=t
252 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
253 -v)
b758789 git-rebase: Add a -v option to show a diffstat of the changes upstrea…
Robert Shearman authored
254 verbose=t
a9c3821 @torarnv git-rebase: Add --stat and --no-stat for producing diffstat on rebase
torarnv authored
255 diffstat=t
0e987a1 @bebarino am, rebase: teach quiet option
bebarino authored
256 GIT_QUIET=
257 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
258 -q)
0e987a1 @bebarino am, rebase: teach quiet option
bebarino authored
259 GIT_QUIET=t
260 git_am_opt="$git_am_opt -q"
261 verbose=
262 diffstat=
b758789 git-rebase: Add a -v option to show a diffstat of the changes upstrea…
Robert Shearman authored
263 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
264 --whitespace)
265 shift
266 git_am_opt="$git_am_opt --whitespace=$1"
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
267 case "$1" in
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
268 fix|strip)
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
269 force_rebase=t
270 ;;
271 esac
059f446 git-rebase: support --whitespace=<option>
J. Bruce Fields authored
272 ;;
86c91f9 @Oblomov git apply: option to ignore whitespace differences
Oblomov authored
273 --ignore-whitespace)
274 git_am_opt="$git_am_opt $1"
275 ;;
570ccad rebase: add options passed to git-am
Michele Ballabio authored
276 --committer-date-is-author-date|--ignore-date)
277 git_am_opt="$git_am_opt $1"
278 force_rebase=t
279 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
280 -C)
281 shift
282 git_am_opt="$git_am_opt -C$1"
67dad68 add -C[NUM] to git-am
Michael S. Tsirkin authored
283 ;;
190f532 @trast rebase: learn to rebase root commit
trast authored
284 --root)
285 rebase_root=t
286 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
287 -f|--no-ff)
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
288 force_rebase=t
289 ;;
cb6020b @gitster Teach --[no-]rerere-autoupdate option to merge, revert and friends
authored
290 --rerere-autoupdate|--no-rerere-autoupdate)
291 allow_rerere_autoupdate="$1"
292 ;;
45e2acf rebase: define options in OPTIONS_SPEC
Martin von Zweigbergk authored
293 --)
294 shift
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
295 break
296 ;;
297 esac
298 shift
299 done
51b2ead @jaysoffian disallow providing multiple upstream branches to rebase, pull --rebase
jaysoffian authored
300 test $# -gt 2 && usage
2db8aae rebase: do not get confused in fast-forward situation.
Junio C Hamano authored
301
cf432ca rebase: factor out command line option processing
Martin von Zweigbergk authored
302 if test -n "$action"
303 then
304 test -z "$in_progress" && die "No rebase in progress?"
2959c28 rebase: factor out sub command handling
Martin von Zweigbergk authored
305 # Only interactive rebase uses detailed reflog messages
306 if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase
307 then
308 GIT_REFLOG_ACTION="rebase -i ($action)"
309 export GIT_REFLOG_ACTION
310 fi
cf432ca rebase: factor out command line option processing
Martin von Zweigbergk authored
311 fi
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
312
313 case "$action" in
314 continue)
2959c28 rebase: factor out sub command handling
Martin von Zweigbergk authored
315 # Sanity check
316 git rev-parse --verify HEAD >/dev/null ||
317 die "Cannot read HEAD"
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
318 git update-index --ignore-submodules --refresh &&
319 git diff-files --quiet --ignore-submodules || {
320 echo "You must edit all merge conflicts and then"
321 echo "mark them as resolved using git add"
322 exit 1
323 }
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
324 read_basic_state
325 run_specific_rebase
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
326 ;;
327 skip)
4974c2c rebase: make -v a tiny bit more verbose
Martin von Zweigbergk authored
328 output git reset --hard HEAD || exit $?
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
329 read_basic_state
330 run_specific_rebase
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
331 ;;
332 abort)
333 git rerere clear
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
334 read_basic_state
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
335 case "$head_name" in
336 refs/*)
ea69619 @csabahenk rebase: create HEAD reflog entry when aborting
csabahenk authored
337 git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
338 die "Could not move back to $head_name"
339 ;;
340 esac
4974c2c rebase: make -v a tiny bit more verbose
Martin von Zweigbergk authored
341 output git reset --hard $orig_head
3426232 rebase: act on command line outside parsing loop
Martin von Zweigbergk authored
342 rm -r "$state_dir"
343 exit
344 ;;
345 esac
346
99de064 rebase: improve detection of rebase in progress
Martin von Zweigbergk authored
347 # Make sure no rebase is in progress
348 if test -n "$in_progress"
7f4bd5d rebase: one safety net, one bugfix and one optimization.
Junio C Hamano authored
349 then
99de064 rebase: improve detection of rebase in progress
Martin von Zweigbergk authored
350 die '
351 It seems that there is already a '"${state_dir##*/}"' directory, and
352 I wonder if you are in the middle of another rebase. If that is the
353 case, please try
354 git rebase (--continue | --abort | --skip)
355 If that is not the case, please
356 rm -fr '"$state_dir"'
9b752a6 @sbeyer Improve error output of git-rebase
sbeyer authored
357 and run me again. I am stopping in case you still have something
51ef1da @dscho Rename .git/rebase to .git/rebase-apply
dscho authored
358 valuable there.'
7f4bd5d rebase: one safety net, one bugfix and one optimization.
Junio C Hamano authored
359 fi
360
cf432ca rebase: factor out command line option processing
Martin von Zweigbergk authored
361 if test -n "$interactive_rebase"
362 then
363 type=interactive
364 state_dir="$merge_dir"
365 elif test -n "$do_merge"
366 then
367 type=merge
368 state_dir="$merge_dir"
369 else
370 type=am
371 state_dir="$apply_dir"
372 fi
373
190f532 @trast rebase: learn to rebase root commit
trast authored
374 if test -z "$rebase_root"
375 then
15a147e rebase: use @{upstream} if no upstream specified
Martin von Zweigbergk authored
376 case "$#" in
377 0)
378 if ! upstream_name=$(git rev-parse --symbolic-full-name \
379 --verify -q @{upstream} 2>/dev/null)
380 then
381 . git-parse-remote
382 error_on_missing_default_upstream "rebase" "rebase" \
383 "against" "git rebase <upstream branch>"
384 fi
385 ;;
386 *) upstream_name="$1"
387 shift
388 ;;
389 esac
190f532 @trast rebase: learn to rebase root commit
trast authored
390 upstream=`git rev-parse --verify "${upstream_name}^0"` ||
391 die "invalid upstream $upstream_name"
392 upstream_arg="$upstream_name"
393 else
71786f5 rebase: factor out reference parsing
Martin von Zweigbergk authored
394 test -z "$onto" && die "You must specify --onto when using --root"
190f532 @trast rebase: learn to rebase root commit
trast authored
395 unset upstream_name
396 unset upstream
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored
397 upstream_arg=--root
190f532 @trast rebase: learn to rebase root commit
trast authored
398 fi
32d9954 Bugfixes for git-rebase
Lukas Sandström authored
399
a1bf91e git-rebase: make 'rebase HEAD branch' work as expected.
Junio C Hamano authored
400 # Make sure the branch to rebase onto is valid.
6bb4e48 rebase: align variable names
Martin von Zweigbergk authored
401 onto_name=${onto-"$upstream_name"}
9f21e97 rebase: fix --onto A...B parsing and add tests
Nanako Shiraishi authored
402 case "$onto_name" in
403 *...*)
404 if left=${onto_name%...*} right=${onto_name#*...} &&
405 onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD})
406 then
407 case "$onto" in
408 ?*"$LF"?*)
409 die "$onto_name: there are more than one merge bases"
410 ;;
411 '')
412 die "$onto_name: there is no merge base"
413 ;;
414 esac
415 else
61dfa1b @gitster "rebase --onto A...B" replays history on the merge base between A and B
authored
416 die "$onto_name: there is no merge base"
9f21e97 rebase: fix --onto A...B parsing and add tests
Nanako Shiraishi authored
417 fi
418 ;;
419 *)
71786f5 rebase: factor out reference parsing
Martin von Zweigbergk authored
420 onto=$(git rev-parse --verify "${onto_name}^0") ||
421 die "Does not point to a valid commit: $1"
9f21e97 rebase: fix --onto A...B parsing and add tests
Nanako Shiraishi authored
422 ;;
423 esac
a1bf91e git-rebase: make 'rebase HEAD branch' work as expected.
Junio C Hamano authored
424
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
425 # If the branch to rebase is given, that is the branch we will rebase
426 # $branch_name -- branch being rebased, or HEAD (already detached)
427 # $orig_head -- commit object name of tip of the branch before rebasing
428 # $head_name -- refs/heads/<that-branch> or "detached HEAD"
429 switch_to=
59e6b23 [PATCH] git-rebase-script: rebase local commits to new upstream head.
Junio C Hamano authored
430 case "$#" in
190f532 @trast rebase: learn to rebase root commit
trast authored
431 1)
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
432 # Is it "rebase other $branchname" or "rebase other $commit"?
190f532 @trast rebase: learn to rebase root commit
trast authored
433 branch_name="$1"
434 switch_to="$1"
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
435
190f532 @trast rebase: learn to rebase root commit
trast authored
436 if git show-ref --verify --quiet -- "refs/heads/$1" &&
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
437 orig_head=$(git rev-parse -q --verify "refs/heads/$1")
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
438 then
190f532 @trast rebase: learn to rebase root commit
trast authored
439 head_name="refs/heads/$1"
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
440 elif orig_head=$(git rev-parse -q --verify "$1")
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
441 then
442 head_name="detached HEAD"
443 else
34840db rebase: do not print lots of usage hints after an obvious error message
Johannes Sixt authored
444 die "fatal: no such branch: $1"
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
445 fi
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
446 ;;
447 *)
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
448 # Do not need to switch branches, we are already on it.
bcf3161 git-rebase: allow rebasing a detached HEAD.
Junio C Hamano authored
449 if branch_name=`git symbolic-ref -q HEAD`
450 then
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
451 head_name=$branch_name
bcf3161 git-rebase: allow rebasing a detached HEAD.
Junio C Hamano authored
452 branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
453 else
0cb0664 @gitster rebase [--onto O] A B: omit needless checkout
authored
454 head_name="detached HEAD"
bcf3161 git-rebase: allow rebasing a detached HEAD.
Junio C Hamano authored
455 branch_name=HEAD ;# detached
456 fi
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
457 orig_head=$(git rev-parse --verify "${branch_name}^0") || exit
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
458 ;;
59e6b23 [PATCH] git-rebase-script: rebase local commits to new upstream head.
Junio C Hamano authored
459 esac
460
8f9bfb6 rebase: reorder validation steps
Martin von Zweigbergk authored
461 require_clean_work_tree "rebase" "Please commit or stash them."
462
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
463 # Now we are rebasing commits $upstream..$orig_head (or with --root,
464 # everything leading up to $orig_head) on top of $onto
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
465
1308c17 Allow rebase to run if upstream is completely merged
Johannes Sixt authored
466 # Check if we are already based on $onto with linear history,
cc1453e rebase: factor out call to pre-rebase hook
Martin von Zweigbergk authored
467 # but this should be done only when upstream and onto are the same
468 # and if this is not an interactive rebase.
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
469 mb=$(git merge-base "$onto" "$orig_head")
cc1453e rebase: factor out call to pre-rebase hook
Martin von Zweigbergk authored
470 if test "$type" != interactive && test "$upstream" = "$onto" &&
471 test "$mb" = "$onto" &&
1308c17 Allow rebase to run if upstream is completely merged
Johannes Sixt authored
472 # linear history?
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
473 ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null
7f4bd5d rebase: one safety net, one bugfix and one optimization.
Junio C Hamano authored
474 then
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
475 if test -z "$force_rebase"
476 then
477 # Lazily switch to the target branch if needed...
3b21a43 @peff rebase: use explicit "--" with checkout
peff authored
478 test -z "$switch_to" || git checkout "$switch_to" --
0e987a1 @bebarino am, rebase: teach quiet option
bebarino authored
479 say "Current branch $branch_name is up to date."
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
480 exit 0
481 else
0e987a1 @bebarino am, rebase: teach quiet option
bebarino authored
482 say "Current branch $branch_name is up to date, rebase forced."
b2f82e0 @SRabbelier Teach rebase to rebase even if upstream is up to date
SRabbelier authored
483 fi
7f4bd5d rebase: one safety net, one bugfix and one optimization.
Junio C Hamano authored
484 fi
485
8f9bfb6 rebase: reorder validation steps
Martin von Zweigbergk authored
486 # If a hook exists, give it a chance to interrupt
487 run_pre_rebase_hook "$upstream_arg" "$@"
488
a9c3821 @torarnv git-rebase: Add --stat and --no-stat for producing diffstat on rebase
torarnv authored
489 if test -n "$diffstat"
490 then
491 if test -n "$verbose"
492 then
493 echo "Changes from $mb to $onto:"
494 fi
495 # We want color (if set), but no pager
496 GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
497 fi
498
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
499 test "$type" = interactive && run_specific_rebase
f4107d9 rebase -i: support --stat
Martin von Zweigbergk authored
500
501 # Detach HEAD and reset the tree
502 say "First, rewinding head to replay your work on top of it..."
503 git checkout -q "$onto^0" || die "could not detach HEAD"
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
504 git update-ref ORIG_HEAD $orig_head
f4107d9 rebase -i: support --stat
Martin von Zweigbergk authored
505
e646c9c rebase: allow rebasing onto different base.
Junio C Hamano authored
506 # If the $onto is a proper descendant of the tip of the branch, then
a75d7b5 @felipec Use 'fast-forward' all over the place
felipec authored
507 # we just fast-forwarded.
cb82a05 rebase: remove $branch as synonym for $orig_head
Martin von Zweigbergk authored
508 if test "$mb" = "$orig_head"
32d9954 Bugfixes for git-rebase
Lukas Sandström authored
509 then
0e987a1 @bebarino am, rebase: teach quiet option
bebarino authored
510 say "Fast-forwarded $branch_name to $onto_name."
6fd2f5e @dscho rebase: operate on a detached HEAD
dscho authored
511 move_to_original_branch
32d9954 Bugfixes for git-rebase
Lukas Sandström authored
512 exit 0
513 fi
514
190f532 @trast rebase: learn to rebase root commit
trast authored
515 if test -n "$rebase_root"
516 then
517 revisions="$onto..$orig_head"
518 else
519 revisions="$upstream..$orig_head"
520 fi
521
fa99c1e rebase: extract merge code to new source file
Martin von Zweigbergk authored
522 run_specific_rebase
Something went wrong with that request. Please try again.