summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into gsoc-pushfeatures/push_oldMichael Schubert2012-10-2435-390/+1085
|\
| * tests-clar/repo: remove unused variableMichael Schubert2012-10-241-2/+0
| |
| * Fix example in commentIgnacio Casal Quinteiro2012-10-241-1/+1
| |
| * Fix Makefile.embed to build src/sha1/*.cScott J. Goldman2012-10-231-1/+1
| |
| * Merge pull request #1012 from carlosmn/libcrypto-shaVicent Martí2012-10-233-2/+11
| |\ | | | | | | Use libcrypto's SHA-1 implementation when linking to it
| | * Use libcrypto's SHA-1 implementation when linking to itCarlos Martín Nieto2012-10-233-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcryto's SHA-1 implementation is measurably better than the one that ships with the library. If we link to it for HTTPS support already, use that implementation instead. Testing on a ~600MB of the linux repository, this reduces indexing time by 40% and removes the hashing from the top spot in the perf output.
| * | Merge pull request #923 from yorah/topic/config-storeRussell Belfer2012-10-2320-327/+893
| |\ \ | | | | | | | | Add git_config_level support when handling config files
| | * | Add config level support in the config APIyorah2012-10-2319-328/+869
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `struct git_config_entry`: a git_config_entry contains the key, the value, and the config file level from which a config element was found. Added `git_config_open_level`: build a single-level focused config object from a multi-level one. We are now storing `git_config_entry`s in the khash of the config_file
| | * | Fix adding variable to config file with no trailing newlineyorah2012-10-233-0/+25
| |/ / | | | | | | | | | This can occur after a manual modification of a config file.
| * | Merge pull request #963 from carlosmn/remote-save-autotagVicent Martí2012-10-222-0/+63
| |\ \ | | | | | | | | Save the autotag configuration for remotes
| | * | remote: don't auto-follow tags on an unamed remoteCarlos Martín Nieto2012-10-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An unnamed remote is used for commands like git fetch git://host/repo where no tags should be downloaded. Make this the default.
| | * | remote: set/unset the autotag setting on saveCarlos Martín Nieto2012-10-022-0/+58
| | | | | | | | | | | | | | | | | | | | Make the configuration option match the configured behavior when saving a remote.
| * | | Merge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEADVicent Martí2012-10-228-58/+108
| |\ \ \ | | | | | | | | | | More orphaned head love
| | * | | tests: more git_repository_head_detached() coveragenulltoken2012-10-221-0/+9
| | | | |
| | * | | reset: make git_reset() cope with an orphaned HEADnulltoken2012-10-222-6/+61
| | | | |
| | * | | test: extract make_head_orphaned() logicnulltoken2012-10-206-28/+26
| | | | |
| | * | | tests: leverage git_repository_detach_head()nulltoken2012-10-203-25/+13
| | | | |
| * | | | Merge pull request #1008 from nulltoken/fix/chunked_blobVicent Martí2012-10-221-1/+10
| |\ \ \ \ | | |/ / / | |/| | | blob: do not create temp files in the current path
| | * | | blob: do not create temp files in the current pathnulltoken2012-10-221-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - make sure temporary streamed blobs are created under the .git/objects folder and not in the current path, whatever it is. - do not make the name of the temp file depend on the hintpath.
* | | | push: cleanupMichael Schubert2012-10-241-17/+11
| | | |
* | | | push: deny non-fast-forward pushesMichael Schubert2012-10-242-4/+20
| | | |
* | | | http: keep asking for credentialsMichael Schubert2012-10-241-1/+7
| | | | | | | | | | | | | | | | Don't stop when given wrong credentials but keep asking.
* | | | push: add report-status capabilityMichael Schubert2012-10-245-10/+303
| | | |
* | | | Merge remote-tracking branch 'congyiwu/push_msvc' into gsoc-pushMichael Schubert2012-10-212-61/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/push.c src/transports/http.c
| * | | | Fixed WinHttp for push and fixed FormatMessage for WinHttp errors.Congyi Wu2012-10-182-57/+56
| | | | |
| * | | | build fixes for MSVCCongyi Wu2012-10-151-1/+3
| | | | |
| * | | | gsoc-push WIPMichael Schubert2012-10-119-13/+564
| | | | |
| * | | | http: add support for basic authenticationMichael Schubert2012-10-114-9/+144
| | | | |
| * | | | netops: strip username from hostMichael Schubert2012-10-111-1/+3
| | | | |
| * | | | object: add git_object_oid2typeMichael Schubert2012-10-113-0/+33
| | | | |
| * | | | Move GIT_OID_HEX_ZERO to common.hMichael Schubert2012-10-112-2/+2
| | | | |
* | | | | gsoc-push WIPMichael Schubert2012-10-219-13/+602
| | | | |
* | | | | http: add support for basic authenticationMichael Schubert2012-10-204-10/+144
| | | | |
* | | | | netops: strip username from hostMichael Schubert2012-10-201-1/+3
| | | | |
* | | | | object: add git_object_oid2typeMichael Schubert2012-10-203-0/+33
| | | | |
* | | | | Move GIT_OID_HEX_ZERO to common.hMichael Schubert2012-10-202-2/+2
| |/ / / |/| | |
* | | | Merge pull request #1001 from veeti/build-fixesVicent Martí2012-10-193-14/+9
|\ \ \ \ | | | | | | | | | | Changes to CMake for packaging
| * | | | Remove backwards compatibility for INSTALL_LIBVeeti Paananen2012-10-201-5/+0
| | | | |
| * | | | Let environment CFLAGS override the debug flagsVeeti Paananen2012-10-201-1/+1
| | | | |
| * | | | Use standard CMake variable names for installation pathsVeeti Paananen2012-10-203-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename INSTALL_INC and INSTALL_BIN to INCLUDE_INSTALL_DIR and BIN_INSTALL_DIR, which are more commonly used. This is also consistent with the variable for the library path which is already LIB_INSTALL_DIR.
* | | | | Merge pull request #1003 from arrbee/fix-test-core-envPhilip Kelley2012-10-192-69/+106
|\ \ \ \ \ | | | | | | | | | | | | Fix env variable tests with new Win32 path rules
| * | | | | Fix env variable tests with new Win32 path rulesRussell Belfer2012-10-192-69/+106
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Win32 global path search was not working with the environment variable tests. But when I fixed the test, the new codes use of getenv() was causing more failures (presumably because of caching on Windows ???). This fixes the global file lookup to always go directly to the Win32 API in a predictable way.
* | | | | repository: TypoVicent Marti2012-10-191-1/+1
| | | | |
* | | | | Merge pull request #1000 from nulltoken/error/GIT_EORPHANEDHEADVicent Martí2012-10-1911-25/+127
|\ \ \ \ \ | | | | | | | | | | | | Add error GIT_EORPHANEDHEAD
| * | | | | errors: deploy GIT_EORPHANEDHEAD usagenulltoken2012-10-199-20/+117
| | | | | |
| * | | | | errors: introduce GIT_EORPHANEDHEADnulltoken2012-10-191-0/+1
| | | | | |
| * | | | | branch: allow deletion of branch when HEAD's missingnulltoken2012-10-192-5/+10
| | | | | |
| * | | | | tests: Fix unused variable warningnulltoken2012-10-191-1/+0
| | | | | |
* | | | | | Merge pull request #1002 from tnm/patch-1Russell Belfer2012-10-191-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update README because vmg is @vmg.
| * | | | | Update README because vmg is @vmg.Ted Nyman2012-10-191-1/+1
|/ / / / /
View Lorry Controller Status