| 23ea3e2 | Junio C Hamano | 10 November 2005, 05:09:43 UTC | GIT 0.99.9g Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 05:09:43 UTC |
| a1c2929 | Junio C Hamano | 08 November 2005, 10:00:31 UTC | Make git-recursive the default strategy for git-pull. This does two things: - It changes the hardcoded default merge strategy for two-head git-pull from resolve to recursive. - .git/config file acquires two configuration items. pull.twohead names the strategy for two-head case, and pull.octopus names the strategy for octopus merge. IOW you are paranoid, you can have the following lines in your .git/config file and keep using git-merge-resolve when pulling one remote: [pull] twohead = resolve OTOH, you can say this: [pull] twohead = resolve twohead = recursive to try quicker resolve first, and when it fails, fall back to recursive. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 02:56:29 UTC |
| 1395667 | Junio C Hamano | 10 November 2005, 02:54:14 UTC | Use 'merge-base --all' where applicable. It may get extra merge base on truly pathological commit histories, but is a lot easier to understand, explain, and prove correctness. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 02:54:14 UTC |
| a489352 | Junio C Hamano | 10 November 2005, 02:44:42 UTC | Merge branch 'hold/svn' | 10 November 2005, 02:44:42 UTC |
| 68afd5f | Junio C Hamano | 10 November 2005, 02:44:18 UTC | Merge branch 'hold/rpm' | 10 November 2005, 02:44:18 UTC |
| ff36de0 | Junio C Hamano | 09 November 2005, 22:59:23 UTC | git-apply: do not fail on binary diff when not applying nor checking. We run git-apply with --stat and --summary at the end of the pull by default, which causes it to barf when the pull brought in changes to binary files. Just mark them as binary patch and proceed when not applying nor checking. [jc: I almost missed --check until I saw Linus did something similar.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 23:19:50 UTC |
| c44922a | Junio C Hamano | 09 November 2005, 20:40:03 UTC | Update INSTALL Explicitly mention how to install by hand in build-as-user and install-as-root steps. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 20:40:03 UTC |
| 186f855 | Fredrik Kuivinen | 09 November 2005, 10:42:57 UTC | merge-recursive: Fix support for branch names containing slashes A branch name could have a slash in it. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 20:32:36 UTC |
| c8a4f5e | Fredrik Kuivinen | 09 November 2005, 10:36:55 UTC | merge-recursive: Fix limited output of rename messages The previous code did the right thing, but it did it by accident. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 20:32:34 UTC |
| e09f5d7 | Alexander Litvinov | 09 November 2005, 07:02:58 UTC | Fix cvsexportcommit syntax error There is a syntax error in cvsexport script: Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 07:34:29 UTC |
| f37d0cc | Luck, Tony | 08 November 2005, 23:52:02 UTC | Update howto using-topic-branches "git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 05:33:36 UTC |
| f4f440a | Peter Hagervall | 08 November 2005, 22:18:31 UTC | sparse fixes for http-{fetch,push}.c Make a bunch of needlessly global functions static, and replace two K&R-style declarations. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 05:33:32 UTC |
| 61f8151 | Kai Ruemmler | 08 November 2005, 10:44:33 UTC | git-tag -d <tag>: delete tag <tag> This adds option '-d' to git-tag.sh and documents it. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 19:26:10 UTC |
| 23fc63b | Alex Riesen | 08 November 2005, 09:51:10 UTC | make tests ignorable with "make -i" Allow failed tests to be ignored using make's "-i". The patch also disables parallel make in t/. This doesn't make the testing any different as before: the tests were run sequentially before. It also allows to run more tests, ignoring the ones usually failing just to figure out if something else broke. (Or to ignore plainly uninteresting situations because of the testing being done on say... cygwin ;) Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 19:26:07 UTC |
| cb34882 | Alex Riesen | 08 November 2005, 10:45:15 UTC | fix t5000-tar-tree.sh when $TAR isn't set $TAR isn't set everywhere. Provide a default (tar) Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 19:26:03 UTC |
| f8d294f | Junio C Hamano | 08 November 2005, 16:58:52 UTC | Clean build annoyance. As Pasky pointed out, building in templates directory showed list of built template files which was unneeded. This commit also fixes another build annoyance I recently left in by accident. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 16:58:52 UTC |
| 5ca15b8 | Junio C Hamano | 08 November 2005, 09:25:59 UTC | GIT 0.99.9f Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:25:59 UTC |
| 7d4de59 | Jim Radford | 05 November 2005, 19:38:02 UTC | Separate RPMS for programs with non-standard dependencies. Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:54 UTC |
| f3ad062 | Junio C Hamano | 05 November 2005, 07:30:12 UTC | Fix a couple of obvious and insignificant typo. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:50 UTC |
| 01d4f0e | Yaacov Akiba Slama | 02 November 2005, 21:51:58 UTC | Lift the default limit of number of revs. Now that the leak is gone, there is by default no limit of revisions to import. No more message about leak when the limit (given by the -l parameter) is reached. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:50 UTC |
| a16db4f | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Handle a revision that only creates a new tag correctly. Fix an error when a svn revision consists only of the creation of a new tag directory (/tags/this_is_a_tag). Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:49 UTC |
| 109fc2b | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Bundle file copies from multiple branches into a merge. 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> | 08 November 2005, 09:24:49 UTC |
| 8168373 | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | copy_dir becomes copy_path and handles both files and directories 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> | 08 November 2005, 09:24:48 UTC |
| c2c07a5 | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Don't output error on changes in the nodes /, /tags or /branches Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:48 UTC |
| cbce5d8 | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Add node_kind function to differentiate between file and directory Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:48 UTC |
| fcfa32b | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Use svn pools to solve the memory leak problem. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:47 UTC |
| 4bfb6b6 | Junio C Hamano | 08 November 2005, 08:41:37 UTC | git-am: do not lose already edited final-commit when resuming. The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:23:53 UTC |
| 39b4ac9 | Alex Riesen | 08 November 2005, 08:23:37 UTC | ls-files and read-tree need core.filemode 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> | 08 November 2005, 09:23:52 UTC |
| 76bca9d | Junio C Hamano | 08 November 2005, 09:20:24 UTC | Debian: packaging updates. 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> | 08 November 2005, 09:20:24 UTC |
| f2416c2 | Jon Loeliger | 07 November 2005, 14:33:51 UTC | Use consistent shell prompts and example style. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:13 UTC |
| d0fde47 | Jon Loeliger | 07 November 2005, 14:03:30 UTC | Add --tags documentation, scraped from JC mail. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:12 UTC |
| df8171c | Nick Hengeveld | 02 November 2005, 19:19:31 UTC | Add support for git-http-push to git-push script Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:12 UTC |
| 067744b | Junio C Hamano | 08 November 2005, 06:50:57 UTC | Tutorial: do not use 'git resolve'. Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:12 UTC |
| fb612d5 | Junio C Hamano | 08 November 2005, 06:21:21 UTC | Documentation: fix dependency generation. The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:12 UTC |
| b2d09f0 | Jon Loeliger | 08 November 2005, 02:45:25 UTC | Add bug isolation howto, scraped from Linus. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 06:18:48 UTC |
| 77131db | Junio C Hamano | 08 November 2005, 02:23:45 UTC | Merge branch 'master' | 08 November 2005, 02:23:45 UTC |
| 390cb0c | Junio C Hamano | 08 November 2005, 02:23:10 UTC | Ignore more generated files. 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> | 08 November 2005, 02:23:10 UTC |
| a5ae8e6 | Junio C Hamano | 08 November 2005, 02:21:51 UTC | Fix documentation dependency generation. 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> | 08 November 2005, 02:21:51 UTC |
| 79f6ac7 | Junio C Hamano | 08 November 2005, 01:53:06 UTC | Documentation: asciidoc formatting fix for git-cvsexportcommit doc. 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> | 08 November 2005, 01:53:06 UTC |
| d1745af | Fredrik Kuivinen | 07 November 2005, 23:19:44 UTC | merge-recursive: Only print relevant rename messages 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> | 08 November 2005, 01:13:10 UTC |
| 52963a7 | Junio C Hamano | 08 November 2005, 00:22:34 UTC | Do not fail on hierarchical tagnames. 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> | 08 November 2005, 00:34:04 UTC |
| 92e2eb9 | Johannes Schindelin | 07 November 2005, 18:23:11 UTC | Small bugfixes for http-push.c 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> | 07 November 2005, 21:29:41 UTC |
| 0dd276b | Nick Hengeveld | 07 November 2005, 19:39:37 UTC | Make http-push smarter about creating remote dirs 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> | 07 November 2005, 21:29:39 UTC |
| 5e0306a | Martin Langhoff | 07 November 2005, 04:57:08 UTC | Introducing: git-cvsexportcommit 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> | 07 November 2005, 21:28:37 UTC |
| e66ab03 | Kai Ruemmler | 07 November 2005, 08:23:59 UTC | Documentation update: use git branch -d foo where applicable 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> | 07 November 2005, 21:28:31 UTC |
| 31b9755 | Junio C Hamano | 07 November 2005, 20:52:07 UTC | Recover dropped +x bit from git-pull.sh by accident. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 November 2005, 20:52:07 UTC |
| 7141b3b | Junio C Hamano | 07 November 2005, 07:33:38 UTC | Merge branch 'master' | 07 November 2005, 07:33:38 UTC |
| 44760f1 | Junio C Hamano | 07 November 2005, 07:29:35 UTC | Documentation: talk about guts of merge in tutorial. 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> | 07 November 2005, 07:32:33 UTC |
| 93d69d8 | Jon Loeliger | 07 November 2005, 05:30:56 UTC | Refactored merge options into separate merge-options.txt. 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> | 07 November 2005, 07:32:04 UTC |
| 72e5890 | Junio C Hamano | 07 November 2005, 02:57:40 UTC | GIT 0.99.9e Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 November 2005, 02:57:40 UTC |
| 9027907 | Johannes Schindelin | 06 November 2005, 23:59:39 UTC | http-fetch: do not use curl_message after releasing it 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> | 07 November 2005, 02:31:47 UTC |
| 67ffdf4 | Johannes Schindelin | 06 November 2005, 23:36:15 UTC | Allow GIT_DIR to be an absolute path 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> | 07 November 2005, 02:31:46 UTC |
| bee8e79 | Paul Collins | 06 November 2005, 21:07:45 UTC | 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> | 07 November 2005, 02:31:46 UTC |
| 95d117b | Junio C Hamano | 06 November 2005, 08:52:57 UTC | 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@cox.net> | 07 November 2005, 02:17:14 UTC |
| f179044 | Junio C Hamano | 07 November 2005, 01:37:40 UTC | 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> | 07 November 2005, 01:37:40 UTC |
| fcbc308 | Junio C Hamano | 07 November 2005, 01:26:31 UTC | 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> | 07 November 2005, 01:26:31 UTC |
| 0cfddac | Randal L. Schwartz | 06 November 2005, 12:33:07 UTC | 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> | 06 November 2005, 18:52:48 UTC |
| bb73d73 | Jon Loeliger | 06 November 2005, 16:26:07 UTC | Refactor merge strategies into separate includable file. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2005, 18:31:48 UTC |
| 3402f1d | Junio C Hamano | 05 November 2005, 19:12:05 UTC | Document expat dependency when using http-push. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2005, 18:21:06 UTC |
| 4ea836d | Junio C Hamano | 06 November 2005, 09:27:15 UTC | Merge in http-push first stage. | 06 November 2005, 09:27:15 UTC |
| 75187c9 | Nick Hengeveld | 04 November 2005, 22:22:35 UTC | 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> | 06 November 2005, 09:14:45 UTC |
| 26349b2 | Nick Hengeveld | 04 November 2005, 22:22:31 UTC | 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> | 06 November 2005, 09:14:45 UTC |
| 0772b9a | Nick Hengeveld | 04 November 2005, 22:22:25 UTC | 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> | 06 November 2005, 09:14:45 UTC |
| c17fb6e | Nick Hengeveld | 04 November 2005, 22:22:18 UTC | 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> | 06 November 2005, 09:14:44 UTC |
| 58e60dd | Nick Hengeveld | 02 November 2005, 19:19:24 UTC | 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> | 06 November 2005, 09:14:44 UTC |
| c0a2ed1 | Junio C Hamano | 05 November 2005, 20:54:40 UTC | 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> | 06 November 2005, 09:12:33 UTC |
| 9eba845 | Junio C Hamano | 05 November 2005, 20:54:25 UTC | 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> | 06 November 2005, 09:12:32 UTC |
| 54c2533 | Junio C Hamano | 05 November 2005, 20:52:56 UTC | Install asciidoc sources as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2005, 09:12:32 UTC |
| d071e8d | Junio C Hamano | 05 November 2005, 10:39:42 UTC | 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> | 06 November 2005, 09:12:31 UTC |
| 12aa745 | Junio C Hamano | 05 November 2005, 07:50:09 UTC | 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, 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> | 06 November 2005, 09:12:31 UTC |
| 9e5d2b4 | Junio C Hamano | 06 November 2005, 08:09:59 UTC | 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 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> | 06 November 2005, 08:26:21 UTC |
| 4607166 | Junio C Hamano | 06 November 2005, 06:26:52 UTC | 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> | 06 November 2005, 08:26:21 UTC |
| b748421 | Junio C Hamano | 06 November 2005, 08:21:45 UTC | git-format-patch: silly typo fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2005, 08:21:45 UTC |
| b52d9f9 | Junio C Hamano | 05 November 2005, 21:08:18 UTC | 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> | 05 November 2005, 21:08:18 UTC |
| 87ce294 | Junio C Hamano | 05 November 2005, 19:50:24 UTC | 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> | 05 November 2005, 19:50:24 UTC |
| 3d95bf0 | Junio C Hamano | 05 November 2005, 19:44:35 UTC | 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> | 05 November 2005, 19:44:35 UTC |
| 32276c8 | Junio C Hamano | 05 November 2005, 19:07:22 UTC | init-db::copy_file() - use copy_fd() Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2005, 19:07:22 UTC |
| e6c64fc | Junio C Hamano | 05 November 2005, 19:02:56 UTC | copy.c::copy_fd() - do not leak file descriptor on error return. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2005, 19:02:56 UTC |
| 28ffb89 | Junio C Hamano | 05 November 2005, 10:55:18 UTC | Documentation: format-patch Add examples section and talk about using this to cherry-pick commits. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2005, 10:55:18 UTC |
| bd7c8aa | Junio C Hamano | 05 November 2005, 10:47:07 UTC | 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> | 05 November 2005, 10:48:29 UTC |
| fdd0897 | Junio C Hamano | 05 November 2005, 09:37:00 UTC | 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-by: Junio C Hamano <junkio@cox.net> | 05 November 2005, 09:39:18 UTC |
| bccf595 | Jon Loeliger | 05 November 2005, 02:36:08 UTC | 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 somewhat.] Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2005, 03:28:39 UTC |
| d8ae1d1 | Junio C Hamano | 05 November 2005, 02:17:16 UTC | Document the --no-commit flag better Pasky and I did overlapping documentation independently; this is to pick up better wordings from what he sent me. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2005, 02:17:16 UTC |
| 3746501 | Junio C Hamano | 04 November 2005, 08:06:20 UTC | Documentation: -merge and -pull: describe merge strategies. ... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2005, 08:18:29 UTC |
| 810bf1f | Junio C Hamano | 04 November 2005, 08:04:17 UTC | Documentation: git-add -- do not say "cache", add examples. Its use of git-ls-files --others is very nice, but sometimes gives surprising results, so we'd better talk about it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2005, 08:04:17 UTC |
| a10aad6 | Junio C Hamano | 03 November 2005, 23:26:43 UTC | git-tag: Do not assume the working tree root is writable. This is a long overdue companion commit that fixed git-commit (Santi's f8e2c54c9a17af3319e96db1d9e97ace36ae6831). Having the temporary files in the working tree root when making tags is not as bad because it does not involve 'git status' as the git-commit case, but this makes things more consistent. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2005, 07:05:49 UTC |
| 50496b2 | Nick Hengeveld | 04 November 2005, 01:54:52 UTC | Remove the temp file if it is empty after the request has failed After using cg-update to pull, empty files named *.temp are left in the various subdirectories of .git/objects/. These are created by git-http-fetch to hold data as it's being fetched from the remote repository. They are left behind after a transfer error so that the next time git-http-fetch runs it can pick up where it left off. If they're empty though, it would make more sense to delete them rather than leaving them behind for the next attempt. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2005, 02:35:18 UTC |
| 6ddc096 | Junio C Hamano | 03 November 2005, 23:45:36 UTC | GIT 0.99.9c Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 23:45:36 UTC |
| 2be8fd0 | Junio C Hamano | 03 November 2005, 21:52:44 UTC | Illustration: "Commit DAG Revision Naming" Jon Loeliger's ASCII art in the git-rev-parse(1) manual. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 22:55:49 UTC |
| 36f05ef | Junio C Hamano | 03 November 2005, 21:52:44 UTC | Illustration: "Git Diff Types" Jon Loeliger's ASCII art in the Tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 22:55:48 UTC |
| 66158e3 | Junio C Hamano | 03 November 2005, 21:52:44 UTC | Illustration: "Fundamental Git Index Operations" Jon Loeliger's ASCII art in the Discussion section. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 22:55:48 UTC |
| 160252f | Junio C Hamano | 03 November 2005, 09:51:25 UTC | git-merge-ours: make sure our index matches HEAD git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 22:55:11 UTC |
| 64da9e6 | Junio C Hamano | 02 November 2005, 03:34:49 UTC | Add 'ours' merge strategy. This adds the coolest merge strategy ever, "ours". It can take arbitrary number of foreign heads and merge them into the current branch, with the resulting tree always taken from our branch head, hence its name. What this means is that you can declare that the current branch supersedes the development histories of other branches using this merge strategy. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 22:55:10 UTC |
| 123ee3c | Junio C Hamano | 02 November 2005, 03:30:11 UTC | Add --no-commit to git-merge/git-pull. With --no-commit flag, git-pull will perform the merge but pretends as if the merge needed a hand resolve even if automerge cleanly resolves, to give the user a chance to add further changes and edit the commit message. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 22:55:10 UTC |
| a3114b3 | Junio C Hamano | 03 November 2005, 07:41:25 UTC | Document --since and --until options to rev-parse. The usability magic were hidden in the source code without being documented, and even the maintainer did not know about them ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 07:41:25 UTC |
| 9534f40 | Junio C Hamano | 02 November 2005, 23:19:13 UTC | Be careful when dereferencing tags. One caller of deref_tag() was not careful enough to make sure what deref_tag() returned was not NULL (i.e. we found a tag object that points at an object we do not have). Fix it, and warn about refs that point at such an incomplete tag where needed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 00:50:58 UTC |
| 2fd955c | Peter Eriksen | 02 November 2005, 19:27:31 UTC | [PATCH] Clean up the SunOS Makefile rule Don't set a non-standard CURLDIR as default, and fix an error in Solaris 10 by setting NEEDS_LIBICONV. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 00:50:58 UTC |
| db2c075 | Junio C Hamano | 02 November 2005, 21:02:57 UTC | Ignore '\r' at the end of line in $GIT_DIR/config Unfortunate people may have to use $GIT_DIR/config edited on DOSsy machine on UNIXy machine. Ignore '\r' immediately followed by '\n'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 00:50:58 UTC |
| d317e43 | Alex Riesen | 02 November 2005, 13:05:45 UTC | remove CR/LF from .gitignore For everyone cursed by dos/windows line endings (aka CRLF): The code reading the .gitignore files (excludes and excludes per directory) leaves \r in the patterns, which causes fnmatch to fail for no obvious reason. Just remove a "\r" preceding a "\n" unconditionally. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 00:50:58 UTC |
| 13d1cc3 | Junio C Hamano | 02 November 2005, 20:17:47 UTC | Do not fail on hierarchical branch names. "git-checkout -b frotz/nitfol master" failed to create $GIT_DIR/refs/heads/frotz/nitfol but went ahead and updated $GIT_DIR/HEAD to point at it, resulting in a corrupt repository. Exit when we cannot create the new branch with an error status. While we are at it, there is no reason to forbid subdirectories in refs/heads, so make sure we handle that correctly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2005, 00:50:58 UTC |
