Commits

Author Commit Message Labels Comments Date
Paul Collins
http-push.c: include with angle bracket, not dq. Do not search the current directory when including expat.h, since it is not supplied by git. Signed-off-by: Paul Collins <paul@briny.ondioline.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Set up remotes/origin to track all remote branches. This implements the idea Daniel Barkalow came up with, to match the remotes/origin created by clone by default to the workflow I use myself in my guinea pig repository, to have me eat my own dog food. We probably would want to use either .git/refs/local/heads/* (idea by Linus) or .git/refs/heads/origin/* instead to reduce the local ref namespace pollution. Signed-off-by: Junio C Hamano <junkio@c…
Junio C Hamano
git-status: do not mark unmerged paths as committable. An unmerged path appears as both "Updated but not checked in" list, and "Changed but not updated" list. We are not going to commit that path until it is resolved, so remove it from the former list. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
ls-files: --others should not say unmerged paths are unknown. Jon Loeliger noticed that an unmerged path appears as "Untracked" in git-status output, even though we show the same path as updated/changed. Since --others means "we have not told git about that path", we should not show unmerged paths -- obviously, git knows about them; it just does not know what we want to do about them yet. Signed-off-by: Junio C Hamano <junkio@cox.net>
Randal L. Schwartz
Use fink/darwinport paths for OSX There's no standard libexpat for OSX, so if you install it after-market, it can end up in various directories. Give paths used by fink and darwinports by default to CFLAGS. Signed-off-by: Junio C Hamano <junkio@cox.net>
Jon Loeliger
Refactor merge strategies into separate includable file. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Document expat dependency when using http-push. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge in http-push first stage.
Nick Hengeveld
Refresh the remote lock if it is about to expire Refresh the remote lock if it is about to expire Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
Improve lock handling Improve lock handling: parse the server response for the timeout, owner, and lock token Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
Support remote references with slashes in their names Support remote references with slashes in their names Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
Verify remote packs, speed up pending request queue Verify that remote packs exist before using the pack index, add requests to the beginning of the queue to locate pending requests faster. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
Add support for pushing to a remote repository using HTTP/DAV Add support for pushing to a remote repository using HTTP/DAV Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Debian: test build. Update version number in changelog to match the 0.99.9.GIT version number, to allow building private deb from wip. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Further Debian split fixes. The doc installation was flattened, breaking links to howto/. Silly cut&paste error made git-doc depend on tk8.4. Doh. Move most of the documentation (except manuals) to git-doc. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Install asciidoc sources as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Package split: Debian. As discussed on the list, split the foreign SCM interoperability packages and documentation from the git-core binary package. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Simplify CFLAGS/DEFINES in Makefile I think the original intention was to make CFLAGS overridable from the make command line, but somehow we ended up accumulating conditional makefile sections that wrongly appends values to CFLAGs. These assignments do not work when the user actually override them from the make command line! DEFINES are handled the same way; it was seemingly overridable, but the makefile sections had assignments, …
Junio C Hamano
git-fetch: fail if specified refspec does not match remote. 'git-fetch remote no-such-ref' succeeded without fetching any ref from the remote. Detect such case and report an error. Note that this makes 'git-fetch remote master master' to fail, because the remote branch 'master' matches the first refspec, and the second refspec is left unmatched, which is detected by the error checking logic. This is somewhat unintuitive, but giving the same refspec more…
Junio C Hamano
Documentation: pull/clone ref mapping clarification. Josef Weidendorfer points out that git-clone documentation does not mention the initial copying of remote branch heads into corresponding local branches. Also clarify the purpose of the ref mappings description in the "remotes" file and recommended workflow. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-format-patch: silly typo fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
test: t4102-apply-rename fails with strict umask. We checked the result of patch application for full permission bits, when the only thing we cared about was to make sure the executable bit was correctly set. Noticed by Peter Baumann. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 0.99.9d This is primarily to include the 'git clone -l' (without -s) fix, first spotted and diagnosed by Linus and caused James Bottomley's repository to become unreadable. It also contains documentation updates happened on the "master" branch since 0.99.9c Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.9d
Junio C Hamano
git-clone: fix local clone If we let cpio to create the leading directories implicitly, it ends up having funny perm bits (GNU cpio 2.5 and 2.6, at least). This leaves .git/object/?? directories readable only by the owner. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
init-db::copy_file() - use copy_fd() Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
copy.c::copy_fd() - do not leak file descriptor on error return. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation: format-patch Add examples section and talk about using this to cherry-pick commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
format-patch: "rev1.." should mean "rev1..HEAD" "rev1.." should mean "rev1..HEAD"; git-diff users are familiar with that syntax. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation: git-fetch/pull updates. We do not accept multiple <refspecs> on one Pull:/Push: line right now (we could lift this tentative workaround for the broken refnames), but we have always accepted multiple such lines, so use that form in the examples and discussion. Also explicitly mention that Octopus is made only with an explicit command line request and never from Pull: lines. Add a couple of cross references. Signed-off-…
Jon Loeliger
Added a few examples to git-pull man page. Clarified and added notes for pull/push refspecs. Converted to back-ticks for literal text examples. [jc: Also fixed git-pull description that still talked about its calling git-resolve or git-octopus (we do not anymore; instead we just call git-merge). BTW, I am reasonably impressed by how well "git-am -3" applied this patch, which had some conflicts because I've updated the documentation somew…
  1. Prev
  2. Next