{"thread":{"id":"8565","subject":"Please remerge git-gui.git into git.git","startedAt":"2007-06-11T23:10:13Z","lastAt":"2007-06-12T05:25:13Z","messageCount":4,"participants":["Shawn O. Pearce","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"44771","messageId":"20070611231013.GM6073@spearce.org","threadId":"8565","inReplyTo":null,"subject":"Please remerge git-gui.git into git.git","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-06-11T23:10:13Z","receivedAt":"2007-06-11T23:10:13Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Currently the tree between git-gui.git and git.git:git-gui does\nnot match, due to a6080a0a44d5ead84db3dabbbc80e82df838533d, aka the\n\"War on whitespace\".\n\nI really want the git-gui tree in git.git to always match the tree\nof the 2nd parent of the merge commit, as that is how git-gui's\nown GIT-VERSION-GEN script finds the git-gui commit DAG and gets\ngit-describe to produce a git-gui specific version number, rather\nthan the git.git version number.\n\nRight now that script is barfing and coming up with \"0.8.GITGUI\",\nwhich isn't a valid version number, and means nothing to everyone.\n\nSo new `maint` and `master` branches are in git-gui.git.\n\nThanks!  ;-)\n\n-- \nShawn.\n"},{"id":"44776","messageId":"7vd502niu3.fsf@assigned-by-dhcp.pobox.com","threadId":"8565","inReplyTo":"20070611231013.GM6073@spearce.org","subject":"Re: Please remerge git-gui.git into git.git","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-06-11T23:59:32Z","receivedAt":"2007-06-11T23:59:32Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sorry for the screw-up.  Will do when able.  This week I am a\nbit busy with day job and other stuff and expect to be slow on\ngit side.\n"},{"id":"44783","messageId":"20070612022747.GP6073@spearce.org","threadId":"8565","inReplyTo":"7vd502niu3.fsf@assigned-by-dhcp.pobox.com","subject":"Re: Please remerge git-gui.git into git.git","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-06-12T02:27:47Z","receivedAt":"2007-06-12T02:27:47Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n> Sorry for the screw-up.  Will do when able.  This week I am a\n> bit busy with day job and other stuff and expect to be slow on\n> git side.\n\nNo big deal, just don't release a git.git without merging git-gui\nagain please.  But it already sounds like you won't be doing that.\n;-)\n\nOne of the risks I took on when you started carrying git-gui in\ngit.git like this was patches stepping on git-gui by accident,\nor people submitting patches to both git.git and git-gui.git in\nthe same patchfile (uh, Makefiles anyone?!?).\n\nI'll be happy when the subproject support is mature enough that\ngit-gui can be unmerged from git.git, and we can instead just point\ngit.git at the git-gui project.  But I still think its a good idea to\ndistribute git-gui as part of the release tarball for core Git; users\nhave come to expect they can find a stable version of git-gui there,\nmuch as they also expect to find a reasonably stable version of gitk.\n\n-- \nShawn.\n"},{"id":"44792","messageId":"7vk5u9n3ra.fsf@assigned-by-dhcp.pobox.com","threadId":"8565","inReplyTo":"20070612022747.GP6073@spearce.org","subject":"Re: Please remerge git-gui.git into git.git","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-06-12T05:25:13Z","receivedAt":"2007-06-12T05:25:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" <spearce@spearce.org> writes:\n\n> I'll be happy when the subproject support is mature enough that\n> git-gui can be unmerged from git.git, and we can instead just point\n> git.git at the git-gui project.  But I still think its a good idea to\n> distribute git-gui as part of the release tarball for core Git; users\n> have come to expect they can find a stable version of git-gui there,\n> much as they also expect to find a reasonably stable version of gitk.\n\nOf course.  \n\nThat would require git-tar-tree to learn --recurse-into-subprojects\noption ;-)  Hint, hint...\n"}]}