Skip to content

Commit 51ef1da

Browse files
dschogitster
dscho
authored and
gitster
committed
Rename .git/rebase to .git/rebase-apply
With git-am, it sounds awkward to have the patches in ".git/rebase/", but for technical reasons, we have to keep the same directory name for git-am and git-rebase. ".git/rebase-apply" seems to be a good compromise. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 59eb68a commit 51ef1da

File tree

13 files changed

+58
-54
lines changed

13 files changed

+58
-54
lines changed

‎Documentation/SubmittingPatches‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ If it does not apply correctly, there can be various reasons.
301301
patch appropriately.
302302

303303
* Your MUA corrupted your patch; "am" would complain that
304-
the patch does not apply. Look at .git/rebase/ subdirectory and
304+
the patch does not apply. Look at .git/rebase-apply/ subdirectory and
305305
see what 'patch' file contains and check for the common
306306
corruption patterns mentioned above.
307307

‎Documentation/git-am.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ aborts in the middle,. You can recover from this in one of two ways:
143143
the index file to bring it in a state that the patch should
144144
have produced. Then run the command with '--resolved' option.
145145

146-
The command refuses to process new mailboxes while `.git/rebase`
146+
The command refuses to process new mailboxes while `.git/rebase-apply`
147147
directory exists, so if you decide to start over from scratch,
148-
run `rm -f -r .git/rebase` before running the command with mailbox
148+
run `rm -f -r .git/rebase-apply` before running the command with mailbox
149149
names.
150150

151151
Before any patches are applied, ORIG_HEAD is set to the tip of the

‎Documentation/git-rebase.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ It is possible that a merge failure will prevent this process from being
3939
completely automatic. You will have to resolve any such merge failure
4040
and run `git rebase --continue`. Another option is to bypass the commit
4141
that caused the merge failure with `git rebase --skip`. To restore the
42-
original <branch> and remove the .git/rebase working files, use the command
43-
`git rebase --abort` instead.
42+
original <branch> and remove the .git/rebase-apply working files, use the
43+
command `git rebase --abort` instead.
4444

4545
Assume the following history exists and the current branch is "topic":
4646

‎Documentation/user-manual.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2431,7 +2431,7 @@ $ git rebase origin
24312431
-------------------------------------------------
24322432

24332433
This will remove each of your commits from mywork, temporarily saving
2434-
them as patches (in a directory named ".git/rebase"), update mywork to
2434+
them as patches (in a directory named ".git/rebase-apply"), update mywork to
24352435
point at the latest version of origin, then apply each of the saved
24362436
patches to the new mywork. The result will look like:
24372437

‎contrib/completion/git-completion.bash‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ __git_ps1 ()
7373
if [ -n "$g" ]; then
7474
local r
7575
local b
76-
if [ -d "$g/rebase" ]
76+
if [ -d "$g/rebase-apply" ]
7777
then
78-
if test -f "$g/rebase/rebasing"
78+
if test -f "$g/rebase-apply/rebasing"
7979
then
8080
r="|REBASE"
81-
elif test -f "$g/rebase/applying"
81+
elif test -f "$g/rebase-apply/applying"
8282
then
8383
r="|AM"
8484
else
@@ -488,7 +488,7 @@ __git_whitespacelist="nowarn warn error error-all strip"
488488
_git_am ()
489489
{
490490
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
491-
if [ -d "$dir"/rebase ]; then
491+
if [ -d "$dir"/rebase-apply ]; then
492492
__gitcomp "--skip --resolved"
493493
return
494494
fi
@@ -915,7 +915,7 @@ _git_push ()
915915
_git_rebase ()
916916
{
917917
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
918-
if [ -d "$dir"/rebase ] || [ -d "$dir"/rebase-merge ]; then
918+
if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
919919
__gitcomp "--continue --skip --abort"
920920
return
921921
fi

‎contrib/emacs/git.el‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,8 +1252,8 @@ Return the list of files that haven't been handled."
12521252
"\n")
12531253
(when subject (insert subject "\n\n"))
12541254
(cond (msg (insert msg "\n"))
1255-
((file-readable-p ".git/rebase/msg")
1256-
(insert-file-contents ".git/rebase/msg"))
1255+
((file-readable-p ".git/rebase-apply/msg")
1256+
(insert-file-contents ".git/rebase-apply/msg"))
12571257
((file-readable-p ".git/MERGE_MSG")
12581258
(insert-file-contents ".git/MERGE_MSG")))
12591259
; delete empty lines at end
@@ -1272,9 +1272,9 @@ Return the list of files that haven't been handled."
12721272
(coding-system (git-get-commits-coding-system))
12731273
author-name author-email subject date)
12741274
(when (eq 0 (buffer-size buffer))
1275-
(when (file-readable-p ".git/rebase/info")
1275+
(when (file-readable-p ".git/rebase-apply/info")
12761276
(with-temp-buffer
1277-
(insert-file-contents ".git/rebase/info")
1277+
(insert-file-contents ".git/rebase-apply/info")
12781278
(goto-char (point-min))
12791279
(when (re-search-forward "^Author: \\(.*\\)\nEmail: \\(.*\\)$" nil t)
12801280
(setq author-name (match-string 1))

‎git-am.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ It does not apply to blobs recorded in its index."
121121
}
122122

123123
prec=4
124-
dotest="$GIT_DIR/rebase"
124+
dotest="$GIT_DIR/rebase-apply"
125125
sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= abort=
126126
resolvemsg= resume=
127127
git_apply_opt=

‎git-quiltimport.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
5353
fi
5454

5555
# Temporary directories
56-
tmp_dir="$GIT_DIR"/rebase
56+
tmp_dir="$GIT_DIR"/rebase-apply
5757
tmp_msg="$tmp_dir/msg"
5858
tmp_patch="$tmp_dir/patch"
5959
tmp_info="$tmp_dir/info"

‎git-rebase.sh‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ It is possible that a merge failure will prevent this process from being
1414
completely automatic. You will have to resolve any such merge failure
1515
and run git rebase --continue. Another option is to bypass the commit
1616
that caused the merge failure with git rebase --skip. To restore the
17-
original <branch> and remove the .git/rebase working files, use the command
18-
git rebase --abort instead.
17+
original <branch> and remove the .git/rebase-apply working files, use the
18+
command git rebase --abort instead.
1919
2020
Note that if <branch> is not specified on the command line, the
2121
currently checked out branch is used.
@@ -150,7 +150,7 @@ while test $# != 0
150150
do
151151
case "$1" in
152152
--continue)
153-
test -d "$dotest" -o -d "$GIT_DIR"/rebase ||
153+
test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
154154
die "No rebase in progress?"
155155

156156
git diff-files --quiet --ignore-submodules || {
@@ -173,15 +173,15 @@ do
173173
finish_rb_merge
174174
exit
175175
fi
176-
head_name=$(cat "$GIT_DIR"/rebase/head-name) &&
177-
onto=$(cat "$GIT_DIR"/rebase/onto) &&
178-
orig_head=$(cat "$GIT_DIR"/rebase/orig-head) &&
176+
head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
177+
onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
178+
orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
179179
git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
180180
move_to_original_branch
181181
exit
182182
;;
183183
--skip)
184-
test -d "$dotest" -o -d "$GIT_DIR"/rebase ||
184+
test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
185185
die "No rebase in progress?"
186186

187187
git reset --hard HEAD || exit $?
@@ -201,23 +201,23 @@ do
201201
finish_rb_merge
202202
exit
203203
fi
204-
head_name=$(cat "$GIT_DIR"/rebase/head-name) &&
205-
onto=$(cat "$GIT_DIR"/rebase/onto) &&
206-
orig_head=$(cat "$GIT_DIR"/rebase/orig-head) &&
204+
head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) &&
205+
onto=$(cat "$GIT_DIR"/rebase-apply/onto) &&
206+
orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) &&
207207
git am -3 --skip --resolvemsg="$RESOLVEMSG" &&
208208
move_to_original_branch
209209
exit
210210
;;
211211
--abort)
212-
test -d "$dotest" -o -d "$GIT_DIR"/rebase ||
212+
test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
213213
die "No rebase in progress?"
214214

215215
git rerere clear
216216
if test -d "$dotest"
217217
then
218218
move_to_original_branch
219219
else
220-
dotest="$GIT_DIR"/rebase
220+
dotest="$GIT_DIR"/rebase-apply
221221
move_to_original_branch
222222
fi
223223
git reset --hard $(cat "$dotest/orig-head")
@@ -265,18 +265,20 @@ do
265265
shift
266266
done
267267

268-
# Make sure we do not have $GIT_DIR/rebase
268+
# Make sure we do not have $GIT_DIR/rebase-apply
269269
if test -z "$do_merge"
270270
then
271-
if mkdir "$GIT_DIR"/rebase
271+
if mkdir "$GIT_DIR"/rebase-apply
272272
then
273-
rmdir "$GIT_DIR"/rebase
273+
rmdir "$GIT_DIR"/rebase-apply
274274
else
275275
echo >&2 '
276-
It seems that I cannot create a '"$GIT_DIR"'/rebase directory, and I wonder if you
277-
are in the middle of patch application or another rebase. If that is not
278-
the case, please rm -fr '"$GIT_DIR"'/rebase and run me again. I am stopping in case
279-
you still have something valuable there.'
276+
It seems that I cannot create a '"$GIT_DIR"'/rebase-apply directory,
277+
and I wonder if you are in the middle of patch application or another
278+
rebase. If that is not the case, please
279+
rm -fr '"$GIT_DIR"'/rebase-apply
280+
and run me again. I am stopping in case you still have something
281+
valuable there.'
280282
exit 1
281283
fi
282284
else
@@ -395,10 +397,10 @@ then
395397
git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
396398
move_to_original_branch
397399
ret=$?
398-
test 0 != $ret -a -d "$GIT_DIR"/rebase &&
399-
echo $head_name > "$GIT_DIR"/rebase/head-name &&
400-
echo $onto > "$GIT_DIR"/rebase/onto &&
401-
echo $orig_head > "$GIT_DIR"/rebase/orig-head
400+
test 0 != $ret -a -d "$GIT_DIR"/rebase-apply &&
401+
echo $head_name > "$GIT_DIR"/rebase-apply/head-name &&
402+
echo $onto > "$GIT_DIR"/rebase-apply/onto &&
403+
echo $orig_head > "$GIT_DIR"/rebase-apply/orig-head
402404
exit $ret
403405
fi
404406

‎t/t3401-rebase-partial.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ test_debug \
5050

5151
test_expect_success \
5252
'rebase topic branch against new master and check git-am did not get halted' \
53-
'git-rebase master && test ! -d .git/rebase'
53+
'git-rebase master && test ! -d .git/rebase-apply'
5454

5555
test_expect_success \
5656
'rebase --merge topic branch that was partially merged upstream' \

0 commit comments

Comments
 (0)