* [PATCH v2 1/2] git: make "git -C '' <cmd>" not to barf
@ 2015-03-05 10:56 Karthik Nayak
2015-03-05 11:03 ` [PATCH v2 2/2] git-C: Add test to check "git -C ''" Karthik Nayak
0 siblings, 1 reply; 2+ messages in thread
From: Karthik Nayak @ 2015-03-05 10:56 UTC (permalink / raw)
To: git; +Cc: 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2 2/2] git-C: Add test to check "git -C ''"
2015-03-05 10:56 [PATCH v2 1/2] git: make "git -C '' <cmd>" not to barf Karthik Nayak
@ 2015-03-05 11:03 ` Karthik Nayak
0 siblings, 0 replies; 2+ messages in thread
From: Karthik Nayak @ 2015-03-05 11:03 UTC (permalink / raw)
To: git; +Cc: 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-05 11:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-05 10:56 [PATCH v2 1/2] git: make "git -C '' <cmd>" not to barf Karthik Nayak
2015-03-05 11:03 ` [PATCH v2 2/2] git-C: Add test to check "git -C ''" Karthik Nayak
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).