{"thread":{"id":"14470","subject":"Git rebase failure: .dotest overwritten","startedAt":"2008-07-15T21:08:42Z","lastAt":"2008-07-24T12:44:40Z","messageCount":37,"participants":["Joe Fiorini","Stephan Beyer","René Scharfe","Johannes Schindelin","Linus Torvalds","Junio C Hamano","Theodore Tso","Petr Baudis","Olivier Marin","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"83430","messageId":"73fd69b50807151408i6a916da6p7b89fe81e65fc717@mail.gmail.com","threadId":"14470","inReplyTo":null,"subject":"Git rebase failure: .dotest overwritten","fromName":"Joe Fiorini","fromEmail":"joe@faithfulgeek.org","sentAt":"2008-07-15T21:08:42Z","receivedAt":"2008-07-15T21:08:42Z","isPatch":false,"sender":{"key":"joe@faithfulgeek.org","avatar":null},"body":"A friend of mine asked me for help with a git rebase problem. I was\nclueless. Here is what he was seeing:\nThe main problem seems to be the following error: \"fatal: Untracked\nworking tree file '.dotest/0001' would be overwritten by merge.\"; also\nall the files that it says \"already exist in working directory\" did\nnot exist before he ran the rebase. Maybe it's trying to run the\nrebase more than once? His working copy was clean. Any thoughts? Any\nother details I can provide?\nThanks!\nJoe\ngit rebase master\nFirst, rewinding head to replay your work on top of it...\nHEAD is now at 9bba5f1... Create function snippet\nApplying People page templates\n.dotest/patch:59: trailing whitespace.\n\n.dotest/patch:60: space before tab in indent.\n parent::BuildControlArray($EventParameters);\n.dotest/patch:61: space before tab in indent.\n }\n.dotest/patch:65: trailing whitespace, space before tab in indent.\n\n.dotest/patch:67: trailing whitespace.\n\nerror: .dotest/0001: already exists in working directory\nerror: .dotest/0002: already exists in working directory\nerror: .dotest/0003: already exists in working directory\nerror: .dotest/binary: already exists in working directory\nerror: .dotest/final-commit: already exists in working directory\nerror: .dotest/info: already exists in working directory\nerror: .dotest/keep: already exists in working directory\nerror: .dotest/last: already exists in working directory\nerror: .dotest/msg: already exists in working directory\nerror: .dotest/msg-clean: already exists in working directory\nerror: .dotest/next: already exists in working directory\nerror: .dotest/patch: already exists in working directory\nerror: .dotest/sign: already exists in working directory\nerror: .dotest/utf8: already exists in working directory\nerror: .dotest/whitespace: already exists in working directory\nUsing index info to reconstruct a base tree...\nstdin:59: trailing whitespace.\n\nstdin:60: space before tab in indent.\n parent::BuildControlArray($EventParameters);\nstdin:61: space before tab in indent.\n }\nstdin:65: trailing whitespace, space before tab in indent.\n\nstdin:67: trailing whitespace.\n\nwarning: squelched 49 whitespace errors\nwarning: 54 lines add whitespace errors.\nFalling back to patching base and 3-way merge...\nfatal: Untracked working tree file '.dotest/0001' would be overwritten by merge.\nFailed to merge in the changes.\nPatch failed at 0001.\nWhen you have resolved this problem run \"git rebase --continue\".\nIf you would prefer to skip this patch, instead run \"git rebase --skip\".\nTo restore the original branch and stop rebasing run \"git rebase --abort\".\n--\njoe fiorini\nhttp://www.faithfulgeek.org\n// freelancing & knowledge sharing\n"},{"id":"83433","messageId":"20080715212211.GL6244@leksak.fem-net","threadId":"14470","inReplyTo":"73fd69b50807151408i6a916da6p7b89fe81e65fc717@mail.gmail.com","subject":"Re: Git rebase failure: .dotest overwritten","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-07-15T21:22:11Z","receivedAt":"2008-07-15T21:22:11Z","isPatch":false,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi,\n\nJoe Fiorini wrote:\n> A friend of mine asked me for help with a git rebase problem. I was\n> clueless. Here is what he was seeing:\n> The main problem seems to be the following error: \"fatal: Untracked\n> working tree file '.dotest/0001' would be overwritten by merge.\"; also\n> all the files that it says \"already exist in working directory\" did\n> not exist before he ran the rebase. Maybe it's trying to run the\n> rebase more than once? His working copy was clean. Any thoughts? Any\n> other details I can provide?\n\ngit-rebase (without -i/-m) generates a directory called \".dotest/\" to\nsave temporary stuff like the commits you want to rebase.\n\nAnd it seems that at least one commit in his repo has .dotest/* files\nin the tree, so that message occurs.\nHmm, he should perhaps clean that commit up and remove the .dotest\nfiles from it. (After figuring out that commit, he could try\n\tgit rebase -i ...\nand change the \"pick\" line to \"edit\".)\n\nRegards.\n\n-- \nStephan Beyer , PGP 0x6EDDD207FCC5040F\n"},{"id":"83436","messageId":"487D1B3D.70500@lsrfire.ath.cx","threadId":"14470","inReplyTo":"20080715212211.GL6244@leksak.fem-net","subject":"Re: Git rebase failure: .dotest overwritten","fromName":"René Scharfe","fromEmail":"rene.scharfe@lsrfire.ath.cx","sentAt":"2008-07-15T21:48:45Z","receivedAt":"2008-07-15T21:48:45Z","isPatch":false,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Stephan Beyer schrieb:\n> git-rebase (without -i/-m) generates a directory called \".dotest/\" to\n> save temporary stuff like the commits you want to rebase.\n\nIn February it was discussed to move .dotest below $GIT_DIR. There was\neven a patch (to rename it to .git-dotest). I suspect the upcoming\nversion 1.6.0 is a good opportunity to finally remove this wart.\n\nRené\n"},{"id":"83453","messageId":"alpine.DEB.1.00.0807160245440.2841@eeepc-johanness","threadId":"14470","inReplyTo":"487D1B3D.70500@lsrfire.ath.cx","subject":"[PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-16T00:47:33Z","receivedAt":"2008-07-16T00:47:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSince the files generated and used during a rebase are never to be\ntracked, they should live in $GIT_DIR. While at it, avoid the rather\nmeaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n\nThis was wished for on the mailing list, but so far unimplemented.\n\nSigned-off-by: Johannes Schindelin \n---\n\n\tOn Tue, 15 Jul 2008, René Scharfe wrote:\n\n\t> Stephan Beyer schrieb:\n\t> > git-rebase (without -i/-m) generates a directory called \n\t> > \".dotest/\" to save temporary stuff like the commits you want to \n\t> > rebase.\n\t> \n\t> In February it was discussed to move .dotest below $GIT_DIR. \n\t> There was even a patch (to rename it to .git-dotest). I suspect the \n\t> upcoming version 1.6.0 is a good opportunity to finally remove this \n\t> wart.\n\n\tI kind of expected this to be a good opportunity to increase the \n\ttrack record for a certain GSoC project, but here you have it.\n\n Documentation/SubmittingPatches | 2 +-\n Documentation/git-am.txt | 4 +-\n Documentation/git-rebase.txt | 2 +-\n Documentation/user-manual.txt | 2 +-\n contrib/emacs/git.el | 8 +++---\n git-am.sh | 6 ++--\n git-completion.bash | 20 +++++++-------\n git-quiltimport.sh | 2 +-\n git-rebase--interactive.sh | 2 +-\n git-rebase.sh | 46 ++++++++++++++++----------------\n t/t3401-rebase-partial.sh | 4 +-\n t/t3404-rebase-interactive.sh | 8 +++---\n t/t3407-rebase-abort.sh | 4 +-\n t/t4150-am.sh | 22 +++++++-------\n t/t9106-git-svn-commit-diff-clobber.sh | 2 +-\n 15 files changed, 67 insertions(+), 67 deletions(-)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex b116475..fdfa536 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -301,7 +301,7 @@ If it does not apply correctly, there can be various reasons.\n patch appropriately.\n \n * Your MUA corrupted your patch; \"am\" would complain that\n- the patch does not apply. Look at .dotest/ subdirectory and\n+ the patch does not apply. Look at .git/rebase/ subdirectory and\n see what 'patch' file contains and check for the common\n corruption patterns mentioned above.\n \ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 3863eeb..5b800d3 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -140,9 +140,9 @@ aborts in the middle,. You can recover from this in one of two ways:\n the index file to bring it in a state that the patch should\n have produced. Then run the command with '--resolved' option.\n \n-The command refuses to process new mailboxes while `.dotest`\n+The command refuses to process new mailboxes while `.git/rebase`\n directory exists, so if you decide to start over from scratch,\n-run `rm -f -r .dotest` before running the command with mailbox\n+run `rm -f -r .git/rebase` before running the command with mailbox\n names.\n \n \ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex f3459c7..c645073 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -38,7 +38,7 @@ It is possible that a merge failure will prevent this process from being\n completely automatic. You will have to resolve any such merge failure\n and run `git rebase --continue`. Another option is to bypass the commit\n that caused the merge failure with `git rebase --skip`. To restore the\n-original and remove the .dotest working files, use the command\n+original and remove the .git/rebase working files, use the command\n `git rebase --abort` instead.\n \n Assume the following history exists and the current branch is \"topic\":\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 01c1af6..94c9a58 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -2431,7 +2431,7 @@ $ git rebase origin\n -------------------------------------------------\n \n This will remove each of your commits from mywork, temporarily saving\n-them as patches (in a directory named \".dotest\"), update mywork to\n+them as patches (in a directory named \".git/rebase\"), update mywork to\n point at the latest version of origin, then apply each of the saved\n patches to the new mywork. The result will look like:\n \ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 4fa853f..43b059b 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -1252,8 +1252,8 @@ Return the list of files that haven't been handled.\"\n \"\\n\")\n (when subject (insert subject \"\\n\\n\"))\n (cond (msg (insert msg \"\\n\"))\n- ((file-readable-p \".dotest/msg\")\n- (insert-file-contents \".dotest/msg\"))\n+ ((file-readable-p \".git/rebase/msg\")\n+ (insert-file-contents \".git/rebase/msg\"))\n ((file-readable-p \".git/MERGE_MSG\")\n (insert-file-contents \".git/MERGE_MSG\")))\n ; delete empty lines at end\n@@ -1272,9 +1272,9 @@ Return the list of files that haven't been handled.\"\n (coding-system (git-get-commits-coding-system))\n author-name author-email subject date)\n (when (eq 0 (buffer-size buffer))\n- (when (file-readable-p \".dotest/info\")\n+ (when (file-readable-p \".git/rebase/info\")\n (with-temp-buffer\n- (insert-file-contents \".dotest/info\")\n+ (insert-file-contents \".git/rebase/info\")\n (goto-char (point-min))\n (when (re-search-forward \"^Author: \\\\(.*\\\\)\\nEmail: \\\\(.*\\\\)$\" nil t)\n (setq author-name (match-string 1))\ndiff --git a/git-am.sh b/git-am.sh\nindex fe53608..3a11f8b 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -118,7 +118,7 @@ It does not apply to blobs recorded in its index.\"\n }\n \n prec=4\n-dotest=\".dotest\"\n+dotest=\"$GIT_DIR/rebase\"\n sign= utf8=t keep= skip= interactive= resolved= binary= rebasing=\n resolvemsg= resume=\n git_apply_opt=\n@@ -194,7 +194,7 @@ then\n \t\tfalse\n \t\t;;\n \tesac ||\n-\tdie \"previous dotest directory $dotest still exists but mbox given.\"\n+\tdie \"previous rebase directory $dotest still exists but mbox given.\"\n \tresume=yes\n else\n \t# Make sure we are not given --skip nor --resolved\n@@ -324,7 +324,7 @@ do\n \t\t\t<\"$dotest\"/info >/dev/null &&\n \t\t\tgo_next && continue\n \n-\t\ttest -s $dotest/patch || {\n+\t\ttest -s \"$dotest/patch\" || {\n \t\t\techo \"Patch is empty. Was it split wrong?\"\n \t\t\tstop_here $this\n \t\t}\ndiff --git a/git-completion.bash b/git-completion.bash\nindex 04e2ef5..8c8af4f 100755\n--- a/git-completion.bash\n+++ b/git-completion.bash\n@@ -68,26 +68,26 @@ __git_ps1 ()\n \tif [ -n \"$g\" ]; then\n \t\tlocal r\n \t\tlocal b\n-\t\tif [ -d \"$g/../.dotest\" ]\n+\t\tif [ -d \"$g/rebase\" ]\n \t\tthen\n-\t\t\tif test -f \"$g/../.dotest/rebasing\"\n+\t\t\tif test -f \"$g/rebase/rebasing\"\n \t\t\tthen\n \t\t\t\tr=\"|REBASE\"\n-\t\t\telif test -f \"$g/../.dotest/applying\"\n+\t\t\telif test -f \"$g/rebase/applying\"\n \t\t\tthen\n \t\t\t\tr=\"|AM\"\n \t\t\telse\n \t\t\t\tr=\"|AM/REBASE\"\n \t\t\tfi\n \t\t\tb=\"$(git symbolic-ref HEAD 2>/dev/null)\"\n-\t\telif [ -f \"$g/.dotest-merge/interactive\" ]\n+\t\telif [ -f \"$g/rebase-merge/interactive\" ]\n \t\tthen\n \t\t\tr=\"|REBASE-i\"\n-\t\t\tb=\"$(cat \"$g/.dotest-merge/head-name\")\"\n-\t\telif [ -d \"$g/.dotest-merge\" ]\n+\t\t\tb=\"$(cat \"$g/rebase-merge/head-name\")\"\n+\t\telif [ -d \"$g/rebase-merge\" ]\n \t\tthen\n \t\t\tr=\"|REBASE-m\"\n-\t\t\tb=\"$(cat \"$g/.dotest-merge/head-name\")\"\n+\t\t\tb=\"$(cat \"$g/rebase-merge/head-name\")\"\n \t\telif [ -f \"$g/MERGE_HEAD\" ]\n \t\tthen\n \t\t\tr=\"|MERGING\"\n@@ -455,8 +455,8 @@ __git_whitespacelist=\"nowarn warn error error-all strip\"\n \n _git_am ()\n {\n-\tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\"\n-\tif [ -d .dotest ]; then\n+\tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\" dir=\"$(__gitdir)\"\n+\tif [ -d \"$dir\"/rebase ]; then\n \t\t__gitcomp \"--skip --resolved\"\n \t\treturn\n \tfi\n@@ -864,7 +864,7 @@ _git_push ()\n _git_rebase ()\n {\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\" dir=\"$(__gitdir)\"\n-\tif [ -d .dotest ] || [ -d \"$dir\"/.dotest-merge ]; then\n+\tif [ -d \"$dir\"/rebase ] || [ -d \"$dir\"/rebase-merge ]; then\n \t\t__gitcomp \"--continue --skip --abort\"\n \t\treturn\n \tfi\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 7cd8f71..d1efa1d 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -53,7 +53,7 @@ if ! [ -d \"$QUILT_PATCHES\" ] ; then\n fi\n \n # Temporary directories\n-tmp_dir=.dotest\n+tmp_dir=\"$GIT_DIR\"/rebase\n tmp_msg=\"$tmp_dir/msg\"\n tmp_patch=\"$tmp_dir/patch\"\n tmp_info=\"$tmp_dir/info\"\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 297b646..dd01a45 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -17,7 +17,7 @@ OPTIONS_SPEC=\n . git-sh-setup\n require_work_tree\n \n-DOTEST=\"$GIT_DIR/.dotest-merge\"\n+DOTEST=\"$GIT_DIR/rebase-merge\"\n TODO=\"$DOTEST\"/git-rebase-todo\n DONE=\"$DOTEST\"/done\n MSG=\"$DOTEST\"/message\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex bf0e7a9..74ff873 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -14,7 +14,7 @@ It is possible that a merge failure will prevent this process from being\n completely automatic. You will have to resolve any such merge failure\n and run git rebase --continue. Another option is to bypass the commit\n that caused the merge failure with git rebase --skip. To restore the\n-original and remove the .dotest working files, use the command\n+original and remove the .git/rebase working files, use the command\n git rebase --abort instead.\n \n Note that if is not specified on the command line, the\n@@ -42,7 +42,7 @@ To restore the original branch and stop rebasing run \\\"git rebase --abort\\\".\n unset newbase\n strategy=recursive\n do_merge=\n-dotest=$GIT_DIR/.dotest-merge\n+dotest=\"$GIT_DIR\"/rebase-merge\n prec=4\n verbose=\n git_am_opt=\n@@ -150,7 +150,7 @@ while test $# != 0\n do\n \tcase \"$1\" in\n \t--continue)\n-\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit diff-files --quiet --ignore-submodules || {\n@@ -173,15 +173,15 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\thead_name=$(cat .dotest/head-name) &&\n-\t\tonto=$(cat .dotest/onto) &&\n-\t\torig_head=$(cat .dotest/orig-head) &&\n+\t\thead_name=$(cat \"$GIT_DIR\"/rebase/head-name) &&\n+\t\tonto=$(cat \"$GIT_DIR\"/rebase/onto) &&\n+\t\torig_head=$(cat \"$GIT_DIR\"/rebase/orig-head) &&\n \t\tgit am --resolved --3way --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n \t--skip)\n-\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit reset --hard HEAD || exit $?\n@@ -200,19 +200,19 @@ do\n \t\t\tdone\n \t\t\tfinish_rb_merge\n \t\t\texit\n-\t\telif ! test -d .dotest\n+\t\telif ! test -d \"$GIT_DIR\"/rebase\n \t\tthen\n \t\t\tdie \"No rebase in progress?\"\n \t\tfi\n-\t\thead_name=$(cat .dotest/head-name) &&\n-\t\tonto=$(cat .dotest/onto) &&\n-\t\torig_head=$(cat .dotest/orig-head) &&\n+\t\thead_name=$(cat \"$GIT_DIR\"/rebase/head-name) &&\n+\t\tonto=$(cat \"$GIT_DIR\"/rebase/onto) &&\n+\t\torig_head=$(cat \"$GIT_DIR\"/rebase/orig-head) &&\n \t\tgit am -3 --skip --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n \t--abort)\n-\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit rerere clear\n@@ -220,7 +220,7 @@ do\n \t\tthen\n \t\t\tmove_to_original_branch\n \t\telse\n-\t\t\tdotest=.dotest\n+\t\t\tdotest=\"$GIT_DIR\"/rebase\n \t\t\tmove_to_original_branch\n \t\tfi\n \t\tgit reset --hard $(cat \"$dotest/orig-head\")\n@@ -268,24 +268,24 @@ do\n \tshift\n done\n \n-# Make sure we do not have .dotest\n+# Make sure we do not have $GIT_DIR/rebase\n if test -z \"$do_merge\"\n then\n-\tif mkdir .dotest\n+\tif mkdir \"$GIT_DIR\"/rebase\n \tthen\n-\t\trmdir .dotest\n+\t\trmdir \"$GIT_DIR\"/rebase\n \telse\n \t\techo >&2 '\n-It seems that I cannot create a .dotest directory, and I wonder if you\n+It seems that I cannot create a .git/rebase directory, and I wonder if you\n are in the middle of patch application or another rebase. If that is not\n-the case, please rm -fr .dotest and run me again. I am stopping in case\n+the case, please rm -fr .git/rebase and run me again. I am stopping in case\n you still have something valuable there.'\n \t\texit 1\n \tfi\n else\n \tif test -d \"$dotest\"\n \tthen\n-\t\tdie \"previous dotest directory $dotest still exists.\" \\\n+\t\tdie \"previous rebase directory $dotest still exists.\" \\\n \t\t\t'try git-rebase < --continue | --abort >'\n \tfi\n fi\n@@ -399,10 +399,10 @@ then\n \tgit am $git_am_opt --rebasing --resolvemsg=\"$RESOLVEMSG\" &&\n \tmove_to_original_branch\n \tret=$?\n-\ttest 0 != $ret -a -d .dotest &&\n-\t\techo $head_name > .dotest/head-name &&\n-\t\techo $onto > .dotest/onto &&\n-\t\techo $orig_head > .dotest/orig-head\n+\ttest 0 != $ret -a -d \"$GIT_DIR\"/rebase &&\n+\t\techo $head_name > \"$GIT_DIR\"/rebase/head-name &&\n+\t\techo $onto > \"$GIT_DIR\"/rebase/onto &&\n+\t\techo $orig_head > \"$GIT_DIR\"/rebase/orig-head\n \texit $ret\n fi\n \ndiff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh\nindex 4934a4e..36d9a2a 100755\n--- a/t/t3401-rebase-partial.sh\n+++ b/t/t3401-rebase-partial.sh\n@@ -50,12 +50,12 @@ test_debug \\\n \n test_expect_success \\\n 'rebase topic branch against new master and check git-am did not get halted' \\\n- 'git-rebase master && test ! -d .dotest'\n+ 'git-rebase master && test ! -d .git/rebase'\n \n test_expect_success \\\n \t'rebase --merge topic branch that was partially merged upstream' \\\n \t'git-checkout -f my-topic-branch-merge &&\n \t git-rebase --merge master-merge &&\n-\t test ! -d .git/.dotest-merge'\n+\t test ! -d .git/rebase-merge'\n \n test_done\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 1c80148..d27554e 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -159,19 +159,19 @@ test_expect_success 'stop on conflicting pick' '\n \tgit tag new-branch1 &&\n \ttest_must_fail git rebase -i master &&\n \ttest \"$(git rev-parse HEAD~3)\" = \"$(git rev-parse master)\" &&\n-\ttest_cmp expect .git/.dotest-merge/patch &&\n+\ttest_cmp expect .git/rebase-merge/patch &&\n \ttest_cmp expect2 file1 &&\n \ttest \"$(git-diff --name-status |\n \t\tsed -n -e \"/^U/s/^U[^a-z]*//p\")\" = file1 &&\n-\ttest 4 = $(grep -v \"^#\" < .git/.dotest-merge/done | wc -l) &&\n-\ttest 0 = $(grep -c \"^[^#]\" < .git/.dotest-merge/git-rebase-todo)\n+\ttest 4 = $(grep -v \"^#\" < .git/rebase-merge/done | wc -l) &&\n+\ttest 0 = $(grep -c \"^[^#]\" < .git/rebase-merge/git-rebase-todo)\n '\n \n test_expect_success 'abort' '\n \tgit rebase --abort &&\n \ttest $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&\n \ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/branch1\" &&\n-\t! test -d .git/.dotest-merge\n+\t! test -d .git/rebase-merge\n '\n \n test_expect_success 'retain authorship' '\ndiff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh\nindex 1777ffe..12c8804 100755\n--- a/t/t3407-rebase-abort.sh\n+++ b/t/t3407-rebase-abort.sh\n@@ -74,7 +74,7 @@ testrebase() {\n \t'\n }\n \n-testrebase \"\" .dotest\n-testrebase \" --merge\" .git/.dotest-merge\n+testrebase \"\" .git/rebase\n+testrebase \" --merge\" .git/rebase-merge\n \n test_done\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex bc98260..5cbd5ef 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -102,7 +102,7 @@ test_expect_success 'am applies patch correctly' '\n \tgit checkout first &&\n \ttest_tick &&\n \tgit am >file &&\n \tgit add file &&\n \tgit am --resolved &&\n-\t! test -d .dotest &&\n+\t! test -d .git/rebase &&\n \ttest goodbye = \"$(cat another)\"\n '\n \n test_expect_success 'am takes patches from a Pine mailbox' '\n \tgit checkout first &&\n \tcat pine patch1 | git am &&\n-\t! test -d .dotest &&\n+\t! test -d .git/rebase &&\n \ttest -z \"$(git diff master^..HEAD)\"\n '\n \n test_expect_success 'am fails on mail without patch' '\n \t! git am >failmail &&\n \t! git am file &&\n-- \n1.5.6.2.449.g342381.dirty\n"},{"id":"83456","messageId":"alpine.LFD.1.10.0807151756550.2867@woody.linux-foundation.org","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160245440.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Linus Torvalds","fromEmail":"torvalds@linux-foundation.org","sentAt":"2008-07-16T00:57:48Z","receivedAt":"2008-07-16T00:57:48Z","isPatch":true,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Wed, 16 Jul 2008, Johannes Schindelin wrote:\n> \n> Since the files generated and used during a rebase are never to be\n> tracked, they should live in $GIT_DIR. While at it, avoid the rather\n> meaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n\nAck. Please make it so. Even _I_ have now taught myself to do \"git am\" \ninstead of using my old \"dotest\" alias.\n\n\t\tLinus\n"},{"id":"83457","messageId":"7v4p6qzla3.fsf@gitster.siamese.dyndns.org","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160245440.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-16T01:10:28Z","receivedAt":"2008-07-16T01:10:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Since the files generated and used during a rebase are never to be\n> tracked, they should live in $GIT_DIR. While at it, avoid the rather\n> meaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n\nI understand moving away from .dotest/ to .git/something, but I do not\nfollow the logic of making that something to rebase at all. It is a\nscratch area for \"am\" (and applymbox), isn't it?\n"},{"id":"83458","messageId":"alpine.DEB.1.00.0807160315020.2841@eeepc-johanness","threadId":"14470","inReplyTo":"7v4p6qzla3.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-16T01:15:42Z","receivedAt":"2008-07-16T01:15:42Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 15 Jul 2008, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> > Since the files generated and used during a rebase are never to be \n> > tracked, they should live in $GIT_DIR. While at it, avoid the rather \n> > meaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n> \n> I understand moving away from .dotest/ to .git/something, but I do not \n> follow the logic of making that something to rebase at all. It is a \n> scratch area for \"am\" (and applymbox), isn't it?\n\nOf course, you can name it as you want. But I thought that the name \n\"rebase\" applies as well: the patches are rebased from somewhere else on \ntop of HEAD :-)\n\nCiao,\nDscho\n"},{"id":"83459","messageId":"7vzloiy6ah.fsf@gitster.siamese.dyndns.org","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160315020.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-16T01:19:34Z","receivedAt":"2008-07-16T01:19:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Of course, you can name it as you want. But I thought that the name \n> \"rebase\" applies as well: the patches are rebased from somewhere else...\n\nSomewhere else being my mailbox or gmane newsgroup?\n\nThe patch does not apply to my master anyway, sigh...\n"},{"id":"83460","messageId":"20080716012619.GM8185@mit.edu","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160245440.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Theodore Tso","fromEmail":"tytso@mit.edu","sentAt":"2008-07-16T01:26:19Z","receivedAt":"2008-07-16T01:26:19Z","isPatch":true,"sender":{"key":"tytso@mit.edu","avatar":"https://avatars.githubusercontent.com/u/51416?v=4"},"body":"On Wed, Jul 16, 2008 at 02:47:33AM +0200, Johannes Schindelin wrote:\n> \n> Since the files generated and used during a rebase are never to be\n> tracked, they should live in $GIT_DIR. While at it, avoid the rather\n> meaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n> \n> This was wished for on the mailing list, but so far unimplemented.\n\nWhile you have \"git am\" open, how about adding an \"git am --abort\"\nwhich nukes the .dotest aka .git/rebase directory, and resets HEAD\nback to the original position?\n\nAnd another nice shortcut would be \"git am --forceapply\" which applies\nthe patch, leaving .rej files for the user to resolve by hand. That\nmakes it easier for the user to manually run patch while passing a\nfilename in .dotest aka .git/rebase.\n\nThese two additions would make the git-am workflow much smoother.\n\nRegards,\n\n\t\t\t\t\t- Ted\n"},{"id":"83462","messageId":"alpine.DEB.1.00.0807160332190.2841@eeepc-johanness","threadId":"14470","inReplyTo":"7vzloiy6ah.fsf@gitster.siamese.dyndns.org","subject":"[PATCH for master] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-16T01:33:44Z","receivedAt":"2008-07-16T01:33:44Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSince the files generated and used during a rebase are never to be\ntracked, they should live in $GIT_DIR. While at it, avoid the rather\nmeaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n\nThis was wished for on the mailing list, but so far unimplemented.\n\nSigned-off-by: Johannes Schindelin \n---\n\n\tOn Tue, 15 Jul 2008, Junio C Hamano wrote:\n\n\t> Johannes Schindelin writes:\n\t> \n\t> > Of course, you can name it as you want. But I thought that \n\t> > the name \"rebase\" applies as well: the patches are rebased from \n\t> > somewhere else...\n\t> \n\t> Somewhere else being my mailbox or gmane newsgroup?\n\n\tSomething like this *-)\n\n\t> The patch does not apply to my master anyway, sigh...\n\n\tHere you are.\n\n Documentation/SubmittingPatches | 2 +-\n Documentation/git-am.txt | 4 +-\n Documentation/git-rebase.txt | 2 +-\n Documentation/user-manual.txt | 2 +-\n contrib/completion/git-completion.bash | 20 +++++++-------\n contrib/emacs/git.el | 8 +++---\n git-am.sh | 6 ++--\n git-quiltimport.sh | 2 +-\n git-rebase--interactive.sh | 2 +-\n git-rebase.sh | 44 ++++++++++++++++----------------\n t/t3401-rebase-partial.sh | 4 +-\n t/t3404-rebase-interactive.sh | 8 +++---\n t/t3407-rebase-abort.sh | 4 +-\n t/t4150-am.sh | 22 ++++++++--------\n t/t9106-git-svn-commit-diff-clobber.sh | 2 +-\n 15 files changed, 66 insertions(+), 66 deletions(-)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex b116475..fdfa536 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -301,7 +301,7 @@ If it does not apply correctly, there can be various reasons.\n patch appropriately.\n \n * Your MUA corrupted your patch; \"am\" would complain that\n- the patch does not apply. Look at .dotest/ subdirectory and\n+ the patch does not apply. Look at .git/rebase/ subdirectory and\n see what 'patch' file contains and check for the common\n corruption patterns mentioned above.\n \ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 1395c7d..2d7f162 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -140,9 +140,9 @@ aborts in the middle,. You can recover from this in one of two ways:\n the index file to bring it in a state that the patch should\n have produced. Then run the command with '--resolved' option.\n \n-The command refuses to process new mailboxes while `.dotest`\n+The command refuses to process new mailboxes while `.git/rebase`\n directory exists, so if you decide to start over from scratch,\n-run `rm -f -r .dotest` before running the command with mailbox\n+run `rm -f -r .git/rebase` before running the command with mailbox\n names.\n \n Before any patches are applied, ORIG_HEAD is set to the tip of the\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex e30f6a6..51afc87 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -39,7 +39,7 @@ It is possible that a merge failure will prevent this process from being\n completely automatic. You will have to resolve any such merge failure\n and run `git rebase --continue`. Another option is to bypass the commit\n that caused the merge failure with `git rebase --skip`. To restore the\n-original and remove the .dotest working files, use the command\n+original and remove the .git/rebase working files, use the command\n `git rebase --abort` instead.\n \n Assume the following history exists and the current branch is \"topic\":\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 92d4007..8761ee7 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -2431,7 +2431,7 @@ $ git rebase origin\n -------------------------------------------------\n \n This will remove each of your commits from mywork, temporarily saving\n-them as patches (in a directory named \".dotest\"), update mywork to\n+them as patches (in a directory named \".git/rebase\"), update mywork to\n point at the latest version of origin, then apply each of the saved\n patches to the new mywork. The result will look like:\n \ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 03e4e02..29f6cd4 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -73,26 +73,26 @@ __git_ps1 ()\n \tif [ -n \"$g\" ]; then\n \t\tlocal r\n \t\tlocal b\n-\t\tif [ -d \"$g/../.dotest\" ]\n+\t\tif [ -d \"$g/rebase\" ]\n \t\tthen\n-\t\t\tif test -f \"$g/../.dotest/rebasing\"\n+\t\t\tif test -f \"$g/rebase/rebasing\"\n \t\t\tthen\n \t\t\t\tr=\"|REBASE\"\n-\t\t\telif test -f \"$g/../.dotest/applying\"\n+\t\t\telif test -f \"$g/rebase/applying\"\n \t\t\tthen\n \t\t\t\tr=\"|AM\"\n \t\t\telse\n \t\t\t\tr=\"|AM/REBASE\"\n \t\t\tfi\n \t\t\tb=\"$(git symbolic-ref HEAD 2>/dev/null)\"\n-\t\telif [ -f \"$g/.dotest-merge/interactive\" ]\n+\t\telif [ -f \"$g/rebase-merge/interactive\" ]\n \t\tthen\n \t\t\tr=\"|REBASE-i\"\n-\t\t\tb=\"$(cat \"$g/.dotest-merge/head-name\")\"\n-\t\telif [ -d \"$g/.dotest-merge\" ]\n+\t\t\tb=\"$(cat \"$g/rebase-merge/head-name\")\"\n+\t\telif [ -d \"$g/rebase-merge\" ]\n \t\tthen\n \t\t\tr=\"|REBASE-m\"\n-\t\t\tb=\"$(cat \"$g/.dotest-merge/head-name\")\"\n+\t\t\tb=\"$(cat \"$g/rebase-merge/head-name\")\"\n \t\telif [ -f \"$g/MERGE_HEAD\" ]\n \t\tthen\n \t\t\tr=\"|MERGING\"\n@@ -487,8 +487,8 @@ __git_whitespacelist=\"nowarn warn error error-all strip\"\n \n _git_am ()\n {\n-\tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\"\n-\tif [ -d .dotest ]; then\n+\tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\" dir=\"$(__gitdir)\"\n+\tif [ -d \"$dir\"/rebase ]; then\n \t\t__gitcomp \"--skip --resolved\"\n \t\treturn\n \tfi\n@@ -915,7 +915,7 @@ _git_push ()\n _git_rebase ()\n {\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\" dir=\"$(__gitdir)\"\n-\tif [ -d .dotest ] || [ -d \"$dir\"/.dotest-merge ]; then\n+\tif [ -d \"$dir\"/rebase ] || [ -d \"$dir\"/rebase-merge ]; then\n \t\t__gitcomp \"--continue --skip --abort\"\n \t\treturn\n \tfi\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 4fa853f..43b059b 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -1252,8 +1252,8 @@ Return the list of files that haven't been handled.\"\n \"\\n\")\n (when subject (insert subject \"\\n\\n\"))\n (cond (msg (insert msg \"\\n\"))\n- ((file-readable-p \".dotest/msg\")\n- (insert-file-contents \".dotest/msg\"))\n+ ((file-readable-p \".git/rebase/msg\")\n+ (insert-file-contents \".git/rebase/msg\"))\n ((file-readable-p \".git/MERGE_MSG\")\n (insert-file-contents \".git/MERGE_MSG\")))\n ; delete empty lines at end\n@@ -1272,9 +1272,9 @@ Return the list of files that haven't been handled.\"\n (coding-system (git-get-commits-coding-system))\n author-name author-email subject date)\n (when (eq 0 (buffer-size buffer))\n- (when (file-readable-p \".dotest/info\")\n+ (when (file-readable-p \".git/rebase/info\")\n (with-temp-buffer\n- (insert-file-contents \".dotest/info\")\n+ (insert-file-contents \".git/rebase/info\")\n (goto-char (point-min))\n (when (re-search-forward \"^Author: \\\\(.*\\\\)\\nEmail: \\\\(.*\\\\)$\" nil t)\n (setq author-name (match-string 1))\ndiff --git a/git-am.sh b/git-am.sh\nindex 52b5669..cc8787b 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -119,7 +119,7 @@ It does not apply to blobs recorded in its index.\"\n }\n \n prec=4\n-dotest=\".dotest\"\n+dotest=\"$GIT_DIR/rebase\"\n sign= utf8=t keep= skip= interactive= resolved= binary= rebasing=\n resolvemsg= resume=\n git_apply_opt=\n@@ -195,7 +195,7 @@ then\n \t\tfalse\n \t\t;;\n \tesac ||\n-\tdie \"previous dotest directory $dotest still exists but mbox given.\"\n+\tdie \"previous rebase directory $dotest still exists but mbox given.\"\n \tresume=yes\n else\n \t# Make sure we are not given --skip nor --resolved\n@@ -325,7 +325,7 @@ do\n \t\t\t<\"$dotest\"/info >/dev/null &&\n \t\t\tgo_next && continue\n \n-\t\ttest -s $dotest/patch || {\n+\t\ttest -s \"$dotest/patch\" || {\n \t\t\techo \"Patch is empty. Was it split wrong?\"\n \t\t\tstop_here $this\n \t\t}\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 7cd8f71..d1efa1d 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -53,7 +53,7 @@ if ! [ -d \"$QUILT_PATCHES\" ] ; then\n fi\n \n # Temporary directories\n-tmp_dir=.dotest\n+tmp_dir=\"$GIT_DIR\"/rebase\n tmp_msg=\"$tmp_dir/msg\"\n tmp_patch=\"$tmp_dir/patch\"\n tmp_info=\"$tmp_dir/info\"\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex a35212d..da79a24 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -31,7 +31,7 @@ skip skip current patch and continue rebasing process\n . git-sh-setup\n require_work_tree\n \n-DOTEST=\"$GIT_DIR/.dotest-merge\"\n+DOTEST=\"$GIT_DIR/rebase-merge\"\n TODO=\"$DOTEST\"/git-rebase-todo\n DONE=\"$DOTEST\"/done\n MSG=\"$DOTEST\"/message\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 2597d77..5fe06d1 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -14,7 +14,7 @@ It is possible that a merge failure will prevent this process from being\n completely automatic. You will have to resolve any such merge failure\n and run git rebase --continue. Another option is to bypass the commit\n that caused the merge failure with git rebase --skip. To restore the\n-original and remove the .dotest working files, use the command\n+original and remove the .git/rebase working files, use the command\n git rebase --abort instead.\n \n Note that if is not specified on the command line, the\n@@ -42,7 +42,7 @@ To restore the original branch and stop rebasing run \\\"git rebase --abort\\\".\n unset newbase\n strategy=recursive\n do_merge=\n-dotest=$GIT_DIR/.dotest-merge\n+dotest=\"$GIT_DIR\"/rebase-merge\n prec=4\n verbose=\n git_am_opt=\n@@ -150,7 +150,7 @@ while test $# != 0\n do\n \tcase \"$1\" in\n \t--continue)\n-\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit diff-files --quiet --ignore-submodules || {\n@@ -173,15 +173,15 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\thead_name=$(cat .dotest/head-name) &&\n-\t\tonto=$(cat .dotest/onto) &&\n-\t\torig_head=$(cat .dotest/orig-head) &&\n+\t\thead_name=$(cat \"$GIT_DIR\"/rebase/head-name) &&\n+\t\tonto=$(cat \"$GIT_DIR\"/rebase/onto) &&\n+\t\torig_head=$(cat \"$GIT_DIR\"/rebase/orig-head) &&\n \t\tgit am --resolved --3way --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n \t--skip)\n-\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit reset --hard HEAD || exit $?\n@@ -201,15 +201,15 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\thead_name=$(cat .dotest/head-name) &&\n-\t\tonto=$(cat .dotest/onto) &&\n-\t\torig_head=$(cat .dotest/orig-head) &&\n+\t\thead_name=$(cat \"$GIT_DIR\"/rebase/head-name) &&\n+\t\tonto=$(cat \"$GIT_DIR\"/rebase/onto) &&\n+\t\torig_head=$(cat \"$GIT_DIR\"/rebase/orig-head) &&\n \t\tgit am -3 --skip --resolvemsg=\"$RESOLVEMSG\" &&\n \t\tmove_to_original_branch\n \t\texit\n \t\t;;\n \t--abort)\n-\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\ttest -d \"$dotest\" -o -d \"$GIT_DIR\"/rebase ||\n \t\t\tdie \"No rebase in progress?\"\n \n \t\tgit rerere clear\n@@ -217,7 +217,7 @@ do\n \t\tthen\n \t\t\tmove_to_original_branch\n \t\telse\n-\t\t\tdotest=.dotest\n+\t\t\tdotest=\"$GIT_DIR\"/rebase\n \t\t\tmove_to_original_branch\n \t\tfi\n \t\tgit reset --hard $(cat \"$dotest/orig-head\")\n@@ -265,24 +265,24 @@ do\n \tshift\n done\n \n-# Make sure we do not have .dotest\n+# Make sure we do not have $GIT_DIR/rebase\n if test -z \"$do_merge\"\n then\n-\tif mkdir .dotest\n+\tif mkdir \"$GIT_DIR\"/rebase\n \tthen\n-\t\trmdir .dotest\n+\t\trmdir \"$GIT_DIR\"/rebase\n \telse\n \t\techo >&2 '\n-It seems that I cannot create a .dotest directory, and I wonder if you\n+It seems that I cannot create a .git/rebase directory, and I wonder if you\n are in the middle of patch application or another rebase. If that is not\n-the case, please rm -fr .dotest and run me again. I am stopping in case\n+the case, please rm -fr .git/rebase and run me again. I am stopping in case\n you still have something valuable there.'\n \t\texit 1\n \tfi\n else\n \tif test -d \"$dotest\"\n \tthen\n-\t\tdie \"previous dotest directory $dotest still exists.\" \\\n+\t\tdie \"previous rebase directory $dotest still exists.\" \\\n \t\t\t'try git-rebase < --continue | --abort >'\n \tfi\n fi\n@@ -396,10 +396,10 @@ then\n \tgit am $git_am_opt --rebasing --resolvemsg=\"$RESOLVEMSG\" &&\n \tmove_to_original_branch\n \tret=$?\n-\ttest 0 != $ret -a -d .dotest &&\n-\t\techo $head_name > .dotest/head-name &&\n-\t\techo $onto > .dotest/onto &&\n-\t\techo $orig_head > .dotest/orig-head\n+\ttest 0 != $ret -a -d \"$GIT_DIR\"/rebase &&\n+\t\techo $head_name > \"$GIT_DIR\"/rebase/head-name &&\n+\t\techo $onto > \"$GIT_DIR\"/rebase/onto &&\n+\t\techo $orig_head > \"$GIT_DIR\"/rebase/orig-head\n \texit $ret\n fi\n \ndiff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh\nindex 4934a4e..36d9a2a 100755\n--- a/t/t3401-rebase-partial.sh\n+++ b/t/t3401-rebase-partial.sh\n@@ -50,12 +50,12 @@ test_debug \\\n \n test_expect_success \\\n 'rebase topic branch against new master and check git-am did not get halted' \\\n- 'git-rebase master && test ! -d .dotest'\n+ 'git-rebase master && test ! -d .git/rebase'\n \n test_expect_success \\\n \t'rebase --merge topic branch that was partially merged upstream' \\\n \t'git-checkout -f my-topic-branch-merge &&\n \t git-rebase --merge master-merge &&\n-\t test ! -d .git/.dotest-merge'\n+\t test ! -d .git/rebase-merge'\n \n test_done\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 092aa26..ffe3dd9 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -159,19 +159,19 @@ test_expect_success 'stop on conflicting pick' '\n \tgit tag new-branch1 &&\n \ttest_must_fail git rebase -i master &&\n \ttest \"$(git rev-parse HEAD~3)\" = \"$(git rev-parse master)\" &&\n-\ttest_cmp expect .git/.dotest-merge/patch &&\n+\ttest_cmp expect .git/rebase-merge/patch &&\n \ttest_cmp expect2 file1 &&\n \ttest \"$(git-diff --name-status |\n \t\tsed -n -e \"/^U/s/^U[^a-z]*//p\")\" = file1 &&\n-\ttest 4 = $(grep -v \"^#\" < .git/.dotest-merge/done | wc -l) &&\n-\ttest 0 = $(grep -c \"^[^#]\" < .git/.dotest-merge/git-rebase-todo)\n+\ttest 4 = $(grep -v \"^#\" < .git/rebase-merge/done | wc -l) &&\n+\ttest 0 = $(grep -c \"^[^#]\" < .git/rebase-merge/git-rebase-todo)\n '\n \n test_expect_success 'abort' '\n \tgit rebase --abort &&\n \ttest $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&\n \ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/branch1\" &&\n-\t! test -d .git/.dotest-merge\n+\t! test -d .git/rebase-merge\n '\n \n test_expect_success 'retain authorship' '\ndiff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh\nindex 1777ffe..12c8804 100755\n--- a/t/t3407-rebase-abort.sh\n+++ b/t/t3407-rebase-abort.sh\n@@ -74,7 +74,7 @@ testrebase() {\n \t'\n }\n \n-testrebase \"\" .dotest\n-testrebase \" --merge\" .git/.dotest-merge\n+testrebase \"\" .git/rebase\n+testrebase \" --merge\" .git/rebase-merge\n \n test_done\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex bc98260..5cbd5ef 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -102,7 +102,7 @@ test_expect_success 'am applies patch correctly' '\n \tgit checkout first &&\n \ttest_tick &&\n \tgit am >file &&\n \tgit add file &&\n \tgit am --resolved &&\n-\t! test -d .dotest &&\n+\t! test -d .git/rebase &&\n \ttest goodbye = \"$(cat another)\"\n '\n \n test_expect_success 'am takes patches from a Pine mailbox' '\n \tgit checkout first &&\n \tcat pine patch1 | git am &&\n-\t! test -d .dotest &&\n+\t! test -d .git/rebase &&\n \ttest -z \"$(git diff master^..HEAD)\"\n '\n \n test_expect_success 'am fails on mail without patch' '\n \t! git am >failmail &&\n \t! git am file &&\n-- \n1.5.6.2.449.g342381.dirty\n"},{"id":"83463","messageId":"20080716014711.GD31732@leksak.fem-net","threadId":"14470","inReplyTo":"20080716012619.GM8185@mit.edu","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-07-16T01:47:11Z","receivedAt":"2008-07-16T01:47:11Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi,\n\nTheodore Tso wrote:\n> While you have \"git am\" open, how about adding an \"git am --abort\"\n> which nukes the .dotest aka .git/rebase directory, and resets HEAD\n> back to the original position?\n\nPerhaps it will not conform you, but my sequencer patchset (coming\ntomorrow or the day after, I think), will add --abort as a trivial\npatch (running sequencer --abort).\n\nRegards.\n\n-- \nStephan Beyer , PGP 0x6EDDD207FCC5040F\n"},{"id":"83465","messageId":"alpine.LFD.1.10.0807151851090.2835@woody.linux-foundation.org","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160315020.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Linus Torvalds","fromEmail":"torvalds@linux-foundation.org","sentAt":"2008-07-16T01:52:06Z","receivedAt":"2008-07-16T01:52:06Z","isPatch":true,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Wed, 16 Jul 2008, Johannes Schindelin wrote:\n> \n> Of course, you can name it as you want. But I thought that the name \n> \"rebase\" applies as well: the patches are rebased from somewhere else on \n> top of HEAD :-)\n\nWell, the original thing was not rebasing, it was patch application. You \ncould _perhaps_ call that \"rebasing\" from another tree, but that's a \nstretch.\n\nBut I don't really care about the name. _Anything_ is better then \n\".dotest\", after all.\n\n\t\tLinus\n"},{"id":"83467","messageId":"alpine.DEB.1.00.0807160428590.2841@eeepc-johanness","threadId":"14470","inReplyTo":"alpine.LFD.1.10.0807151851090.2835@woody.linux-foundation.org","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-16T02:30:16Z","receivedAt":"2008-07-16T02:30:16Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 15 Jul 2008, Linus Torvalds wrote:\n\n> On Wed, 16 Jul 2008, Johannes Schindelin wrote:\n> > \n> > Of course, you can name it as you want. But I thought that the name \n> > \"rebase\" applies as well: the patches are rebased from somewhere else \n> > on top of HEAD :-)\n> \n> Well, the original thing was not rebasing, it was patch application. You \n> could _perhaps_ call that \"rebasing\" from another tree, but that's a \n> stretch.\n\nHey, I do not insist on that name. I just explained why I thought it was \nokay even for am. If you know a better name, just tell me, and I'll adapt \nthe patch in no time (at least as long as I am awake).\n\nCiao,\nDscho\n"},{"id":"83469","messageId":"7vlk02wmtt.fsf@gitster.siamese.dyndns.org","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160428590.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-16T03:05:18Z","receivedAt":"2008-07-16T03:05:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n>> Well, the original thing was not rebasing, it was patch application. You \n>> could _perhaps_ call that \"rebasing\" from another tree, but that's a \n>> stretch.\n>\n> Hey, I do not insist on that name. I just explained why I thought it was \n> okay even for am. If you know a better name, just tell me, and I'll adapt \n> the patch in no time (at least as long as I am awake).\n\nI obviously do not care too much about the name, as long as you volunteer\nto squelch any newbie questions here and #git \"Why is it called rebase\nwhen I asked for am???\".\n\nAnyway, it's all in 'master' now, and you will see a huge \"What's in\" and\nmuch leaner \"What's cooking\" shortly.\n"},{"id":"83565","messageId":"7viqv5r637.fsf@gitster.siamese.dyndns.org","threadId":"14470","inReplyTo":"20080716012619.GM8185@mit.edu","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-16T19:18:04Z","receivedAt":"2008-07-16T19:18:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Theodore Tso writes:\n\n> While you have \"git am\" open, how about adding an \"git am --abort\"\n> which nukes the .dotest aka .git/rebase directory, and resets HEAD\n> back to the original position?\n\nThis does not seem to have reached the list nor its archives. I cannot\nsay I have really looked at it deeply but it may be a good starting\npoint. It needs docs ;-)\n\n-- >8 --\nFrom: Nanako Shiraishi \nDate: Wed, 16 Jul 2008 19:39:10 +0900\nSubject: [PATCH] git am --abort\n\nAfter failing to apply patches in the middle of a series, \"git am --abort\"\nlets you go back to the original commit.\n\nSigned-off-by: Nanako Shiraishi \n---\n git-am.sh | 19 +++++++++++++++----\n t/t4151-am-abort.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 63 insertions(+), 4 deletions(-)\n create mode 100755 t/t4151-am-abort.sh\n\ndiff --git a/git-am.sh b/git-am.sh\nindex cc8787b..a44bd7a 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -22,6 +22,7 @@ p= pass it through git-apply\n resolvemsg= override error message when patch failure occurs\n r,resolved to be used after a patch failure\n skip skip the current patch\n+abort abandon patch application and clear .dotest directory\n rebasing (internal use for git-rebase)\"\n \n . git-sh-setup\n@@ -120,7 +121,7 @@ It does not apply to blobs recorded in its index.\"\n \n prec=4\n dotest=\"$GIT_DIR/rebase\"\n-sign= utf8=t keep= skip= interactive= resolved= binary= rebasing=\n+sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= abort=\n resolvemsg= resume=\n git_apply_opt=\n \n@@ -145,6 +146,8 @@ do\n \t\tresolved=t ;;\n \t--skip)\n \t\tskip=t ;;\n+\t--abort)\n+\t\tabort=t ;;\n \t--rebasing)\n \t\trebasing=t threeway=t keep=t binary=t ;;\n \t-d|--dotest)\n@@ -177,7 +180,7 @@ fi\n \n if test -d \"$dotest\"\n then\n-\tcase \"$#,$skip$resolved\" in\n+\tcase \"$#,$skip$resolved$abort\" in\n \t0,*t*)\n \t\t# Explicit resume command and we do not have file, so\n \t\t# we are happy.\n@@ -197,9 +200,17 @@ then\n \tesac ||\n \tdie \"previous rebase directory $dotest still exists but mbox given.\"\n \tresume=yes\n+\n+\tcase \"$abort\" in\n+\tt)\n+\t\trm -fr \"$dotest\" &&\n+\t\tgit read-tree -m -u ORIG_HEAD &&\n+\t\tgit reset ORIG_HEAD && :\n+\t\texit ;;\n+\tesac\n else\n-\t# Make sure we are not given --skip nor --resolved\n-\ttest \",$skip,$resolved,\" = ,,, ||\n+\t# Make sure we are not given --skip, --resolved, nor --abort\n+\ttest \"$skip$resolved$abort\" = \"\" ||\n \t\tdie \"Resolve operation not in progress, we are not resuming.\"\n \n \t# Start afresh.\ndiff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh\nnew file mode 100755\nindex 0000000..96b2cd5\n--- /dev/null\n+++ b/t/t4151-am-abort.sh\n@@ -0,0 +1,48 @@\n+#!/bin/sh\n+\n+test_description='am --abort'\n+\n+. ./test-lib.sh\n+\n+test_expect_success setup '\n+\tfor i in a b c d e f g\n+\tdo\n+\t\techo $i\n+\tdone >file-1 &&\n+\tcp file-1 file-2 &&\n+\ttest_tick &&\n+\tgit add file-1 file-2 &&\n+\tgit commit -m initial &&\n+\tgit tag initial &&\n+\tfor i in 2 3 4 5\n+\tdo\n+\t\techo $i >>file-1 &&\n+\t\ttest_tick &&\n+\t\tgit commit -a -m $i || break\n+\tdone &&\n+\tgit format-patch initial &&\n+\tgit checkout -b side initial &&\n+\techo local change >file-2 &&\n+\tcp file-2 file-2-expect\n+'\n+\n+test_expect_success 'am stops at a patch that does not apply' '\n+\ttest_must_fail git am 000[124]-*.patch &&\n+\tgit log --pretty=tformat:%s >actual &&\n+\tfor i in 3 2 initial\n+\tdo\n+\t\techo $i\n+\tdone >expect &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success 'am --abort goes back' '\n+\tgit am --abort &&\n+\tgit rev-parse HEAD >actual &&\n+\tgit rev-parse initial >expect &&\n+\ttest_cmp expect actual &&\n+\ttest_cmp file-2-expect file-2 &&\n+\tgit diff-index --exit-code --cached HEAD\n+'\n+\n+test_done\n-- \n1.5.6\n"},{"id":"83597","messageId":"20080716212707.GQ32184@machine.or.cz","threadId":"14470","inReplyTo":"alpine.DEB.1.00.0807160315020.2841@eeepc-johanness","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2008-07-16T21:27:07Z","receivedAt":"2008-07-16T21:27:07Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":" Hi,\n\nOn Wed, Jul 16, 2008 at 03:15:42AM +0200, Johannes Schindelin wrote:\n> On Tue, 15 Jul 2008, Junio C Hamano wrote:\n> \n> > Johannes Schindelin writes:\n> > \n> > > Since the files generated and used during a rebase are never to be \n> > > tracked, they should live in $GIT_DIR. While at it, avoid the rather \n> > > meaningless term \"dotest\" to \"rebase\", and unhide \".dotest-merge\".\n> > \n> > I understand moving away from .dotest/ to .git/something, but I do not \n> > follow the logic of making that something to rebase at all. It is a \n> > scratch area for \"am\" (and applymbox), isn't it?\n> \n> Of course, you can name it as you want. But I thought that the name \n> \"rebase\" applies as well: the patches are rebased from somewhere else on \n> top of HEAD :-)\n\n even not considering the sequencer work, wouldn't \"sequence\" be a well\ndescriptive name?\n\n\t\t\t\tPetr \"Pasky\" Baudis\n"},{"id":"83599","messageId":"7v8ww1pkrg.fsf@gitster.siamese.dyndns.org","threadId":"14470","inReplyTo":"20080716212707.GQ32184@machine.or.cz","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-16T21:44:03Z","receivedAt":"2008-07-16T21:44:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Petr Baudis writes:\n\n>> Of course, you can name it as you want. But I thought that the name \n>> \"rebase\" applies as well: the patches are rebased from somewhere else on \n>> top of HEAD :-)\n>\n> even not considering the sequencer work, wouldn't \"sequence\" be a well\n> descriptive name?\n\nHeh, I did not want to become a painter, especially I already have a\nrather busy plumber job, but here is my thought process:\n\n * \"rebase-merge\" is used only by rebase that uses merge as the pick\n mechanism;\n\n * when $dotest is used by rebase, it is to implement the \"pick\" mechanism\n based on applying patches. \"rebase-apply\" is a good parallel to\n \"rebase-merge\" here;\n\n * when $dotest is used by am, it is to hold the patches to be applied.\n\nCalling the directory \"rebase-apply\" would be easy to understand for\nsomebody who does _not_ know nor care about such low-level details, too.\nIt is a temporary holding area that is used by the procedure to rebase a\nhistory and the procedure to apply patches.\n"},{"id":"83961","messageId":"4882350B.6020003@free.fr","threadId":"14470","inReplyTo":"7viqv5r637.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Rename \".dotest/\" to \".git/rebase\" and \".dotest-merge\" to \"rebase-merge\"","fromName":"Olivier Marin","fromEmail":"dkr+ml.git@free.fr","sentAt":"2008-07-19T18:40:11Z","receivedAt":"2008-07-19T18:40:11Z","isPatch":true,"sender":{"key":"dkr+ml.git@free.fr","avatar":null},"body":"Junio C Hamano a écrit :\n> Theodore Tso writes:\n> \n>> While you have \"git am\" open, how about adding an \"git am --abort\"\n>> which nukes the .dotest aka .git/rebase directory, and resets HEAD\n>> back to the original position?\n> \n> This does not seem to have reached the list nor its archives. I cannot\n> say I have really looked at it deeply but it may be a good starting\n> point. It needs docs ;-)\n\nThis can be squashed to Nanako's path: it adds missing docs,\n'git rerere clear' and move $dotest deletion at the end in case\n'git read-tree' failed (because of a dirty index).\n\nOlivier.\n\n-- >8 --\nSubject: [PATCH] git am --abort\n\nTo squash.\n\nSigned-off-by: Olivier Marin \n---\n Documentation/git-am.txt | 5 ++++-\n git-am.sh | 8 +++++---\n 2 files changed, 9 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 2d7f162..e010a16 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n [--3way] [--interactive] [--binary]\n [--whitespace=