diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-12-02 20:40:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-04 14:35:08 -0800 |
| commit | afa75bc8aa1d453d18cc2486ba8fc53e7df92c4d (patch) | |
| tree | 24be3fac0056472faeecf1b1caf8be33b57306d6 | |
| parent | 2d324efad6a8f4808c5eec8fd299b79ab80a7ba3 (diff) | |
| download | git-afa75bc8aa1d453d18cc2486ba8fc53e7df92c4d.tar.gz git-afa75bc8aa1d453d18cc2486ba8fc53e7df92c4d.tar.xz | |
contrib: Make remotes2config.sh script more robust
The remotes2config.sh script replaced all 'unsafe' characters in repo
name with '.'; include '-' in the 'safe' characters set (the set is
probably even larger).
Script required also space after "URL:", "Push:" and "Pull:" in
remotes file. This for example made the following remote
URL: git://git.kernel.org/pub/scm/git/git.git
Pull: refs/heads/master:refs/heads/origin
Pull:+refs/heads/pu:refs/heads/pu
miss 'pu' branch (forced branch) in config file after conversion.
Allow for any number of whitespace after "URL:", "Push:", "Pull:".
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x[-rw-r--r--] | contrib/remotes2config.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh index 5838b3ab0..1cda19f66 100644..100755 --- a/contrib/remotes2config.sh +++ b/contrib/remotes2config.sh @@ -11,11 +11,11 @@ if [ -d "$GIT_DIR"/remotes ]; then { cd "$GIT_DIR"/remotes ls | while read f; do - name=$(printf "$f" | tr -c "A-Za-z0-9" ".") + name=$(printf "$f" | tr -c "A-Za-z0-9-" ".") sed -n \ - -e "s/^URL: \(.*\)$/remote.$name.url \1 ./p" \ - -e "s/^Pull: \(.*\)$/remote.$name.fetch \1 ^$ /p" \ - -e "s/^Push: \(.*\)$/remote.$name.push \1 ^$ /p" \ + -e "s/^URL:[ ]*\(.*\)$/remote.$name.url \1 ./p" \ + -e "s/^Pull:[ ]*\(.*\)$/remote.$name.fetch \1 ^$ /p" \ + -e "s/^Push:[ ]*\(.*\)$/remote.$name.push \1 ^$ /p" \ < "$f" done echo done |