Re: [GIT PULL] Please pull mergetool.git

From: Junio C Hamano <junkio@cox.net>
Date: Mar 14, 2007, 09:45 UTC
Message-ID: <7vtzwob1lo.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <E1HRI5K-0008T9-9e@candygram.thunk.org>

"Theodore Ts'o" <tytso@mit.edu> writes:

Show 6 quoted lines

> In order to make this easier for me to send future features and
> cleanups, I've set up a repository on repo.or.cz.  So please pull from:
>
> 	git://repo.or.cz/git/mergetool.git
>
> The final patch that is the repository is attached.

Thanks, pulled.

There should be a checklist for adding a new user-level command.

I've been reluctant to write this up, partly because some people seem to be disturbed by seeing too many git-blah commands in their distro's /usr/bin/ and I've been avoiding introducing new commands (I even rejected "git-diff2", which I liked what it did), but that is a lame excuse.

So here it is.

 - An .gitignore entry to ignore the build product.

 - An Makefile entry to build and clean.

   - For scripts, add git-foo.sh to SCRIPT_SH (or
     git-foo.perl to SCRIPT_PERL).

   - For a new built-in 'git-foo' that is produced from
     builtin-foo.c, add builtin-foo.o to BUILTIN_OBJS.

   - For a new standalone 'git-foo' whose main is in foo.c, add
     git-foo$X to PROGRAMS.

   - (these are not limited to a new program) If you are adding
     a library object 'foo.o', add it to LIB_OBJS; add new
     headers to to LIB_H.  For the latter, sorry but our
     dependencies are a bit too eager to recompile.

 - Asciidoc manual in Documentation/git-foo.txt to be formatted
   to both HTML and man.

 - An entry in Documentation/cmd-list.perl (the list at the end
   of the script).  This is used to link the command from the
   main documentation git(7) and git.html.

The last one you missed but that is not a big deal. I'll add an extra commit to add one entry to classify this as an ancillary manipulator.