diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2007-02-09 12:17:57 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 00:57:12 -0800 |
| commit | 4e9f6cc78e5d955bd0faffe76ae9aea6590189f1 (patch) | |
| tree | d3ea0c81512d050b69ae9b30390ba6e3a96d09a0 /git-merge.sh | |
| parent | git-svn: enable follow-parent functionality by default (diff) | |
| download | tgif-4e9f6cc78e5d955bd0faffe76ae9aea6590189f1.tar.xz | |
git-svn: fix buggy regular expression usage in several places
I incorrectly used $path/? and $path/* to strip off leading
directories, but places where $path = 'branches/0.17' would
incorrectly strip changes to 'branches/0.17.1' as well.
For globs, we require that our '*' is its own path component
(surrounded by '/' or nothing). Enforce this when --prefix= is
passed to us, too.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions