Please remerge git-gui.git into git.git

Please remerge git-gui.git into git.git

[Shawn O. Pearce]

Currently the tree between git-gui.git and git.git:git-gui does
not match, due to a6080a0a44d5ead84db3dabbbc80e82df838533d, aka the
"War on whitespace".

I really want the git-gui tree in git.git to always match the tree
of the 2nd parent of the merge commit, as that is how git-gui's
own GIT-VERSION-GEN script finds the git-gui commit DAG and gets
git-describe to produce a git-gui specific version number, rather
than the git.git version number.

Right now that script is barfing and coming up with "0.8.GITGUI",
which isn't a valid version number, and means nothing to everyone.

So new `maint` and `master` branches are in git-gui.git.

Thanks!  ;-)

-- 
Shawn.

Re: Please remerge git-gui.git into git.git

[Junio C Hamano]

Sorry for the screw-up.  Will do when able.  This week I am a
bit busy with day job and other stuff and expect to be slow on
git side.

Re: Please remerge git-gui.git into git.git

[Shawn O. Pearce]

Junio C Hamano <gitster@pobox.com> wrote:
> Sorry for the screw-up.  Will do when able.  This week I am a
> bit busy with day job and other stuff and expect to be slow on
> git side.

No big deal, just don't release a git.git without merging git-gui
again please.  But it already sounds like you won't be doing that.
;-)

One of the risks I took on when you started carrying git-gui in
git.git like this was patches stepping on git-gui by accident,
or people submitting patches to both git.git and git-gui.git in
the same patchfile (uh, Makefiles anyone?!?).

I'll be happy when the subproject support is mature enough that
git-gui can be unmerged from git.git, and we can instead just point
git.git at the git-gui project.  But I still think its a good idea to
distribute git-gui as part of the release tarball for core Git; users
have come to expect they can find a stable version of git-gui there,
much as they also expect to find a reasonably stable version of gitk.

-- 
Shawn.

Re: Please remerge git-gui.git into git.git

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> I'll be happy when the subproject support is mature enough that
> git-gui can be unmerged from git.git, and we can instead just point
> git.git at the git-gui project.  But I still think its a good idea to
> distribute git-gui as part of the release tarball for core Git; users
> have come to expect they can find a stable version of git-gui there,
> much as they also expect to find a reasonably stable version of gitk.

Of course.  

That would require git-tar-tree to learn --recurse-into-subprojects
option ;-)  Hint, hint...