From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: [PATCH] Allow git-diff exit with codes similar to diff(1)
Date: Wed, 14 Mar 2007 18:12:49 +0100 [thread overview]
Message-ID: <81b0412b0703141012n6fc252ecsd5ed3bc7283cf10f@mail.gmail.com> (raw)
In-Reply-To: <7vwt1jaiiu.fsf@assigned-by-dhcp.cox.net>
[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]
This introduces a new command-line option: --exit-code. The diff
programs will return 1 for differences, return 0 for equality, and
something else for errors.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Updated patch:
- implemented exit_with_status+has_changes
- fixed test WRT intermediate failures
On 3/14/07, Junio C Hamano <junkio@cox.net> wrote:
> "Alex Riesen" <raa.lkml@gmail.com> writes:
>
> >> echo ... &&
> >> git add . &&
> >> {
> >> git diff-index ...; test $? != 0
> >> }
> >
> > Confused. What's wrong with test_expect_failure which
> > does not need any of the both ugly constructions?
> > Hmm... Do you mean: "we expect successful
> > operation with exit code 1"?
>
> No. Think what happens if you broke "git add".
>
Right. Figured that out myself while changing the test.
Removed all test_expect_failure anyway: not that I
actually expect a failure, just exit code. Made the test
stricter, too: it must be either 0 or 1. Anything else
considered test failure.
Documentation/diff-options.txt | 5 +++
builtin-diff-files.c | 4 ++-
builtin-diff-index.c | 4 ++-
builtin-diff-tree.c | 5 ++-
builtin-diff.c | 19 ++++++----
diff-lib.c | 5 ++-
diff.c | 6 +++
diff.h | 5 ++-
t/t4017-diff-retval.sh | 79 ++++++++++++++++++++++++++++++++++++++++
9 files changed, 118 insertions(+), 14 deletions(-)
create mode 100755 t/t4017-diff-retval.sh
[-- Attachment #2: 0001-Allow-git-diff-exit-with-codes-similar-to-diff-1.patch --]
[-- Type: application/xxxxx, Size: 9982 bytes --]
next prev parent reply other threads:[~2007-03-14 17:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-14 0:17 [PATCH] Allow git-diff exit with codes similar to diff(1) Alex Riesen
2007-03-14 1:03 ` Johannes Schindelin
2007-03-14 1:20 ` Linus Torvalds
2007-03-14 1:23 ` Junio C Hamano
2007-03-14 1:13 ` Linus Torvalds
2007-03-14 1:18 ` Johannes Schindelin
2007-03-14 1:34 ` Linus Torvalds
2007-03-14 1:38 ` Johannes Schindelin
2007-03-14 8:37 ` Alex Riesen
2007-03-14 12:05 ` Johannes Schindelin
2007-03-14 12:26 ` Alex Riesen
2007-03-14 12:31 ` Johannes Schindelin
2007-03-15 12:49 ` Simon 'corecode' Schubert
2007-03-15 13:56 ` Alex Riesen
2007-03-14 1:31 ` Junio C Hamano
2007-03-14 8:19 ` Alex Riesen
2007-03-14 8:58 ` Junio C Hamano
2007-03-14 9:06 ` Junio C Hamano
2007-03-14 9:07 ` Alex Riesen
2007-03-14 9:36 ` Junio C Hamano
2007-03-14 9:46 ` Alex Riesen
2007-03-14 4:56 ` Junio C Hamano
2007-03-14 8:28 ` Alex Riesen
2007-03-14 9:04 ` Junio C Hamano
2007-03-14 14:01 ` Alex Riesen
2007-03-14 16:14 ` Junio C Hamano
2007-03-14 16:33 ` Alex Riesen
2007-03-14 16:37 ` Junio C Hamano
2007-03-14 17:12 ` Alex Riesen [this message]
2007-03-14 17:20 ` Junio C Hamano
2007-03-14 17:06 ` Junio C Hamano
2007-03-14 17:15 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b0703141012n6fc252ecsd5ed3bc7283cf10f@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).