diff options
| author | Tim Henigan <tim.henigan@gmail.com> | 2012-03-22 15:52:18 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-23 11:46:26 -0700 |
| commit | 283607694c1248a8e1ff4cda48aa5d1eb1287733 (patch) | |
| tree | 750855c35b84cbc13288c03fa43ff9ec7abd14cf | |
| parent | 850896042a42c1c16912a3981ca844e2cbcd14d4 (diff) | |
| download | git-283607694c1248a8e1ff4cda48aa5d1eb1287733.tar.gz | |
difftool: exit(0) when usage is printed
Prior to this commit, the script exited with an error whenever the
usage string was printed, regardless of the reason it was done. In
cases where usage was printed due to a user request (e.g. '-h'
option), the script should exit without error (exit 0).
This commit adds an argument to the usage function that allows the
exit code to be specified when the function is called.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-difftool.perl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index 93e84e8d3d..4555cd8b1c 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -20,6 +20,7 @@ use Git; sub usage { + my $exitcode = shift; print << 'USAGE'; usage: git difftool [-t|--tool=<tool>] [-x|--extcmd=<cmd>] @@ -27,7 +28,7 @@ usage: git difftool [-t|--tool=<tool>] [--prompt] [-y|--no-prompt] ['git diff' options] USAGE - exit 1; + exit($exitcode); } sub setup_environment @@ -58,14 +59,14 @@ GetOptions('g|gui!' => \$gui, 'x|extcmd:s' => \$extcmd); if (defined($help)) { - usage(); + usage(0); } if (defined($difftool_cmd)) { if (length($difftool_cmd) > 0) { $ENV{GIT_DIFF_TOOL} = $difftool_cmd; } else { print "No <tool> given for --tool=<tool>\n"; - usage(); + usage(1); } } if (defined($extcmd)) { @@ -73,7 +74,7 @@ if (defined($extcmd)) { $ENV{GIT_DIFFTOOL_EXTCMD} = $extcmd; } else { print "No <cmd> given for --extcmd=<cmd>\n"; - usage(); + usage(1); } } if ($gui) { |