{"thread":{"id":"23773","subject":"git-gui disagrees with git status","startedAt":"2010-05-10T21:32:09Z","lastAt":"2010-05-11T14:27:49Z","messageCount":7,"participants":["Bill Winspur","Shawn O. Pearce","Miles Bader","Johannes Sixt","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"141439","messageId":"y2m3b1db1e51005101432je9e75a53vbb3781fa33aa83e7@mail.gmail.com","threadId":"23773","inReplyTo":null,"subject":"git-gui disagrees with git status","fromName":"Bill Winspur","fromEmail":"bwinspur@gmail.com","sentAt":"2010-05-10T21:32:09Z","receivedAt":"2010-05-10T21:32:09Z","isPatch":false,"sender":{"key":"bwinspur@gmail.com","avatar":null},"body":"Using git version 1.6.0.4\n\n- Created an eclipse wkspace, with a couple of projects in it.\n- Created a git repos at the workspace route, using cli.\n- Using cli added the two projects to git - at this point git status\nshows the following\n\n=====\nbwinspur@elm:~/ca.wydv.\nworkspaces/008-leaning-group/git-lrng-wksp$ git status\n# On branch master\n#\n# Initial commit\n#\n# Changes to be committed:\n#   (use \"git rm --cached ...\" to unstage)\n#\n#    new file: git.trial.help.bundle/.classpath\n        === omitted details from this post ==\n#    new file: git.trial.ui.bundle/.classpath\n        === omitted details from this post ==\n#\n# Untracked files:\n#   (use \"git add ...\" to include in what will be committed)\n#\n#    .metadata/\nbwinspur@elm:~/ca.wydv.workspaces/008-leaning-group/git-lrng-wksp$\n=====\n\nwhich is what I expected: my project folders are tracked, and\n.metadata/ is untracked.\n\n- now I bring up git gui and it shows all the files under .metadata/ as\nunstaged changes, which conflicts with git status, and may be due to a\ngit-gui bug\n\nRegards,\n\nBill Winspur\n"},{"id":"141442","messageId":"20100510213926.GA7156@spearce.org","threadId":"23773","inReplyTo":"y2m3b1db1e51005101432je9e75a53vbb3781fa33aa83e7@mail.gmail.com","subject":"Re: git-gui disagrees with git status","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2010-05-10T21:39:26Z","receivedAt":"2010-05-10T21:39:26Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Bill Winspur wrote:\n> #\n> # Untracked files:\n> #   (use \"git add ...\" to include in what will be committed)\n> #\n> #    .metadata/\n> bwinspur@elm:~/ca.wydv.workspaces/008-leaning-group/git-lrng-wksp$\n> =====\n> \n> which is what I expected: my project folders are tracked, and\n> .metadata/ is untracked.\n> \n> - now I bring up git gui and it shows all the files under .metadata/ as\n> unstaged changes, which conflicts with git status, and may be due to a\n> git-gui bug\n\nIts more a feature.\n\ngit-gui shows all untracked files, recursively expanding any\ndirectories which contain untracked files. git status collapses\nthem up. If you don't want to track a directory, maybe you should\nconfigure it in one of the many gitignore locations so neither git\nstatus nor git gui shows it.\n\n-- \nShawn.\n"},{"id":"141451","messageId":"buo632vj8px.fsf@dhlpc061.dev.necel.com","threadId":"23773","inReplyTo":"20100510213926.GA7156@spearce.org","subject":"Re: git-gui disagrees with git status","fromName":"Miles Bader","fromEmail":"miles@gnu.org","sentAt":"2010-05-11T05:41:46Z","receivedAt":"2010-05-11T05:41:46Z","isPatch":false,"sender":{"key":"miles@gnu.org","avatar":"https://gravatar.com/avatar/01069b69593af7bff28e2f97afeb3644ae6fe2f5f56cb3a8cf34c5fb8c36efe5?d=mp&s=160"},"body":"\"Shawn O. Pearce\" writes:\n> Its more a feature.\n>\n> git-gui shows all untracked files, recursively expanding any\n> directories which contain untracked files. git status collapses\n> them up.\n\nWait, why is this a feature, exactly...?\n\nIt may be well known that git-gui works this way, but that doesn't make\nit good behavior for the user.\n\n-Miles\n\n-- \n\"Suppose we've chosen the wrong god. Every time we go to church we're\njust making him madder and madder.\" -- Homer Simpson\n"},{"id":"141453","messageId":"4BE8F1DB.2060205@viscovery.net","threadId":"23773","inReplyTo":"buo632vj8px.fsf@dhlpc061.dev.necel.com","subject":"Re: git-gui disagrees with git status","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-05-11T05:57:47Z","receivedAt":"2010-05-11T05:57:47Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 5/11/2010 7:41, schrieb Miles Bader:\n> \"Shawn O. Pearce\" writes:\n>> Its more a feature.\n>>\n>> git-gui shows all untracked files, recursively expanding any\n>> directories which contain untracked files. git status collapses\n>> them up.\n> \n> Wait, why is this a feature, exactly...?\n> \n> It may be well known that git-gui works this way, but that doesn't make\n> it good behavior for the user.\n\nOh, it *is* good behavior. Otherwise, it would not be possible to stage a\nfile that resides in a currently untracked directory; you would have to\nfall back to 'git add' on the command line.\n\n-- Hannes\n"},{"id":"141457","messageId":"AANLkTinYJuyfqRr8C8QD_OTTvlyY_zmTqic_JoGy-WtE@mail.gmail.com","threadId":"23773","inReplyTo":"4BE8F1DB.2060205@viscovery.net","subject":"Re: git-gui disagrees with git status","fromName":"Miles Bader","fromEmail":"miles@gnu.org","sentAt":"2010-05-11T06:27:23Z","receivedAt":"2010-05-11T06:27:23Z","isPatch":false,"sender":{"key":"miles@gnu.org","avatar":"https://gravatar.com/avatar/01069b69593af7bff28e2f97afeb3644ae6fe2f5f56cb3a8cf34c5fb8c36efe5?d=mp&s=160"},"body":"On Tue, May 11, 2010 at 2:57 PM, Johannes Sixt wrote:\n>>> Its more a feature.\n>>>\n>>> git-gui shows all untracked files, recursively expanding any\n>>> directories which contain untracked files.  git status collapses\n>>> them up.\n>>\n>> Wait, why is this a feature, exactly...?\n>>\n>> It may be well known that git-gui works this way, but that doesn't make\n>> it good behavior for the user.\n>\n> Oh, it *is* good behavior. Otherwise, it would not be possible to stage a\n> file that resides in a currently untracked directory; you would have to\n> fall back to 'git add' on the command line.\n\nSince it's a GUI, though, it's allowed to use interaction -- so even\n_better_ behavior would be to only show unknown directories as single\nentries but allow the user to expand them interactively in the\n(probably rather rare) case that they want to add some file in an\nuntracked directory.\n\n-Miles\n\n-- \nDo not taunt Happy Fun Ball.\n"},{"id":"141456","messageId":"20100511062728.GA29654@progeny.tock","threadId":"23773","inReplyTo":"4BE8F1DB.2060205@viscovery.net","subject":"Re: git-gui disagrees with git status","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-05-11T06:27:28Z","receivedAt":"2010-05-11T06:27:28Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Johannes Sixt wrote:\n>> \"Shawn O. Pearce\" writes:\n\n>>> Its more a feature.\n>>>\n>>> git-gui shows all untracked files, recursively expanding any\n>>> directories which contain untracked files. git status collapses\n>>> them up.\n[...]\n> Oh, it *is* good behavior. Otherwise, it would not be possible to stage a\n> file that resides in a currently untracked directory; you would have to\n> fall back to 'git add' on the command line.\n\nI would say rather it is the best we have. Much better would be to\ndisplay untracked directories using a tree view (like gitk’s\ntreeview), starting out collapsed[1].\n\nJonathan\n\n[1] http://bugs.debian.org/572805\n"},{"id":"141480","messageId":"20100511142749.GA12896@progeny.tock","threadId":"23773","inReplyTo":"AANLkTilDmQBIq2xJCx_t5Qt15xXFK_3JRoiI6Y_Y8F-2@mail.gmail.com","subject":"Re: git-gui disagrees with git status","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-05-11T14:27:49Z","receivedAt":"2010-05-11T14:27:49Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"[repopulating cc list]\n\nBill Winspur wrote:\n> On Tue, May 11, 2010 at 8:04 AM, Jonathan Nieder wrote:\n>> Bill Winspur wrote:\n\n>>> And, to avoid reverting to the command line, implement a GUI add of\n>>> the currently\n>>> selected untracked file to move untracked to tracked && staged.\n>>\n>> Doesn’t double-clicking do that?\n[...]\n> Replying to all:\n> And, to avoid reverting to the command line, implement a GUI add of\n> the currently selected untracked file to move untracked to tracked && staged.\n\nSorry for the lack of clarity. Adding CCs again, though I am still not\nsure I understand what you are asking for. Maybe you were hoping for a\nbutton rather than having to click the file icons. Whatever it was, I\nencourage you to play around with git-gui/git-gui.sh, after the\ncreate_common_diff_popup {} function.\n\nJonathan\n"}]}