aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Bundle file copies from multiple branches into a merge.Yaacov Akiba Slama2005-11-08
| | | | | | | | When copying files and/or directories from several branches in one single revision, all these branches are used as parents of the commit. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* copy_dir becomes copy_path and handles both files and directoriesYaacov Akiba Slama2005-11-08
| | | | | | | The A (Add) and R (Replace) actions handling are unified. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Don't output error on changes in the nodes /, /tags or /branchesYaacov Akiba Slama2005-11-08
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add node_kind function to differentiate between file and directoryYaacov Akiba Slama2005-11-08
| | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use svn pools to solve the memory leak problem.Yaacov Akiba Slama2005-11-08
| | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: do not lose already edited final-commit when resuming.Junio C Hamano2005-11-08
| | | | | | | The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* ls-files and read-tree need core.filemodeAlex Riesen2005-11-08
| | | | | | | | | ls-files.c and read-tree.c miss the default configuration, in particular the filemode=false part. The recent +x bit flip made me notice that, because git-merge refused to merge anything saying that git-pull.sh is not up to date. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Debian: packaging updates.Junio C Hamano2005-11-08
| | | | | | | | | Do not scatter txt and html documentation into feature subpackages. Do place man pages into them. Capture more cvs stuff into git-cvs package. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use consistent shell prompts and example style.Jon Loeliger2005-11-08
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --tags documentation, scraped from JC mail.Jon Loeliger2005-11-08
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add support for git-http-push to git-push scriptNick Hengeveld2005-11-08
| | | | | Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Tutorial: do not use 'git resolve'.Junio C Hamano2005-11-08
| | | | | | Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: fix dependency generation.Junio C Hamano2005-11-08
| | | | | | | The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add bug isolation howto, scraped from Linus.Jon Loeliger2005-11-07
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Ignore more generated files.Junio C Hamano2005-11-07
| | | | | | | List new commands cvsexportcommit and http-push to .gitignore list. Also cover the test programs (test-date and test-delta). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix documentation dependency generation.Junio C Hamano2005-11-07
| | | | | | | | | Documentation/Makefile spent a lot of time to generate include dependencies, which was quite noticeable especially during "make clean". Rewrite it to generate just a single dependency file. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: asciidoc formatting fix for git-cvsexportcommit doc.Junio C Hamano2005-11-07
| | | | | | | Annoyingly enough, asciidoc wants the same number of '=' on the second line as there are characters on the first line. Signed-off-by: Junio C Hamano <junkio@cox.net>
* merge-recursive: Only print relevant rename messagesFredrik Kuivinen2005-11-07
| | | | | | | | | | | | | It isn't really interesting to know about the renames that have already been committed to the branch you are working on. Furthermore, the 'git-apply --stat' at the end of git-(merge|pull) will tell us about any renames in the other branch. With this commit only renames which require a file-level merge will be printed. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not fail on hierarchical tagnames.Junio C Hamano2005-11-07
| | | | | | | | This is a companion patch to 13d1cc3604a1a64cb5a6025bba8af8b74a373963 commit, which made hierarchical branch name possible. "git tag v0.99.9/a" would fail otherwise. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Small bugfixes for http-push.cJohannes Schindelin2005-11-07
| | | | | | | | | | | | This patch fixes three things: - older libexpat does not know about enum XML_Status - as in my patch for http-fetch, do not rely on a curl result in free()d data - calloc the new_lock structure Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make http-push smarter about creating remote dirsNick Hengeveld2005-11-07
| | | | | | | | Remember object directories known to exist in the remote repo and don't bother trying to create them. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Introducing: git-cvsexportcommitMartin Langhoff2005-11-07
| | | | | | | | | | | | | | A script that can replay commits git into a CVS checkout. Tries to ensure the sanity of the operation and supports mainly manual usage. If you are reckless enough, you can ask it to autocommit when everything has applied cleanly. Combined with a couple more scripts could become part of a git2cvs gateway. Should support adds/removes and binary files. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation update: use git branch -d foo where applicableKai Ruemmler2005-11-07
| | | | | | | | This updates documentation to use git branch -d foo in favour of rm .git/refs/heads/foo Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano2005-11-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: talk about guts of merge in tutorial.Junio C Hamano2005-11-06
| | | | | | | | | While discussing Jon's ASCII art on merge operations with him, I realized that the tutorial stops talking about the plumbing details halfway. So fill in the gory details, and update the examples to use 'git-merge', not 'git-resolve'. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06
| | | | | | | | | | | | | Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* http-fetch: do not use curl_message after releasing itJohannes Schindelin2005-11-06
| | | | | | | | When curl_message is released using curl_multi_remove_handle(), it's contents are undefined. Therefore, get the information before releasing it. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Allow GIT_DIR to be an absolute pathJohannes Schindelin2005-11-06
| | | | | | | | This fixes a problem in safe_create_leading_directories() when the argument starts with a '/' (i.e. the path is absolute). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* http-push.c: include with angle bracket, not dq.Paul Collins2005-11-06
| | | | | | | | 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>
* Set up remotes/origin to track all remote branches.Junio C Hamano2005-11-06
| | | | | | | | | | | | | 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@cox.net>
* git-status: do not mark unmerged paths as committable.Junio C Hamano2005-11-06
| | | | | | | | 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>
* ls-files: --others should not say unmerged paths are unknown.Junio C Hamano2005-11-06
| | | | | | | | | | | 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>
* Use fink/darwinport paths for OSXRandal L. Schwartz2005-11-06
| | | | | | | | 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>
* Refactor merge strategies into separate includable file.Jon Loeliger2005-11-06
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document expat dependency when using http-push.Junio C Hamano2005-11-06
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge in http-push first stage.Junio C Hamano2005-11-06
|\
| * Refresh the remote lock if it is about to expireNick Hengeveld2005-11-06
| | | | | | | | | | | | | | 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>
| * Improve lock handlingNick Hengeveld2005-11-06
| | | | | | | | | | | | | | | | 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>
| * Support remote references with slashes in their namesNick Hengeveld2005-11-06
| | | | | | | | | | | | | | 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>
| * Verify remote packs, speed up pending request queueNick Hengeveld2005-11-06
| | | | | | | | | | | | | | | | 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>
| * Add support for pushing to a remote repository using HTTP/DAVNick Hengeveld2005-11-06
| | | | | | | | | | | | | | 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>
* | Debian: test build.Junio C Hamano2005-11-06
| | | | | | | | | | | | | | 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>
* | Further Debian split fixes.Junio C Hamano2005-11-06
| | | | | | | | | | | | | | | | 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>
* | Install asciidoc sources as well.Junio C Hamano2005-11-06
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Package split: Debian.Junio C Hamano2005-11-06
| | | | | | | | | | | | | | 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>
* | Simplify CFLAGS/DEFINES in MakefileJunio C Hamano2005-11-06
|/ | | | | | | | | | | | | | | | | | | 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, which meant overriding it from the command line broke things. This simplifies things by limiting the internal futzing to ALL_CFLAGS, and by removing DEFINES altogether. Overriding CFLAGS from the command line should start working with this change. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch: fail if specified refspec does not match remote.Junio C Hamano2005-11-06
| | | | | | | | | | | | | | | '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 than once to git-fetch is useless in any case so it should not be much of a problem. I'd accept a patch to change this if somebody cares enough, though. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: pull/clone ref mapping clarification.Junio C Hamano2005-11-06
| | | | | | | | | 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>
* git-format-patch: silly typo fix.Junio C Hamano2005-11-06
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* test: t4102-apply-rename fails with strict umask.Junio C Hamano2005-11-05
| | | | | | | | | | 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-24 12:29:19 +0000