summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into gsoc-pushfeatures/push_oldMichael Schubert2012-10-2411-244/+497
|\
| * Merge pull request #1012 from carlosmn/libcrypto-shaVicent Martí2012-10-232-0/+7
| |\ | | | | | | Use libcrypto's SHA-1 implementation when linking to it
| | * Use libcrypto's SHA-1 implementation when linking to itCarlos Martín Nieto2012-10-232-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Add config level support in the config APIyorah2012-10-237-237/+397
| | | | | | | | | | | | | | | | | | | | | 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-231-0/+4
| | | | | | | | | | | | This can occur after a manual modification of a config file.
| * | Merge pull request #963 from carlosmn/remote-save-autotagVicent Martí2012-10-221-0/+39
| |\ \ | | | | | | | | 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-021-0/+34
| | | | | | | | | | | | | | | | | | | | Make the configuration option match the configured behavior when saving a remote.
| * | | Merge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEADVicent Martí2012-10-221-6/+40
| |\ \ \ | | | | | | | | | | More orphaned head love
| | * | | reset: make git_reset() cope with an orphaned HEADnulltoken2012-10-221-6/+40
| | | | |
| * | | | 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-241-4/+19
| | | |
* | | | 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-244-10/+282
| | | |
* | | | 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-115-13/+497
| | | | |
| * | | | http: add support for basic authenticationMichael Schubert2012-10-113-9/+135
| | | | |
| * | | | netops: strip username from hostMichael Schubert2012-10-111-1/+3
| | | | |
| * | | | object: add git_object_oid2typeMichael Schubert2012-10-111-0/+13
| | | | |
| * | | | Move GIT_OID_HEX_ZERO to common.hMichael Schubert2012-10-112-2/+2
| | | | |
* | | | | gsoc-push WIPMichael Schubert2012-10-215-13/+535
| | | | |
* | | | | http: add support for basic authenticationMichael Schubert2012-10-203-10/+135
| | | | |
* | | | | netops: strip username from hostMichael Schubert2012-10-201-1/+3
| | | | |
* | | | | object: add git_object_oid2typeMichael Schubert2012-10-201-0/+13
| | | | |
* | | | | Move GIT_OID_HEX_ZERO to common.hMichael Schubert2012-10-202-2/+2
| |/ / / |/| | |
* | | | Merge pull request #1003 from arrbee/fix-test-core-envPhilip Kelley2012-10-191-30/+25
|\ \ \ \ | | | | | | | | | | Fix env variable tests with new Win32 path rules
| * | | | Fix env variable tests with new Win32 path rulesRussell Belfer2012-10-191-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | errors: deploy GIT_EORPHANEDHEAD usagenulltoken2012-10-193-12/+22
| | | | |
* | | | | branch: allow deletion of branch when HEAD's missingnulltoken2012-10-191-1/+7
|/ / / /
* | | | diff: workdir diffing in a bare repo returns EBAREREPOnulltoken2012-10-181-6/+10
| | | |
* | | | revparse: properly handle refnames containing a @nulltoken2012-10-181-10/+14
| | | | | | | | | | | | | | | | Fix #994
* | | | fetch: declare variables at the top of the blockCarlos Martín Nieto2012-10-181-1/+2
| | | |
* | | | remote: support fetch cancelationCarlos Martín Nieto2012-10-183-5/+35
| |_|/ |/| | | | | | | | | | | | | | Introduce git_remote_stop() which sets a variable that is checked by the fetch process in a few key places. If this is variable is set, the fetch is aborted.
* | | Merge pull request #968 from arrbee/diff-support-typechangeRussell Belfer2012-10-1713-161/+365
|\ \ \ | | | | | | | | Support TYPECHANGE records in status and adjust checkout accordingly
| * | | Fix minor bugsRussell Belfer2012-10-172-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixed no-submodule speedup of new checkout code. Fixed missing final update to progress (which may go away, I realize). Fixed unused structure in header and incorrect comment.
| * | | Skip submodule checkout pass if no submodulesRussell Belfer2012-10-171-2/+7
| | | | | | | | | | | | | | | | | | | | Skip the third pass of checkout (where submodules are checked out) if the earlier passes found no submodules to be checked out.
| * | | Add complex checkout test and then fix checkoutRussell Belfer2012-10-0912-138/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc.
| * | | Cleanup TYPECHANGE supportRussell Belfer2012-10-091-37/+40
| | | | | | | | | | | | | | | | | | | | | | | | This is just some cleanup code, rearranging some of the checkout code where TYPECHANGE support was added and adding some comments to the diff header regarding the constants.
| * | | Fix checkout to know about TYPECHANGE diffsRussell Belfer2012-10-091-1/+3
| | | |
| * | | Introduce status/diff TYPECHANGE flagsRussell Belfer2012-10-092-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I wrote the diff code, I based it on core git's diff output which tends to split a type change into an add and a delete. But core git's status has the notion of a T (typechange) flag for a file. This introduces that into our status APIs and modifies the diff code so it can be forced to not split type changes.
| * | | Improve error propogation in checkoutRussell Belfer2012-10-091-24/+22
| | | |
* | | | Merge pull request #972 from PaulThompson/separate_strarrayBen Straub2012-10-171-0/+1
|\ \ \ \ | | | | | | | | | | Separated git_strarray from common.h. Added doxy comments.
| * | | | Separated git_strarray from common.h. Added doxy comments.Paul Thompson2012-10-111-0/+1
| | |/ / | |/| |
* | | | Incremental improvements to pack-objects logicPhilip Kelley2012-10-173-92/+95
| | | | | | | | | | | | | | | | Incorporate feedback for incr. improvements to pack-objects
* | | | Merge pull request #987 from pwkelley/pthread_condVicent Martí2012-10-162-0/+72
|\ \ \ \ | | | | | | | | | | Support pthread_cond_* on Win32
| * | | | Support pthread_cond_* on Win32Philip Kelley2012-10-162-0/+72
| | | | |
* | | | | test: Don't be so picky with failed lookupsVicent Marti2012-10-161-3/+3
|/ / / / | | | | | | | | | | | | Not found means not found, and the other way around.
View Lorry Controller Status