Make chdir failures visible

raalkml · gitster · commit 7be77de266b5 · 2008-12-04T18:05:51.000-08:00
Signed-off-by: Alex Riesen &lt;raa.lkml@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git.c b/git.c
@@ -195,8 +195,8 @@ static int handle_alias(int *argcp, const char ***argv)
 		ret = 1;
 	}
 
-	if (subdir)
-		chdir(subdir);
+	if (subdir && chdir(subdir))
+		die("Cannot change to %s: %s", subdir, strerror(errno));
 
 	errno = saved_errno;
 
diff --git a/setup.c b/setup.c
@@ -470,7 +470,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
 			}
 			die("Not a git repository");
 		}
-		chdir("..");
+		if (chdir(".."))
+			die("Cannot change to %s/..: %s", cwd, strerror(errno));
 	}
 
 	inside_git_dir = 0;

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,8 @@ static int handle_alias(int argcp, const char **argv)`
`195`	`195`	`ret = 1;`
`196`	`196`	`}`
`197`	`197`
`198`		`- if (subdir)`
`199`		`- chdir(subdir);`
	`198`	`+ if (subdir && chdir(subdir))`
	`199`	`+ die("Cannot change to %s: %s", subdir, strerror(errno));`
`200`	`200`
`201`	`201`	`errno = saved_errno;`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,8 @@ const char setup_git_directory_gently(int nongit_ok)`
`470`	`470`	`}`
`471`	`471`	`die("Not a git repository");`
`472`	`472`	`}`
`473`		`- chdir("..");`
	`473`	`+ if (chdir(".."))`
	`474`	`+ die("Cannot change to %s/..: %s", cwd, strerror(errno));`
`474`	`475`	`}`
`475`	`476`
`476`	`477`	`inside_git_dir = 0;`