0081964428
Merge remote-tracking branch 'colinodell/fix-tag-ambiguity'
...
Conflicts:
src/Composer/Downloader/GitDownloader.php
tests/Composer/Test/Downloader/GitDownloaderTest.php
2015-05-31 12:52:27 +01:00
7077803aa4
Git Checkout Branch / File Differentiation
...
This fixes a minor inaccuracy issue when creating git checkout commands
for branches.
The git checkout command used within `GitDownloader::updateToCommit()`
does not use the "`--`" sequence to separate branch from file parameters.
This leads to an inaccuary as git tries as well the branch name as file
name. If the non-existent branch is actually the name of a file, the file
is checked out. If the non-existent branch is not the name of a file, an
error message is given:
> error: pathspec 'non-existent-branch' did not match any file(s) known to
git.
Both cases are not expected for the program flow in
`GitDownloader::updateToCommit()`.
The only thing that is expected is a non-existent branch to fail to
checkout - but with a different error message:
> // reference was not found (prints "fatal: reference is not a tree:
$ref")
This can be easily fixed by adding the missing separator when constructing
the command which is applied with this commit.
2015-03-19 12:50:06 +01:00
f304611014
Fix Git failures due to tag ambiguity (issue #3417 )
2014-11-14 10:31:52 -05:00
a309e1d89d
Fix tests and run it before the push url updater
2014-10-20 20:16:14 +01:00
77163f66fc
Add support for mirrors in composer repos
2014-05-07 19:34:35 +02:00
5d4900e79d
Add --no-checkout flag to avoid checking out the default branch first, fixes #2717
2014-02-18 13:28:46 +01:00
7148b22414
Add github-domains config value for GitHub Enterprise setups, fixes #728
...
Signed-off-by: Gennady Feldman <gena01@gmail.com>
2013-10-28 12:40:20 -04:00
7252078508
Attempt to fix travis build
2013-07-26 15:44:52 +02:00
771233a5a0
Make it clear what is going on when a vcs folder is missing, fixes #2108
2013-07-26 12:25:05 +02:00
0822683706
Fix tests
2013-06-28 20:42:06 +02:00
6b876958b9
Fix tests
2013-06-18 14:23:51 +02:00
42119dde6b
Use github protocols setting for push urls
2013-06-16 04:50:16 +02:00
c479a26d71
Add workaround for msysgit failing to handle symlinks on windows, fixes #1048 , fixes #1418
2013-06-08 17:51:30 +02:00
4cac2caf70
Make sure cd call allows switching drives on windows, fixes #1971
2013-06-08 16:41:34 +02:00
3fd883a489
Set cwd instead of using cd in GitDownloader, refs #1832
2013-04-28 11:12:09 +02:00
b641f9ea68
Fix tests
2012-11-22 20:03:26 +01:00
ed9fcc5074
Fix tests
2012-10-19 12:25:53 +02:00
f752b29fc6
Always make sure we are on the right branch
2012-10-17 17:15:49 +02:00
3068f29b4f
Checkout branch by name when the current reference matches the branch tip, fixes #1164
2012-10-17 10:49:54 +02:00
056dc5d690
Move config to all VcsDownloaders, enforce array for github-protocols
2012-09-08 00:45:25 +02:00
3b6bd761ec
Set protocols for github in composer config file
2012-09-07 15:08:34 +02:00
354b82bb8c
Fix git checkouts of custom branches, fixes #889
2012-07-15 21:31:29 +02:00
eb283b34e4
Revert "Fix git checkouts of custom branches, fixes #889"
...
This reverts commit cbf27bb422
2012-07-10 19:27:17 +02:00
cbf27bb422
Fix git checkouts of custom branches, fixes #889
2012-07-10 19:02:36 +02:00
73a865bf2a
Fix tests
2012-06-20 12:05:18 +02:00
4bbb168d44
Remove BC code
2012-06-19 23:06:40 +02:00
c8d110aa72
Imporoved exception message for GitDownloader (various protocols for github)
2012-05-18 14:41:57 +02:00
a9fe883827
Use https fallback for github private repos if ssh protocol fails and we can ask the user's password
2012-05-06 17:19:30 +02:00
ed8aa8322a
Do not prevent updates if untracked files are present
2012-04-27 11:23:34 +02:00
5ceae7fb1f
Fix tests
2012-04-18 18:46:26 +02:00
047fa0b553
Add a composer remote that is used by composer so it does not take over the origin one anymore
2012-04-17 20:02:19 +02:00
6f8031ac90
Fix error reporting for missing git process
2012-04-06 13:28:47 +02:00
6aaa523c0d
Fix tests
2012-04-05 23:03:02 +02:00
a3fa19a716
Avoid escaping too early to prevent issues
2012-04-04 17:13:57 +02:00
13a2bc6ff0
Revert "Fix push url hack"
...
This reverts commit 269537e466
2012-04-04 17:11:10 +02:00
269537e466
Fix push url hack
2012-04-04 16:57:18 +02:00
1cdae66f8f
Fix up git downloader and git driver commands
2012-04-04 09:09:27 +02:00
afa14124f3
Make sure we fetch origin with tags before checking out a new version
2012-04-03 19:50:25 +02:00
e763af7412
Set push url correctly for github clones
2012-03-11 21:01:41 +01:00
5696b44a4f
Fix tests
2012-03-11 15:56:47 +01:00
ada9c20db1
Update Git/Hg downloaders tests, making sure they never use a live filesystem instance
2012-03-08 00:11:52 +01:00
025f6066ff
fix file permissions
2012-02-21 00:40:43 +01:00
0e5a4e07ba
add tests to make sure a runtime exception is thrown if return code from git command line call is not 0
2012-02-21 00:12:39 +01:00
895d901bf9
better error handling when git command runs into a failure, fixes #340
2012-02-21 00:02:34 +01:00
230e145053
Fix downloader tests on windows and mock Filesystem properly
2012-02-18 17:00:07 +01:00
19878c2dc1
Fixed tests after update and merge of changes from upstream/master
2012-01-24 18:44:55 +01:00
de7f666118
Added and extended some unit tests
2012-01-24 18:44:54 +01:00
Jordi Boggiano