{"thread":{"id":"34694","subject":"New special handing of '@' character broke my use case","startedAt":"2013-08-14T17:36:23Z","lastAt":"2013-08-15T09:16:11Z","messageCount":7,"participants":["Stefano Lattarini","Junio C Hamano","Johannes Sixt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"225219","messageId":"520BC017.7050907@gmail.com","threadId":"34694","inReplyTo":null,"subject":"New special handing of '@' character broke my use case","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-08-14T17:36:23Z","receivedAt":"2013-08-14T17:36:23Z","isPatch":false,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"Hello list.\n\nIn the last year or so, I developed a personal idiom of using a\nnaming scheme of \"@/BRANCH-NAME/\"to \"save\" the older versions\nof branches I'm going to rebase (interactively or not). Here is an\nidealized example of my use case:\n\n $ git co --help\n `git co' is aliased to `checkout'\n $ git co -b topic\n $ ... hack hack hack ...\n $ git co master && git pull # Let's say this brings in 100 commits\n $ git co topic # I want to rebase this to avoid merge conflicts later\n $ git branch @/topic/1 # So I save \"original version\" of the branch\n $ git rebase master # Do the rebase, solve conflicts etc.\n $ ... hack hack hack (20 commits) ...\n # Here I notice botched commits messages and badly-ordered\n # commits in the last 10 commits or so. I want to fix that.\n $ git branch @/topic/2 # Save \"latest version\" of the branch\n $ git rebase -i HEAD~12 # Fix issues\n\nMy problems is that some new automagical interpretation of the bare '@' \ncharacter (introduced after 1.8.3) has destroyed my use case:\n\n $ /usr/bin/git --version\n git version 1.8.3\n $ git --version\n git version 1.8.4.rc2\n $ git co master\n $ /usr/bin/git branch @/foo # Old git\n $ git branch\n @/foo # <-- good\n * master\n $ git branch # New git.\n @/foo # <-- good\n HEAD/bar # <-- BAD!\n * master\n\nI don't want to ask you to revert this new behaviour, but I'd like to\nat least have an option to disable it. Even better if such an option is \nalready present -- in which case, could you just point me at it?\n\nFailing that, I can re-train myself to use another character (like '='\nor '+') to take the same role '@' has hold for me until today, no big\ndeal. But in that case, I'd like some assurance that such a character \nis not going to be turned into a magical character some time in the \nfuture ;-)\n\nThanks,\n Stefano\n"},{"id":"225220","messageId":"7vd2pgtagc.fsf@alter.siamese.dyndns.org","threadId":"34694","inReplyTo":"520BC017.7050907@gmail.com","subject":"Re: New special handing of '@' character broke my use case","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-14T18:05:07Z","receivedAt":"2013-08-14T18:05:07Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefano Lattarini writes:\n\n> My problems is that some new automagical interpretation of the bare\n> @' character (introduced after 1.8.3) has destroyed my use case:\n> ...\n> I don't want to ask you to revert this new behaviour, but I'd like to\n> at least have an option to disable it.\n\nI do not think it is simply not worth the complexity to selectively\ndisable it. If it is a regression, it is much better to simply\nrevert, if we can (it appears that cdfd9483 (Add new @ shortcut for\nHEAD, 2013-05-07) can be reverted without any textual context, but\nthere may already be new stuff that depends on the \"@\").\n\nFor the upcoming release, I am very much tempted to revert it and\nlet the topic retried, by people who really want the \"let's save\nfour keystrokes and replace it with @ aka Shift-\",\nwithout hurting your use case (and others), after the upcoming\nrelease.\n\nWhat do others think?\n"},{"id":"225222","messageId":"7v8v04t9pw.fsf@alter.siamese.dyndns.org","threadId":"34694","inReplyTo":"520BC017.7050907@gmail.com","subject":"Re: New special handing of '@' character broke my use case","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-14T18:20:59Z","receivedAt":"2013-08-14T18:20:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefano Lattarini writes:\n\n> ... But in that case, I'd like some assurance that such a character\n> is not going to be turned into a magical character some time in the\n> future ;-)\n\nI'd say that any special letter could be considered a fair game by\nthe next person who would want a funky short-cut. If you used \"S\"\nor something, e.g. \"git branch S/ropic/1\" etc., it would be very\nunlikely to conflict with any such future changes.\n"},{"id":"225228","messageId":"520BD896.4020501@gmail.com","threadId":"34694","inReplyTo":"7vd2pgtagc.fsf@alter.siamese.dyndns.org","subject":"Re: New special handing of '@' character broke my use case","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-08-14T19:20:54Z","receivedAt":"2013-08-14T19:20:54Z","isPatch":false,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"[re-sending to the list, sorry Junio for the duplicate mail]\n\nOn 08/14/2013 07:05 PM, Junio C Hamano wrote:\n > Stefano Lattarini writes:\n >\n >> My problems is that some new automagical interpretation of the bare\n >> @' character (introduced after 1.8.3) has destroyed my use case:\n >> ...\n >> I don't want to ask you to revert this new behaviour, but I'd like to\n >> at least have an option to disable it.\n >\n > I do not think it is simply not worth the complexity to selectively\n > disable it. If it is a regression, it is much better to simply\n > revert, if we can (it appears that cdfd9483 (Add new @ shortcut for\n > HEAD, 2013-05-07) can be reverted without any textual context, but\n > there may already be new stuff that depends on the \"@\").\n >\nI'm not sure I want to force a revert simply to cater to a personal \nidiom of mine (and not that important). I'd first like to hear what the \ncommunity thinks about the issue (with silence meaning \"don't revert\").\n\n > For the upcoming release, I am very much tempted to revert it and\n > let the topic retried, by people who really want the \"let's save\n > four keystrokes and replace it with @ aka Shift-\",\n > without hurting your use case (and others), after the upcoming\n > release.\n >\n > What do others think?\n >\nI second this question :-)\n\nThanks,\n Stefano\n"},{"id":"225229","messageId":"520BE468.1030808@kdbg.org","threadId":"34694","inReplyTo":"7vd2pgtagc.fsf@alter.siamese.dyndns.org","subject":"Re: New special handing of '@' character broke my use case","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2013-08-14T20:11:20Z","receivedAt":"2013-08-14T20:11:20Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 14.08.2013 20:05, schrieb Junio C Hamano:\n> Stefano Lattarini writes:\n>\n>> My problems is that some new automagical interpretation of the bare\n>> @' character (introduced after 1.8.3) has destroyed my use case:\n>> ...\n>> I don't want to ask you to revert this new behaviour, but I'd like to\n>> at least have an option to disable it.\n>\n> I do not think it is simply not worth the complexity to selectively\n> disable it. If it is a regression, it is much better to simply\n> revert, if we can (it appears that cdfd9483 (Add new @ shortcut for\n> HEAD, 2013-05-07) can be reverted without any textual context, but\n> there may already be new stuff that depends on the \"@\").\n>\n> For the upcoming release, I am very much tempted to revert it and\n> let the topic retried, by people who really want the \"let's save\n> four keystrokes and replace it with @ aka Shift-\",\n> without hurting your use case (and others), after the upcoming\n> release.\n>\n> What do others think?\n\nStefano's use-case, where @/foo is turned into HEAD/foo, indicates a bug.\n\nIn my opinion, the topic, which touches a central part of ref handling, \nwas a bit hurried (and this report is a symptom of it), and I wouldn't \nmind seeing it reverted.\n\n-- Hannes\n"},{"id":"225230","messageId":"7vr4dwrnwx.fsf@alter.siamese.dyndns.org","threadId":"34694","inReplyTo":"520BE468.1030808@kdbg.org","subject":"Re: New special handing of '@' character broke my use case","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-14T20:57:18Z","receivedAt":"2013-08-14T20:57:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> Am 14.08.2013 20:05, schrieb Junio C Hamano:\n>> Stefano Lattarini writes:\n>>\n>>> My problems is that some new automagical interpretation of the bare\n>>> @' character (introduced after 1.8.3) has destroyed my use case:\n>>> ...\n>>> I don't want to ask you to revert this new behaviour, but I'd like to\n>>> at least have an option to disable it.\n>>\n>> I do not think it is simply not worth the complexity to selectively\n>> disable it. If it is a regression, it is much better to simply\n>> revert, if we can (it appears that cdfd9483 (Add new @ shortcut for\n>> HEAD, 2013-05-07) can be reverted without any textual context, but\n>> there may already be new stuff that depends on the \"@\").\n>>\n>> For the upcoming release, I am very much tempted to revert it and\n>> let the topic retried, by people who really want the \"let's save\n>> four keystrokes and replace it with @ aka Shift-\",\n>> without hurting your use case (and others), after the upcoming\n>> release.\n>>\n>> What do others think?\n>\n> Stefano's use-case, where @/foo is turned into HEAD/foo, indicates a bug.\n>\n> In my opinion, the topic, which touches a central part of ref\n> handling, was a bit hurried (and this report is a symptom of it), and\n> I wouldn't mind seeing it reverted.\n\nThanks; you said it much better than I did. I think the short-hand\nis not a bad idea by itself, but the execution may need to be redone\na bit more carefully, and it is prudent to revert it from the\nupcoming release.\n"},{"id":"225254","messageId":"520C9C5B.2090402@gmail.com","threadId":"34694","inReplyTo":"7vr4dwrnwx.fsf@alter.siamese.dyndns.org","subject":"Re: New special handing of '@' character broke my use case","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2013-08-15T09:16:11Z","receivedAt":"2013-08-15T09:16:11Z","isPatch":false,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"On 08/14/2013 09:57 PM, Junio C Hamano wrote:\n > Johannes Sixt writes:\n >\n > [SNIP]\n >\n >> Stefano's use-case, where @/foo is turned into HEAD/foo,\n >> indicates a bug.\n >>\n >> In my opinion, the topic, which touches a central part of ref\n >> handling, was a bit hurried (and this report is a symptom of it), and\n >> I wouldn't mind seeing it reverted.\n >\n > Thanks; you said it much better than I did. I think the short-hand\n > is not a bad idea by itself, but the execution may need to be redone\n > a bit more carefully, and it is prudent to revert it from the\n > upcoming release.\n >\nThanks both for taking care of this issue with the usual speed and\nclarity.\n\nBest regards,\n Stefano\n"}]}