git, branch v1.9-rc0

Git 1.9-rc0

2014-01-17T20:30:14Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2014-01-17T20:21:39Z

* maint: git-svn: workaround for a bug in svn serf backend

Merge branch 'fp/submodule-checkout-mode'

2014-01-17T20:21:20Z

"submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. * fp/submodule-checkout-mode: git-submodule.sh: 'checkout' is a valid update mode

Merge branch 'nd/shallow-clone'

2014-01-17T20:21:20Z

Fetching from a shallow-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This attempts to allow object transfer out of a shallow-cloned repository in a controlled way (i.e. the receiver become a shallow repository with truncated history). * nd/shallow-clone: (31 commits) t5537: fix incorrect expectation in test case 10 shallow: remove unused code send-pack.c: mark a file-local function static git-clone.txt: remove shallow clone limitations prune: clean .git/shallow after pruning objects clone: use git protocol for cloning shallow repo locally send-pack: support pushing from a shallow clone via http receive-pack: support pushing to a shallow clone via http smart-http: support shallow fetch/clone remote-curl: pass ref SHA-1 to fetch-pack as well send-pack: support pushing to a shallow clone receive-pack: allow pushes that update .git/shallow connected.c: add new variant that runs with --shallow-file add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses receive/send-pack: support pushing from a shallow clone receive-pack: reorder some code in unpack() fetch: add --update-shallow to accept refs that update .git/shallow upload-pack: make sure deepening preserves shallow roots fetch: support fetching from a shallow repository clone: support remote shallow repository ...

Merge branch 'jk/pull-rebase-using-fork-point'

2014-01-17T20:04:29Z

Finishing touches so that an expected error message will not leak to the UI. * jk/pull-rebase-using-fork-point: pull: suppress error when no remoteref is found

pull: suppress error when no remoteref is found

2014-01-17T20:03:32Z

Commit 48059e4 (pull: use merge-base --fork-point when appropriate, 2013-12-08) incorrectly assumes that get_remote_merge_branch will either yield a non-empty string or return an error, but there are circumstances where it will yield an empty string. The previous code then invoked git-rev-list with no arguments, which results in an error suppressed by redirecting stderr to /dev/null. Now we invoke git-merge-base with an empty branch name, which also results in an error. Suppress this in the same way. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

git-svn: workaround for a bug in svn serf backend

2014-01-17T19:24:30Z

Subversion serf backend in versions 1.8.5 and below has a bug(*) that the function creating the descriptor of a file change -- add_file() -- doesn't make a copy of its third argument when storing it on the returned descriptor. As a result, by the time this field is used (in transactions of file copying or renaming) it may well be released, and the memory reused. One of its possible manifestations is the svn assertion triggering on an invalid path, with a message svn_fspath__skip_ancestor: Assertion `svn_fspath__is_canonical(child_fspath)' failed. This patch works around this bug, by storing the value to be passed as the third argument to add_file() in a local variable with the same scope as the file change descriptor, making sure their lifetime is the same. * [ew: fixed in Subversion r1553376 as noted by Jonathan Nieder] Cc: Benjamin Pabst Signed-off-by: Eric Wong Reviewed-by: Jonathan Nieder Signed-off-by: Roman Kagan

Sync with 1.8.5.3

2014-01-13T19:39:38Z

* maint: Git 1.8.5.3 pack-heuristics.txt: mark up the file header properly

Update draft release notes to 1.9

2014-01-13T19:39:09Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/t5531-prepare-to-default-to-non-matching'

2014-01-13T19:35:10Z

* jk/t5531-prepare-to-default-to-non-matching: t5531: further "matching" fixups