{"thread":{"id":"12613","subject":"[RFE] git rebase doesn't say it failed","startedAt":"2008-03-10T03:20:48Z","lastAt":"2008-03-10T14:33:25Z","messageCount":5,"participants":["Christian Holtje","Johannes Schindelin","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"71550","messageId":"429AC7A2-511E-496F-9C1C-4627604EBBFB@gmail.com","threadId":"12613","inReplyTo":null,"subject":"[RFE] git rebase doesn't say it failed","fromName":"Christian Holtje","fromEmail":"docwhat@gmail.com","sentAt":"2008-03-10T03:20:48Z","receivedAt":"2008-03-10T03:20:48Z","isPatch":false,"sender":{"key":"docwhat@gmail.com","avatar":"https://gravatar.com/avatar/b87944ebf1ff49feaeefaa1c19a6e98baee691c531ecb860c2bc4f63b464a395?d=mp&s=160"},"body":"Hello!\n\nWhat happened:\n  I tried to do a rebase and got a message about files \"needs  \nupdate\".  However, it didn't say it did a rebase nor did it say that  \nit failed.\nExample:\n+ git rebase origin/master\nf1: needs update\n\n\nWhat I expected:\n  It should have said that it was unable to rebase because of these  \nfiles.\nExample:\n+ git rebase origin/master\nf1: needs update\nGit was unable to rebase due to the files above.  Please commit them  \nor move them out of the way.\nHint: See \"git reset --help\" for a suggestion about saving work in  \nprogress.\n\n\nNotes:\nI have had several users at the company that I work think that these  \nmessages meant that it worked fine.  There are some commands (like  \nreset, co, etc.) that show these kind of messages and it isn't an  \nerror; they were conditioned to think they were acceptable messages.\n\nversion: 1.5.4.3\n\nShell script to recreate the problem:\n#!/bin/sh\n\nset -eux\n\nrm -rf a b\nmkdir a\ncd a\ngit init\necho 1 > f1\necho 1 > f2\ngit add f?\ngit commit -m \"init\"\n\ncd ..\ngit clone a b\n\ncd b\necho 1.5 > f1\n\ncd ../a\necho 2 > f2\ngit commit -m \"2\" f2\n\ncd ../b\ngit fetch\ngit rebase origin/master\n\n#EOF\n"},{"id":"71573","messageId":"alpine.LSU.1.00.0803101207120.3975@racer.site","threadId":"12613","inReplyTo":"429AC7A2-511E-496F-9C1C-4627604EBBFB@gmail.com","subject":"Re: [RFE] git rebase doesn't say it failed","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-03-10T11:10:08Z","receivedAt":"2008-03-10T11:10:08Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 9 Mar 2008, Christian Holtje wrote:\n\n> Hello!\n> \n> What happened:\n> I tried to do a rebase and got a message about files \"needs update\".\n> However, it didn't say it did a rebase nor did it say that it failed.\n\nIt told you that a file is dirty.  Git kinda expects you to know that it \nwill not start a rebase on a dirty working directory.\n\nSo there _was_ an (implicit) message saying that it failed.\n\n> Git was unable to rebase due to the files above.  Please commit them or move\n> them out of the way.\n> Hint: See \"git reset --help\" for a suggestion about saving work in progress.\n\nThe same comment I gave last week applies here: people complained that Git \nwas too chatty.  I tend to agree, since the important information was lost \nin the huge amount of text.  Now you say we should make it chatty again?\n\nHth,\nDscho\n"},{"id":"71578","messageId":"fr37gm$9k4$2@ger.gmane.org","threadId":"12613","inReplyTo":"alpine.LSU.1.00.0803101207120.3975@racer.site","subject":"Re: [RFE] git rebase doesn't say it failed","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-03-10T11:53:58Z","receivedAt":"2008-03-10T11:53:58Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Johannes Schindelin wrote:\n\n>> Git was unable to rebase due to the files above.  Please commit them or move\n>> them out of the way.\n>> Hint: See \"git reset --help\" for a suggestion about saving work in progress.\n> \n> The same comment I gave last week applies here: people complained that Git \n> was too chatty.  I tend to agree, since the important information was lost \n> in the huge amount of text.  Now you say we should make it chatty again?\n\n--verbose option, anyone?\n\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"},{"id":"71580","messageId":"alpine.LSU.1.00.0803101329430.3975@racer.site","threadId":"12613","inReplyTo":"fr37gm$9k4$2@ger.gmane.org","subject":"Re: [RFE] git rebase doesn't say it failed","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-03-10T12:29:55Z","receivedAt":"2008-03-10T12:29:55Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 10 Mar 2008, Jakub Narebski wrote:\n\n> Johannes Schindelin wrote:\n> \n> >> Git was unable to rebase due to the files above.  Please commit them or move\n> >> them out of the way.\n> >> Hint: See \"git reset --help\" for a suggestion about saving work in progress.\n> > \n> > The same comment I gave last week applies here: people complained that Git \n> > was too chatty.  I tend to agree, since the important information was lost \n> > in the huge amount of text.  Now you say we should make it chatty again?\n> \n> --verbose option, anyone?\n\nPatches welcome,\nDscho\n"},{"id":"71585","messageId":"5C9883C7-04F4-4786-980A-25958A4102F1@gmail.com","threadId":"12613","inReplyTo":"alpine.LSU.1.00.0803101207120.3975@racer.site","subject":"Re: [RFE] git rebase doesn't say it failed","fromName":"Christian Holtje","fromEmail":"docwhat@gmail.com","sentAt":"2008-03-10T14:33:25Z","receivedAt":"2008-03-10T14:33:25Z","isPatch":false,"sender":{"key":"docwhat@gmail.com","avatar":"https://gravatar.com/avatar/b87944ebf1ff49feaeefaa1c19a6e98baee691c531ecb860c2bc4f63b464a395?d=mp&s=160"},"body":"\nOn Mar 10, 2008, at 7:10 AM, Johannes Schindelin wrote:\n\n> On Sun, 9 Mar 2008, Christian Holtje wrote:\n>\n>> Hello!\n>>\n>> What happened:\n>> I tried to do a rebase and got a message about files \"needs update\".\n>> However, it didn't say it did a rebase nor did it say that it failed.\n>\n> It told you that a file is dirty.  Git kinda expects you to know  \n> that it\n> will not start a rebase on a dirty working directory.\n>\n> So there _was_ an (implicit) message saying that it failed.\n>\n>> Git was unable to rebase due to the files above.  Please commit  \n>> them or move\n>> them out of the way.\n>> Hint: See \"git reset --help\" for a suggestion about saving work in  \n>> progress.\n>\n> The same comment I gave last week applies here: people complained  \n> that Git\n> was too chatty.  I tend to agree, since the important information  \n> was lost\n> in the huge amount of text.  Now you say we should make it chatty  \n> again?\n\nI can see the problem with commands that execute correctly being too  \nchatty, but here the command requested was not performed.  In the name  \nof terseness, how about simply saying \"rebase was not performed.\"\n\nAs a general rule, though, when I generate an error message I try to  \nexplain what happened and how the user should fix it, which is why I  \nincluded the more verbose version above.\n\nCiao!\n"}]}