Jeff King 5ad6e2b495 diff: show usage for unknown builtin_diff_files() options
The git-diff command has many modes (comparing worktree to index, index
to HEAD, individual blobs, etc). As a result, it dispatches to many
helper functions and cannot completely parse its options until we're in
those helper functions.

Most of them, when seeing an unknown option, exit immediately by calling
usage(). But builtin_diff_files(), which is the default if no revision
or blob arguments are given, instead prints an error() and returns -1.

One obvious shortcoming here is that the user doesn't get to see the
usual usage message. But there's a much more important bug: the -1
return is fed to diff_result_code(), which is not ready to handle it.
By default, it passes the code along as an exit code. We try to avoid
negative exit codes because they get converted to unsigned values, but
it should at least consistently show up as non-zero (i.e., a failure).

But much worse is that when --exit-code is in effect, diff_result_code()
will _ignore_ the status passed in by the caller, and instead only
report on whether the diff found changes. It didn't, of course, because
we never ran the diff, and the program unexpectedly exits with success!

We can fix this bug by just calling usage(), like the other helpers do.
Another option would of course be to teach diff_result_code() to handle
this value. But as we'll see in the next few patches, it can be cleaned
up even further. Let's just fix this bug directly to start with.

Reported-by: Romain Chossart <romainchossart@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-08-21 15:33:24 -07:00
2023-06-03 10:35:13 +09:00
2023-08-21 09:34:58 -07:00
2023-07-06 11:54:48 -07:00
2023-04-24 12:47:33 -07:00
2023-07-06 11:54:48 -07:00
2023-07-25 12:05:24 -07:00
2023-04-24 12:47:33 -07:00
2023-07-06 11:54:48 -07:00
2023-04-10 08:46:40 -07:00
2023-07-06 11:54:48 -07:00
2023-07-06 11:54:46 -07:00
2023-07-25 12:05:24 -07:00
2023-06-28 14:06:39 -07:00
2023-04-24 22:31:32 -07:00
2023-04-17 21:15:56 +02:00
2023-08-21 09:34:58 -07:00
2023-06-28 14:06:39 -07:00
2023-07-24 16:11:23 -07:00
2023-07-24 16:11:23 -07:00
2023-04-17 21:15:44 +02:00
2023-06-28 14:06:39 -07:00
2023-04-17 21:15:49 +02:00
2023-06-28 14:06:39 -07:00
2023-06-21 13:39:54 -07:00
2023-07-06 11:54:48 -07:00
2023-07-06 11:54:46 -07:00
2023-06-28 14:06:39 -07:00
2023-07-18 14:47:30 -07:00
2023-06-12 13:49:36 -07:00
2023-07-25 12:05:24 -07:00
2023-06-13 12:29:46 -07:00
2023-08-04 10:52:30 -07:00
2023-07-25 12:05:24 -07:00
2023-07-25 12:05:24 -07:00
2023-06-28 14:06:39 -07:00
2022-12-01 18:38:07 +09:00
2022-08-30 14:16:49 -07:00
2023-03-17 14:03:09 -07:00
2023-06-28 14:06:39 -07:00
2023-06-28 14:06:39 -07:00
2022-12-13 21:09:40 +09:00
2022-12-13 21:09:40 +09:00
2023-04-04 14:28:27 -07:00
2023-05-17 10:11:41 -07:00

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks
Description
No description provided
Readme 699 MiB
Languages
C 50.5%
Shell 38.8%
Perl 4.4%
Tcl 3.2%
Python 0.8%
Other 2.1%