diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:16 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:16 -0800 |
commit | e74f43f9b702ccb88ee83e28de13ccfaebc4abf2 (patch) | |
tree | ae30da1b3a75cb017064b497cf5a59d5c30e9b6b /merge-recursive.c | |
parent | 902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff) | |
parent | ac10a85785baee56bb4a04ad5f847d15ffba0893 (diff) | |
download | git-e74f43f9b702ccb88ee83e28de13ccfaebc4abf2.tar.gz |
Merge branch 'sr/vcs-helper'
* sr/vcs-helper:
tests: handle NO_PYTHON setting
builtin-push: don't access freed transport->url
Add Python support library for remote helpers
Basic build infrastructure for Python scripts
Allow helpers to report in "list" command that the ref is unchanged
Fix various memory leaks in transport-helper.c
Allow helper to map private ref names into normal names
Add support for "import" helper command
Allow specifying the remote helper in the url
Add a config option for remotes to specify a foreign vcs
Allow fetch to modify refs
Use a function to determine whether a remote is valid
Allow programs to not depend on remotes having urls
Fix memory leak in helper method for disconnect
Conflicts:
Documentation/git-remote-helpers.txt
Makefile
builtin-ls-remote.c
builtin-push.c
transport-helper.c
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions