{"thread":{"id":"11884","subject":"[PATCH] git-rebase.sh: Unchain the git-COMMAND into git COMMAND","startedAt":"2008-02-04T20:25:16Z","lastAt":"2008-02-05T14:10:40Z","messageCount":4,"participants":["Jari Aalto","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"67414","messageId":"3as81nbn.fsf@blue.sea.net","threadId":"11884","inReplyTo":null,"subject":"[PATCH] git-rebase.sh: Unchain the git-COMMAND into git COMMAND","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2008-02-04T20:25:16Z","receivedAt":"2008-02-04T20:25:16Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Change the commadns to use new style 'git COMMAND', without the dash.\nUse better syntax in output displayed to user that suggests to use\n--continue|--abort commands.\n\nSigned-off-by: Jari Aalto <jari.aalto AT cante.net>\n---\n git-rebase.sh |   16 ++++++++--------\n 1 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex bdcea0e..37ba8a8 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -21,7 +21,7 @@ Note that if <branch> is not specified on the command line, the\n currently checked out branch is used.  You must be in the top\n directory of your project to start (or continue) a rebase.\n \n-Example:       git-rebase master~1 topic\n+Example:       git rebase master~1 topic\n \n         A---B---C topic                   A'\\''--B'\\''--C'\\'' topic\n        /                   -->           /\n@@ -63,7 +63,7 @@ continue_merge () {\n \tcmt=`cat \"$dotest/current\"`\n \tif ! git diff-index --quiet HEAD --\n \tthen\n-\t\tif ! git-commit -C \"$cmt\"\n+\t\tif ! git commit -C \"$cmt\"\n \t\tthen\n \t\t\techo \"Commit failed, please do not call \\\"git commit\\\"\"\n \t\t\techo \"directly, but instead do one of the following: \"\n@@ -94,7 +94,7 @@ call_merge () {\n \teval GITHEAD_$cmt='\"${cmt_name##refs/heads/}~$(($end - $msgnum))\"'\n \teval GITHEAD_$hd='$(cat \"$dotest/onto_name\")'\n \texport GITHEAD_$cmt GITHEAD_$hd\n-\tgit-merge-$strategy \"$cmt^\" -- \"$hd\" \"$cmt\"\n+\tgit merge-$strategy \"$cmt^\" -- \"$hd\" \"$cmt\"\n \trv=$?\n \tcase \"$rv\" in\n \t0)\n@@ -111,7 +111,7 @@ call_merge () {\n \t\t;;\n \t*)\n \t\tdie \"Unknown exit code ($rv) from command:\" \\\n-\t\t\t\"git-merge-$strategy $cmt^ -- HEAD $cmt\"\n+\t\t\t\"git merge-$strategy $cmt^ -- HEAD $cmt\"\n \t\t;;\n \tesac\n }\n@@ -279,7 +279,7 @@ else\n \tif test -d \"$dotest\"\n \tthen\n \t\tdie \"previous dotest directory $dotest still exists.\" \\\n-\t\t\t'try git-rebase < --continue | --abort >'\n+\t\t\t'try git rebase {--continue|--abort}'\n \tfi\n fi\n \n@@ -315,7 +315,7 @@ fi\n case \"$#\" in\n 2)\n \tbranch_name=\"$2\"\n-\tgit-checkout \"$2\" || usage\n+\tgit checkout \"$2\" || usage\n \t;;\n *)\n \tif branch_name=`git symbolic-ref -q HEAD`\n@@ -363,7 +363,7 @@ esac\n \n # Rewind the head to \"$onto\"; this saves our current head in ORIG_HEAD.\n echo \"First, rewinding head to replay your work on top of it...\"\n-git-reset --hard \"$onto\"\n+git reset --hard \"$onto\"\n \n # If the $onto is a proper descendant of the tip of the branch, then\n # we just fast forwarded.\n@@ -387,7 +387,7 @@ then\n \texit $ret\n fi\n \n-# start doing a rebase with git-merge\n+# start doing a rebase with \"git merge\"\n # this is rename-aware if the recursive (default) strategy is used\n \n mkdir -p \"$dotest\"\n-- \n1.5.4-rc5.GIT-dirty\n\n\n-- \nWelcome to FOSS revolution: we fix and modify until it shines\n"},{"id":"67420","messageId":"alpine.LSU.1.00.0802042050480.8543@racer.site","threadId":"11884","inReplyTo":"3as81nbn.fsf@blue.sea.net","subject":"Re: [PATCH] git-rebase.sh: Unchain the git-COMMAND into git COMMAND","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-04T20:53:03Z","receivedAt":"2008-02-04T20:53:03Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 4 Feb 2008, Jari Aalto wrote:\n\n> -Example:       git-rebase master~1 topic\n> +Example:       git rebase master~1 topic\n\n>From 36e5e70e0f40cf7ca4351b8159d68f8560a2805f(Start deprecating \n\"git-command\" in favor of \"git command\"):\n\n    (For non-builtins, the \"git xyzzy\" format implies an extra execve(), so\n    this script leaves those alone).\n\nHth,\nDscho\n"},{"id":"67512","messageId":"8x1zzemr.fsf@blue.sea.net","threadId":"11884","inReplyTo":"alpine.LSU.1.00.0802042050480.8543@racer.site","subject":"Re: [PATCH] git-rebase.sh: Unchain the git-COMMAND into git COMMAND","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2008-02-05T14:01:16Z","receivedAt":"2008-02-05T14:01:16Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"* Mon 2008-02-04 Johannes Schindelin <Johannes.Schindelin@gmx.de>\n* Message-Id: alpine.LSU.1.00.0802042050480.8543@racer.site\n> Hi,\n>\n> On Mon, 4 Feb 2008, Jari Aalto wrote:\n>\n>> -Example:       git-rebase master~1 topic\n>> +Example:       git rebase master~1 topic\n>\n> From 36e5e70e0f40cf7ca4351b8159d68f8560a2805f(Start deprecating \n> \"git-command\" in favor of \"git command\"):\n>\n>     (For non-builtins, the \"git xyzzy\" format implies an extra execve(), so\n>     this script leaves those alone).\n\nPlease elaborate. I'm not sure I understand. If the git-<command> syntax\nis being phased out, it should be consistent decision accross the tools.\n\nJari\n\n-- \nWelcome to FOSS revolution: we fix and modify until it shines\n"},{"id":"67514","messageId":"alpine.LSU.1.00.0802051407540.8543@racer.site","threadId":"11884","inReplyTo":"8x1zzemr.fsf@blue.sea.net","subject":"Re: [PATCH] git-rebase.sh: Unchain the git-COMMAND into git COMMAND","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-05T14:10:40Z","receivedAt":"2008-02-05T14:10:40Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 5 Feb 2008, Jari Aalto wrote:\n\n> * Mon 2008-02-04 Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> * Message-Id: alpine.LSU.1.00.0802042050480.8543@racer.site\n> > Hi,\n> >\n> > On Mon, 4 Feb 2008, Jari Aalto wrote:\n> >\n> >> -Example:       git-rebase master~1 topic\n> >> +Example:       git rebase master~1 topic\n> >\n> > From 36e5e70e0f40cf7ca4351b8159d68f8560a2805f(Start deprecating \n> > \"git-command\" in favor of \"git command\"):\n> >\n> >     (For non-builtins, the \"git xyzzy\" format implies an extra execve(), so\n> >     this script leaves those alone).\n> \n> Please elaborate. I'm not sure I understand. If the git-<command> syntax\n> is being phased out, it should be consistent decision accross the tools.\n\nIf you call \"git xyz\", but git-xyz is a script, you will exec the git \nwrapper first, which will then exec git-xyz.  That is an unnecessary exec.\n\nSince the places you touched are already in a git script (i.e. it was \nalready called with PATH extended to git's libexec/ directory, if there is \none), we can avoid that extra exec.\n\nThe git-<command> syntax _is_ phased out, but in several steps.  Let's not \ndo the third step before the first, otherwise we'll trip.\n\nCiao,\nDscho\n"}]}