[PATCH v2 1/2] git: make "git -C '' <cmd>" not to barf

[PATCH v2 1/2] git: make "git -C '' <cmd>" not to barf

[Karthik Nayak]

It now acts like "cd ''" and does not barf and treats
it as a no-op, this is usefull if a caller function
does not want to change directory and hence gives no
path value, which would have generally caused git to
output an undesired error message.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 git.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/git.c b/git.c
index 8c7ee9c..ea92a64 100644
--- a/git.c
+++ b/git.c
@@ -204,10 +204,14 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				fprintf(stderr, "No directory given for -C.\n" );
 				usage(git_usage_string);
 			}
-			if (chdir((*argv)[1]))
-				die_errno("Cannot change to '%s'", (*argv)[1]);
-			if (envchanged)
-				*envchanged = 1;
+			if (*(*argv)[1] == 0)
+				; /* Ignore "" as a directory */
+			else {
+				if (chdir((*argv)[1]))
+					die_errno("Cannot change to '%s'", (*argv)[1]);
+				if (envchanged)
+					*envchanged = 1;
+			}
 			(*argv)++;
 			(*argc)--;
 		} else {
-- 
2.3.1.167.g7f4ba4b.dirty

[PATCH v2 2/2] git-C: Add test to check "git -C ''"

[Karthik Nayak]

Add a test to check whether "git -C ''" works
without giving an error. This is achieved by
adding a commit and checking the log using
"git -C ''" and comparing the log message with
the commit message.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 t/t0056-git-C.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh
index 99c0377..1cefd4a 100755
--- a/t/t0056-git-C.sh
+++ b/t/t0056-git-C.sh
@@ -1,3 +1,4 @@
+
 #!/bin/sh
 
 test_description='"-C <path>" option and its effects on other path-related options'
@@ -81,4 +82,13 @@ test_expect_success 'Relative followed by fullpath: "-C ./here -C /there" is equ
 	test_cmp expected actual
 '
 
+test_expect_success 'Should not barf when "git -C "" cmd" is used' '
+	echo 1 > a.txt &&
+	msg="initial a.txt" &&
+	(git add a.txt && git commit -m "$msg") &&
+	echo "$msg" >expected &&
+	git -C "" log --format=%s >actual &&
+	test_cmp expected actual
+'
+
 test_done
-- 
2.3.1.167.g7f4ba4b.dirty

[PATCH v2 2/2] git-C: Add test to check "git -C ''"

[Karthik Nayak]

Add a test to check whether "git -C ''" works
without giving an error. This is achieved by
adding a commit and checking the log using
"git -C ''" and comparing the log message with
the commit message.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 t/t0056-git-C.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh
index 99c0377..1cefd4a 100755
--- a/t/t0056-git-C.sh
+++ b/t/t0056-git-C.sh
@@ -1,3 +1,4 @@
+
 #!/bin/sh
 
 test_description='"-C <path>" option and its effects on other path-related options'
@@ -81,4 +82,13 @@ test_expect_success 'Relative followed by fullpath: "-C ./here -C /there" is equ
 	test_cmp expected actual
 '
 
+test_expect_success 'Should not barf when "git -C "" cmd" is used' '
+	echo 1 > a.txt &&
+	msg="initial a.txt" &&
+	(git add a.txt && git commit -m "$msg") &&
+	echo "$msg" >expected &&
+	git -C "" log --format=%s >actual &&
+	test_cmp expected actual
+'
+
 test_done
-- 
2.3.1.167.g7f4ba4b.dirty

Re: [PATCH v2 2/2] git-C: Add test to check "git -C ''"

[karthik nayak]

On 03/05/2015 04:27 PM, Karthik Nayak wrote:
> Add a test to check whether "git -C ''" works
> without giving an error. This is achieved by
> adding a commit and checking the log using
> "git -C ''" and comparing the log message with
> the commit message.
>
> Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
> ---
>   t/t0056-git-C.sh | 10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh
> index 99c0377..1cefd4a 100755
> --- a/t/t0056-git-C.sh
> +++ b/t/t0056-git-C.sh
> @@ -1,3 +1,4 @@
> +
>   #!/bin/sh
>
>   test_description='"-C <path>" option and its effects on other path-related options'
> @@ -81,4 +82,13 @@ test_expect_success 'Relative followed by fullpath: "-C ./here -C /there" is equ
>       test_cmp expected actual
>   '
>
> +test_expect_success 'Should not barf when "git -C "" cmd" is used' '
> +    echo 1 > a.txt &&
> +    msg="initial a.txt" &&
> +    (git add a.txt && git commit -m "$msg") &&
> +    echo "$msg" >expected &&
> +    git -C "" log --format=%s >actual &&
> +    test_cmp expected actual
> +'
> +
>   test_done
>
Ignore This, Didnt connect it to the first patch!

Re: [PATCH v2 2/2] git-C: Add test to check "git -C ''"

[Junio C Hamano]

Karthik Nayak <karthik.188@gmail.com> writes:

> Add a test to check whether "git -C ''" works without giving an
> error. This is achieved by adding a commit and checking the log
> using "git -C ''" and comparing the log message with the commit
> message.

Why choose something complex like commit and log, though?

Wouldn't something like this match the series of current tests
better?  Also I think a small change with a small test like these
should be in a single patch, not two separate ones.

Thanks.

 t/t0056-git-C.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh
index 99c0377..551d806 100755
--- a/t/t0056-git-C.sh
+++ b/t/t0056-git-C.sh
@@ -14,6 +14,16 @@ test_expect_success '"git -C <path>" runs git from the directory <path>' '
 	test_cmp expected actual
 '
 
+test_expect_success '"git -C <path>" with an empty <path> is a no-op' '
+	(
+		mkdir -p dir1/subdir &&
+		cd dir1/subdir &&
+		git -C "" rev-parse --show-prefix >actual &&
+		echo subdir/ >expect
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"' '
 	test_create_repo dir1/dir2 &&
 	echo 1 >dir1/dir2/b.txt &&