{"thread":{"id":"26723","subject":"[PATCH] Clarify: rebase abort leaves checked-out","startedAt":"2011-03-13T16:54:18Z","lastAt":"2011-03-14T15:47:37Z","messageCount":5,"participants":["Drew Northup","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"163289","messageId":"1300035258.5129.12.camel@drew-northup.unet.maine.edu","threadId":"26723","inReplyTo":null,"subject":"[PATCH] Clarify: rebase abort leaves checked-out","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-03-13T16:54:18Z","receivedAt":"2011-03-13T16:54:18Z","isPatch":true,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"This change makes it clearer that while the change\nto the history effected by executing\n'git rebase master' and 'git rebase master topic'\n(in the example given) will be the same the\nimplicit checkout of the second form will not be\nundone even if the rebase operation itself is\naborted.\n\nSigned-off-by: Drew Northup \n---\n Documentation/git-rebase.txt | 5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 96680c8..4e2411a 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -66,8 +66,9 @@ would be:\n D---E---F---G master\n ------------\n \n-The latter form is just a short-hand of `git checkout topic`\n-followed by `git rebase master`.\n+*NOTE:* The latter form is just a short-hand of `git checkout topic`\n+followed by `git rebase master`. If the rebase is aborted `topic` will \n+remain the checked-out branch.\n \n If the upstream branch already contains a change you have made (e.g.,\n because you mailed a patch which was applied upstream), then that commit\n-- \n1.6.4\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"163292","messageId":"alpine.DEB.1.00.1103131839030.1561@bonsai2","threadId":"26723","inReplyTo":"1300035258.5129.12.camel@drew-northup.unet.maine.edu","subject":"Re: [PATCH] Clarify: rebase abort leaves checked-out","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2011-03-13T17:40:32Z","receivedAt":"2011-03-13T17:40:32Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 13 Mar 2011, Drew Northup wrote:\n\n> This change makes it clearer that while the change\n> to the history effected by executing\n> 'git rebase master' and 'git rebase master topic'\n> (in the example given) will be the same the\n> implicit checkout of the second form will not be\n> undone even if the rebase operation itself is\n> aborted.\n\nI wonder whether we should not handle that case better. I know that I \nwould have expected an abort to undo the branch switch.\n\nThanks for bringing this to our attention,\nDscho\n\nP.S.:\n\n> 1.6.4\n\nWhoa!\n"},{"id":"163296","messageId":"7vtyf6hkpo.fsf@alter.siamese.dyndns.org","threadId":"26723","inReplyTo":"1300035258.5129.12.camel@drew-northup.unet.maine.edu","subject":"Re: [PATCH] Clarify: rebase abort leaves checked-out","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-13T19:41:23Z","receivedAt":"2011-03-13T19:41:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Drew Northup writes:\n\n> -The latter form is just a short-hand of `git checkout topic`\n> -followed by `git rebase master`.\n> +*NOTE:* The latter form is just a short-hand of `git checkout topic`\n> +followed by `git rebase master`. If the rebase is aborted `topic` will \n> +remain the checked-out branch.\n\nThe behaviour is consistent between the case where \"this on that\" form\nsucceeds and it stops and gets aborted, and I think both are euqally\nnoteworthy. So I'd suggest dropping \"if aborted\".\n"},{"id":"163304","messageId":"1300102832.5129.17.camel@drew-northup.unet.maine.edu","threadId":"26723","inReplyTo":"7vtyf6hkpo.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Clarify: rebase abort leaves checked-out","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-03-14T11:40:32Z","receivedAt":"2011-03-14T11:40:32Z","isPatch":true,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"\nOn Sun, 2011-03-13 at 12:41 -0700, Junio C Hamano wrote:\n> Drew Northup writes:\n> \n> > -The latter form is just a short-hand of `git checkout topic`\n> > -followed by `git rebase master`.\n> > +*NOTE:* The latter form is just a short-hand of `git checkout topic`\n> > +followed by `git rebase master`. If the rebase is aborted `topic` will \n> > +remain the checked-out branch.\n> \n> The behaviour is consistent between the case where \"this on that\" form\n> succeeds and it stops and gets aborted, and I think both are euqally\n> noteworthy. So I'd suggest dropping \"if aborted\".\n\nSo a synthetic look at that might be:\n\n-If the rebase is aborted\n+When rebase exits\n\nComments?\n\nI'll see about re-rolling likewise (and on something with a more recent\nruntime!).\n\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"163313","messageId":"1300117657.5129.41.camel@drew-northup.unet.maine.edu","threadId":"26723","inReplyTo":"7vtyf6hkpo.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2] Clarify: rebase exit leaves checked-out","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-03-14T15:47:37Z","receivedAt":"2011-03-14T15:47:37Z","isPatch":true,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"This change makes it clearer that while the change\nto the history effected by executing\n'git rebase master' and 'git rebase master topic'\n(in the example given) will be the same the\nimplicit checkout of the second form will always\nremain following the rebase.\n\nSigned-off-by: Drew Northup \n---\n\nThis applies cleanly to both master and pu. Changed patch subject to\nbetter match the amended contents.\n\n Documentation/git-rebase.txt | 5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 96680c8..ac35894 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -66,8 +66,9 @@ would be:\n D---E---F---G master\n ------------\n \n-The latter form is just a short-hand of `git checkout topic`\n-followed by `git rebase master`.\n+*NOTE:* The latter form is just a short-hand of `git checkout topic`\n+followed by `git rebase master`. When rebase exits `topic` will\n+remain the checked-out branch.\n \n If the upstream branch already contains a change you have made (e.g.,\n because you mailed a patch which was applied upstream), then that commit\n-- \n1.7.4\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"}]}