[PATCH] Escape Git's exec path in contrib/rerere-train.sh script

Daniel Knittl-Frank· Nov 8, 2015, 11:27 UTC · lore

Whitespace can cause the source command to fail. This is usually not a problem on Unix systems, but on Windows Git is likely to be installed under "C:/Program Files/", thus rendering the script broken.

Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
---
 contrib/rerere-train.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/rerere-train.sh +1 −1

diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 36b6fee..52ad9e4 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -7,7 +7,7 @@ USAGE="$me rev-list-args"
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
-. $(git --exec-path)/git-sh-setup
+. "$(git --exec-path)/git-sh-setup"
 require_work_tree
 cd_to_toplevel

-- 
2.6.0.rc0.134.g48a2a2a

Jeff King· Nov 20, 2015, 11:44 UTC · re: Daniel Knittl-Frank · lore

Re: [PATCH] Escape Git's exec path in contrib/rerere-train.sh script

On Sun, Nov 08, 2015 at 12:27:55PM +0100, Daniel Knittl-Frank wrote:

Show 19 quoted lines

> Whitespace can cause the source command to fail. This is usually not a
> problem on Unix systems, but on Windows Git is likely to be installed
> under "C:/Program Files/", thus rendering the script broken.
> 
> Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
> ---
>  contrib/rerere-train.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
> index 36b6fee..52ad9e4 100755
> --- a/contrib/rerere-train.sh
> +++ b/contrib/rerere-train.sh
> @@ -7,7 +7,7 @@ USAGE="$me rev-list-args"
>  
>  SUBDIRECTORY_OK=Yes
>  OPTIONS_SPEC=
> -. $(git --exec-path)/git-sh-setup
> +. "$(git --exec-path)/git-sh-setup"

Thanks, this makes sense.

The "normal" scripts just use ". git-sh-setup", but they have the benefit of being run under the "git" wrapper, so the exec-path is already in their PATH. This one is meant to be used directly, so it needs this.

-Peff

patchEscape Git's exec path in contrib/rerere-train.sh script