Merge branch 'develop-0.8' of https://git.catseye.tc/shelf into develop-0.8
Chris Pressey
8 months ago
| 136 | 136 |
name and, if a corresponding directory exists in the current directory,
|
| 137 | 137 |
update the repository in that corresponding directory using `git pull`,
|
| 138 | 138 |
otherwise attempt to `git clone` the repository to that corresponding
|
| 139 | |
directory in the current directory. In both cases a `git fetch` will
|
| 140 | |
be executed as well.
|
|
139 |
directory in the current directory. In both cases a `git fetch --tags`
|
|
140 |
will be executed as well.
|
| 141 | 141 |
|
| 142 | 142 |
The current directory is assumed to be on `SHELF_PATH`.
|
| 143 | 143 |
|
|
| 205 | 205 |
|
| 206 | 206 |
* `shelf_populate_from_git` now pulls using the specified origin
|
| 207 | 207 |
(rather than the one set in the repository), and executes a
|
| 208 | |
`git fetch` after cloning (and/or before pulling.)
|
|
208 |
`git fetch --tags` after cloning (and/or before pulling.)
|
|
209 |
* `shelf_mirror_from_git` was ignoring the supplied prefix when
|
|
210 |
updating repositories that already exist in the shelf. It now
|
|
211 |
executes `git remote set-url origin` with an URL constructed
|
|
212 |
from the supplied prefix before updating these repositories.
|
| 209 | 213 |
|
| 210 | 214 |
#### 0.7
|
| 211 | 215 |
|
| 438 | 438 |
fi
|
| 439 | 439 |
|
| 440 | 440 |
if [ -d $dest ]; then
|
| 441 | |
(echo -n "[FETCH $url]: " && cd $dest && git fetch $url)
|
|
441 |
(echo -n "[FETCH $url]: " && cd $dest && git fetch --tags $url)
|
| 442 | 442 |
if [ $? -ne 0 ]; then
|
| 443 | 443 |
failures="$failures $dest"
|
| 444 | 444 |
fi
|
|
| 480 | 480 |
if [ ! -d $dest ]; then
|
| 481 | 481 |
git clone --mirror $url $dest
|
| 482 | 482 |
fi
|
| 483 | |
(echo -n "$dest: " && cd $dest && git remote update)
|
|
483 |
(echo -n "$dest: " && cd $dest && git remote set-url origin $url && git remote update)
|
| 484 | 484 |
done
|
| 485 | 485 |
}
|
| 486 | 486 |
|