threads / patch / 27895

patch, 2 partsEnsure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

Subject: [PATCH 0/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

## tl;dr

4 messages between Jul 23, 2011 and Jul 23, 2011. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Jon Seymour· Jul 23, 2011, 12:27 UTC · lore

While working with a damaged repository, I noticed that git ls-tree was reporting an error even though it set a zero exit code.

This patch uses the return code from read_tree_recursive instead.

Jon Seymour (2):
  Add a test to check that git ls-tree sets non-zero exit code on
    error.
  Ensure git ls-tree exits with a non-zero exit code if
    read_tree_recursive fails.

 builtin/ls-tree.c               |    6 +++---
 t/t3103-ls-tree-missing-tree.sh |   19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100755 t/t3103-ls-tree-missing-tree.sh

-- 
1.7.6.347.g6a5a9c

Jon Seymour· Jul 23, 2011, 12:27 UTC · re: Jon Seymour · lore

[PATCH 1/2] Add a test to check that git ls-tree sets non-zero exit code on error.

Fails at this commit, fixed by subsequent commit.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 t/t3103-ls-tree-missing-tree.sh |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100755 t/t3103-ls-tree-missing-tree.sh

Show changes to t/t3103-ls-tree-missing-tree.sh +19 −0

diff --git a/t/t3103-ls-tree-missing-tree.sh b/t/t3103-ls-tree-missing-tree.sh
new file mode 100755
index 0000000..365ac07
--- /dev/null
+++ b/t/t3103-ls-tree-missing-tree.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test_description='ls-tree exits with non-zero status if it also reports an error'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	mkdir a &&
+	touch a/one &&
+	git add a/one &&
+	git commit -m test
+'
+
+test_expect_success 'ls-tree fails with non-zero exit code on broken tree' '
+	rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 &&
+	test_must_fail git ls-tree -r HEAD
+'
+
+test_done

-- 
1.7.6.347.g6a5a9c

Jens Lehmann· Jul 23, 2011, 18:01 UTC · re: Jon Seymour · lore

Re: [PATCH 1/2] Add a test to check that git ls-tree sets non-zero exit code on error.

Am 23.07.2011 14:27, schrieb Jon Seymour:

> Fails at this commit, fixed by subsequent commit.

Maybe use "test_expect_failure" here and change that to "test_expect_success" in the next commit?

Show 31 quoted lines

> Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
> ---
>  t/t3103-ls-tree-missing-tree.sh |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
>  create mode 100755 t/t3103-ls-tree-missing-tree.sh
> 
> diff --git a/t/t3103-ls-tree-missing-tree.sh b/t/t3103-ls-tree-missing-tree.sh
> new file mode 100755
> index 0000000..365ac07
> --- /dev/null
> +++ b/t/t3103-ls-tree-missing-tree.sh
> @@ -0,0 +1,19 @@
> +#!/bin/sh
> +
> +test_description='ls-tree exits with non-zero status if it also reports an error'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'setup' '
> +	mkdir a &&
> +	touch a/one &&
> +	git add a/one &&
> +	git commit -m test
> +'
> +
> +test_expect_success 'ls-tree fails with non-zero exit code on broken tree' '
> +	rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 &&
> +	test_must_fail git ls-tree -r HEAD
> +'
> +
> +test_done

Jon Seymour· Jul 23, 2011, 12:27 UTC · re: Jon Seymour · lore

[PATCH 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

In the case of a corrupt repository, git ls-tree may report an error but presently it exits with a code of 0.

This change uses the return code of read_tree_recursive instead.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 builtin/ls-tree.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Show changes to builtin/ls-tree.c +3 −3

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index f08c5b0..6d6c992 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -120,7 +120,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
 {
 	unsigned char sha1[20];
 	struct tree *tree;
-	int i, full_tree = 0;
+	int i, full_tree = 0, err;
 	const struct option ls_tree_options[] = {
 		OPT_BIT('d', NULL, &ls_options, "only show trees",
 			LS_TREE_ONLY),
@@ -173,7 +173,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
 	tree = parse_tree_indirect(sha1);
 	if (!tree)
 		die("not a tree object");
-	read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
+	err = read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
 
-	return 0;
+	return err;
 }

-- 
1.7.6.347.g6a5a9c