| c99ec04 | Junio C Hamano | 18 October 2005, 00:46:35 UTC | GIT 0.99.8e Linus Torvalds: make checkout-index '-a' flag saner. Junio C Hamano: whatchanged: document -m option from git-diff-tree. Functions to quote and unquote pathnames in C-style. Update git-apply to use C-style quoting for funny pathnames. Do not quote SP. git-checkout-index: documentation updates. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 October 2005, 04:52:10 UTC |
| 82ed2bc | Junio C Hamano | 18 October 2005, 00:39:11 UTC | Merge branch 'fixes' | 18 October 2005, 00:39:11 UTC |
| fd25c82 | Junio C Hamano | 18 October 2005, 00:38:09 UTC | git-checkout-index: documentation updates. Now the behaviour of '-a' has been straightened out, document it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 October 2005, 00:38:09 UTC |
| a65a686 | Linus Torvalds | 18 October 2005, 00:32:12 UTC | make checkout-index '-a' flag saner. The original semantics of pretending as if all files were specified where '-a' appeared and using only the flags given so far was too confusing. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 October 2005, 00:32:12 UTC |
| 2578519 | Junio C Hamano | 17 October 2005, 20:34:42 UTC | Do not quote SP. Follow the "encode minimally" principle -- our tools, including git-apply and git-status, can handle pathnames with embedded SP just fine. The only problematic ones are TAB and LF, and we need to quote the metacharacters introduced for quoting. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 October 2005, 20:34:42 UTC |
| b71d01e | Junio C Hamano | 16 October 2005, 19:21:38 UTC | Merge branch 'fixes' | 16 October 2005, 19:21:38 UTC |
| ea56188 | Junio C Hamano | 16 October 2005, 18:05:14 UTC | Update git-apply to use C-style quoting for funny pathnames. This is a backport so that maintenance branch can understand diff output that uses C-style quoting produced by newer tools. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 18:05:14 UTC |
| 585793d | Junio C Hamano | 16 October 2005, 17:58:30 UTC | Functions to quote and unquote pathnames in C-style. Following the list discussion, define two functions, quote_c_style and unquote_c_style, to help adopting the proposed way for quoting funny pathname letters for GNU patch. The rule is described in: http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 Currently we do not support the leading '!', but we probably should barf upon seeing it. Rule B4. is interpreted to require always 3 octal digits in \XYZ notation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 17:58:30 UTC |
| 15fad5f | Junio C Hamano | 16 October 2005, 06:49:27 UTC | whatchanged: document -m option from git-diff-tree. The documentation for git-whatchanged is meant to describe only the most frequently used options from git-diff-tree. Because "why doesn't it show merges" was asked more than once, we'd better describe '-m' option there. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 06:49:27 UTC |
| a2239b7 | Junio C Hamano | 16 October 2005, 00:30:15 UTC | GIT v0.99.8d Contains the following changes since v0.99.8c. Johannes Schindelin: Teach git-status about spaces in file names also on MacOSX t5400-send-pack relies on a working cpio Jonas Fonseca: git.sh: quote all paths Junio C Hamano: Also force LC_ALL in test scripts. OpenBSD needs the strcasestr replacement. git-check-ref-format: reject funny ref names. Refuse to create funny refs in clone-pack, git-fetch and receive-pack. Ignore funny refname sent from remote Introduce notation "ref^{type}". Martin Langhoff: cvsimport: don't pass --cvs-direct if user options contradict us Ralf Baechle: rsh.c: typo fix Note that "funny ref" bits are not strictly fixes but rather backport from the "master" branch. They will prevent refs and heads with funny names from being created. In addition, what is in the master branch will start feeding the clients unwrapped tag information to help Martin's findtags and possibly later Cogito. These backported "funny ref" changes are to prevent clients on the "maint" branch from getting confused when talking with newer git-upload-pack and when reading from info/refs file prepared with newer git-update-server-info. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 01:10:02 UTC |
| 4baf5dd | Junio C Hamano | 16 October 2005, 00:14:10 UTC | Introduce notation "ref^{type}". Existing "tagname^0" notation means "dereference tag zero or more times until you cannot dereference it anymore, and make sure it is a commit -- otherwise barf". But tags do not necessarily reference commit objects. This commit introduces a bit more generalized notation, "ref^{type}". Existing "ref^0" is a shorthand for "ref^{commit}". If the type is empty, it just dereferences tags until it hits a non-tag object. With this, "git-rev-parse --verify 'junio-gpg-pub^{}'" shows the blob object name -- there is no need to manually read the tag object and find out the object name anymore. "git-rev-parse --verify 'HEAD^{tree}'" can be used to find out the tree object name of the HEAD commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 00:14:10 UTC |
| 5a2e04d | Junio C Hamano | 16 October 2005, 00:14:09 UTC | Ignore funny refname sent from remote This allows the remote side (most notably, upload-pack) to show additional information without affecting the downloader. Peek-remote does not ignore them -- this is to make it useful for Pasky's automatic tag following. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 00:14:09 UTC |
| 48bc2fb | Junio C Hamano | 16 October 2005, 00:10:14 UTC | Refuse to create funny refs in clone-pack, git-fetch and receive-pack. Using git-check-ref-format, make sure we do not create refs with funny names when cloning from elsewhere (clone-pack), fast forwarding local heads (git-fetch), or somebody pushes into us (receive-pack). Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 00:10:14 UTC |
| 652d5dc | Junio C Hamano | 16 October 2005, 00:10:14 UTC | git-check-ref-format: reject funny ref names. Update check_ref_format() function to reject ref names that: * has a path component that begins with a ".", or * has a double dots "..", or * has ASCII control character, "~", "^", ":" or SP, anywhere, or * ends with a "/". Use it in 'git-checkout -b', 'git-branch', and 'git-tag' to make sure that newly created refs are well-formed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2005, 00:10:14 UTC |
| 494245d | Junio C Hamano | 16 October 2005, 00:03:32 UTC | Revert "Adapt tutorial to cygwin and add test case" This reverts 2ae6c706749b44f05917fcd04037f545d16fb345 commit. | 16 October 2005, 00:03:32 UTC |
| b67b9b2 | Junio C Hamano | 16 October 2005, 00:03:30 UTC | Revert "tutorial: update the initial commit example." This reverts 5990efb0c4f6d1a19c4702bf50ef8cc5ac902a78 commit. | 16 October 2005, 00:03:30 UTC |
| 2482d7d | Junio C Hamano | 15 October 2005, 18:23:28 UTC | Merge branch 'fixes' | 15 October 2005, 18:23:28 UTC |
| 5990efb | Junio C Hamano | 13 October 2005, 18:57:05 UTC | tutorial: update the initial commit example. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 October 2005, 18:57:05 UTC |
| 2ae6c70 | Johannes Schindelin | 13 October 2005, 18:36:37 UTC | Adapt tutorial to cygwin and add test case Lacking reliable symlinks, the instructions in the tutorial did not work in a cygwin setup. Also, a few outputs were not correct. This patch fixes these, and adds a test case which follows the instructions of the tutorial (except git-clone, -fetch and -push, which I have not done yet). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 October 2005, 18:36:37 UTC |
| 2573808 | Ralf Baechle | 13 October 2005, 17:01:38 UTC | rsh.c: typo fix Example in a comment used a wrong environment variable. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 October 2005, 17:01:38 UTC |
| 7882213 | Junio C Hamano | 12 October 2005, 05:04:19 UTC | Merge branch 'fixes' | 12 October 2005, 05:04:19 UTC |
| df73e9c | Martin Langhoff | 12 October 2005, 04:57:04 UTC | [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us Detecting if the user passed --no-cvs-direct and don't force the mode. It allows us to support all the protocol that the standard cvs client supports at the snail speed you should expect. This only affects the rlog reading stage. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 12 October 2005, 04:57:04 UTC |
| e858862 | Junio C Hamano | 10 October 2005, 23:17:02 UTC | Merge branch 'fixes' | 10 October 2005, 23:17:02 UTC |
| 18e410f | Johannes Schindelin | 10 October 2005, 21:14:22 UTC | t5400-send-pack relies on a working cpio Since cygwin does not install cpio by default, t5400 results in a very cryptic failure. So, test for cpio explicitely. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 21:14:22 UTC |
| d9c74a8 | Jonas Fonseca | 10 October 2005, 21:14:06 UTC | git.sh: quote all paths This makes it handle spaces in paths. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 21:14:06 UTC |
| d52920e | Johannes Schindelin | 10 October 2005, 20:58:52 UTC | Teach git-status about spaces in file names also on MacOSX Not all sed understands '\t' and consequently cuts off every file name at the first "t" (or backslash...). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 20:58:52 UTC |
| 5fb41e8 | Junio C Hamano | 10 October 2005, 18:51:11 UTC | OpenBSD needs the strcasestr replacement. Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 18:51:11 UTC |
| 899460f | Junio C Hamano | 10 October 2005, 04:58:02 UTC | Also force LC_ALL in test scripts. Noticed by Junichi Uekawa. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 04:58:02 UTC |
| 32e49d5 | Junio C Hamano | 10 October 2005, 02:19:36 UTC | GIT 0.99.8c Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 02:19:36 UTC |
| 2af60a0 | Junio C Hamano | 10 October 2005, 02:17:43 UTC | Merge branch 'fixes' | 10 October 2005, 02:17:43 UTC |
| fb8024b | Junio C Hamano | 10 October 2005, 02:13:47 UTC | git-tag: update usage string and documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2005, 02:13:47 UTC |
| 9fabded | Kai Ruemmler | 09 October 2005, 23:52:50 UTC | ignore new git-diff index header when computing patch ids Two else equal patches should not result in different checksums, only because they were applied to different versions of the file. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 October 2005, 23:52:50 UTC |
| 5a6850e | Paolo 'Blaisorblade' Giarrusso | 09 October 2005, 23:50:34 UTC | Fix git-verify-tag for light-weight tags It currently exits printing "git-cat-file SHA1: bad file", while instead we must just abort the verification for light-weight tags (e.g. referring to commit objects). [jc: tag objects can tag anything not just commits, so I fixed up the original patch slightly. you should be able to validate a signed tag that points at a blob object. ] Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 October 2005, 23:50:34 UTC |
| 8c51242 | Junio C Hamano | 09 October 2005, 01:01:24 UTC | Make sure 'make install' does not have to rebuild templates. The dependency rule in templates directory forced 'make install' that immediately followed 'make all' to rebuild boilerplates. This was problematic for a workflow that built first as yourself and then installed as root, from a working tree that is on an NFS mounted filesystem that is unwritable by root. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 October 2005, 09:58:35 UTC |
| e1e9c25 | Junio C Hamano | 08 October 2005, 21:54:41 UTC | Give proper prototype to gitstrcasestr. Borrow from NO_MMAP patch by Johannes, squelch compiler warnings by declaring gitstrcasestr() when we use it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 October 2005, 21:54:41 UTC |
| 305a5c7 | Junio C Hamano | 08 October 2005, 00:08:56 UTC | Merge branch 'fixes' | 08 October 2005, 00:08:56 UTC |
| 33bb218 | Kai Ruemmler | 07 October 2005, 23:55:00 UTC | teach git-status about spaces in filenames git-status truncates filenames up to the first occurrence of a whitespace character when displaying. More precisely, it displays the filename up to any field seperator defined in $IFS. This patch fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2005, 23:55:00 UTC |
| ab1630a | robfitz@273k.net | 07 October 2005, 23:54:06 UTC | Fix wrong filename listing bug in git-ls-tree. This patch fixes a bug in git-ls-tree in which the wrong filenames are listed if the exact same file and directory contents are present in another location in the tree. Added a new series of test cases for directory and filename handling. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2005, 23:54:06 UTC |
| ab18247 | Kai Ruemmler | 07 October 2005, 21:05:03 UTC | s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt This updates last place where checkout-cache gets mentioned wrongly for checkout-index. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2005, 21:05:03 UTC |
| babfaba | Jonas Fonseca | 05 October 2005, 23:56:31 UTC | Fix usage of carets in git-rev-parse(1) ... but using a {caret} attribute. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 23:56:31 UTC |
| 8b1f8d0 | Junio C Hamano | 05 October 2005, 22:41:49 UTC | GIT 0.99.8b Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 22:41:49 UTC |
| 952f87a | Junio C Hamano | 05 October 2005, 22:33:58 UTC | Merge branch 'fixes' | 05 October 2005, 22:33:58 UTC |
| 4cfc63d | Junio C Hamano | 05 October 2005, 22:29:48 UTC | clone-pack: use create_symref() instead of raw symlink. This was the last instance of symlink() in coreish part. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 22:29:48 UTC |
| f73ae1f | Christian Meder | 05 October 2005, 22:08:26 UTC | Some typos and light editing of various manpages Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 22:08:26 UTC |
| e091eb9 | Junio C Hamano | 05 October 2005, 21:49:54 UTC | upload-pack: Do not choke on too many heads request. Cloning from a repository with more than 256 refs (heads and tags included) will choke, because upload-pack has a built-in limit of feeding not more than MAX_NEEDS (currently 256) heads to underlying git-rev-list. This is a problem when cloning a repository with many tags, like http://www.linux-mips.org/pub/scm/linux.git, which has 290+ tags. This commit introduces a new flag, --all, to git-rev-list, to include all refs in the repository. Updated upload-pack detects requests that ask more than MAX_NEEDS refs, and sends everything back instead. We may probably want to tweak the definitions of MAX_NEEDS and MAX_HAS, but that is a separate topic. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 21:49:54 UTC |
| df34297 | Santi_Béjar | 05 October 2005, 16:58:10 UTC | [PATCH] Quote the missing GIT_DIR. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 18:23:23 UTC |
| 85912b0 | Jonas Fonseca | 05 October 2005, 15:52:12 UTC | [PATCH] Fix symbolic ref validation Use the correct buffer when validating 'ref: refs/...' Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 17:50:59 UTC |
| d6e548d | Alex Riesen | 05 October 2005, 14:58:11 UTC | [PATCH] hold_index_file_for_update should not unlink failed to open .lock files atexit Set up atexit only if the .lock-file was opened successfully. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 17:50:57 UTC |
| 0b34379 | Junio C Hamano | 05 October 2005, 00:44:17 UTC | Fix diff-filter All-Or-None mark. When we updated the marker for new files from 'N' to 'A', we forgot to notice that the letter is already taken by the All-Or-None mark. Change the All-Or-None marker to '*' to resolve this conflict. git-diff-tree -r --diff-filter='R*' -M shows all the changes (not just renames) that are contained in commits that have renames, in comparison with: git-diff-tree -r --diff-filter='R' -M shows the same set of changes but the diff output are limited only to renaming changes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 00:44:17 UTC |
| 1290563 | Junio C Hamano | 04 October 2005, 23:45:01 UTC | Add missing documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2005, 00:04:03 UTC |
| b10c1a7 | Junio C Hamano | 04 October 2005, 07:40:59 UTC | Remove useless use of sed in git-format-patch. There was a leftover use of sed that attempted to remove the commit ID output from git-diff-tree, which turned into an expensive no-op when git-diff-tree output header format changed about three months ago. Drop it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2005, 07:40:59 UTC |
| f641339 | Junio C Hamano | 04 October 2005, 06:49:46 UTC | Leave an empty line between log and sign-off. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2005, 06:49:46 UTC |
| e9b2e58 | Junio C Hamano | 04 October 2005, 06:47:19 UTC | Remove unused external-diff script. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2005, 06:47:19 UTC |
| 144c83f | Junio C Hamano | 04 October 2005, 04:57:35 UTC | Merge branch 'fixes' | 04 October 2005, 04:57:35 UTC |
| 70a0c6f | Daniel Barkalow | 04 October 2005, 04:24:55 UTC | [PATCH] Limit the number of requests outstanding in ssh-fetch. This completes fetches if there are more than 100 outstanding requests and there are more to prefetch. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2005, 04:55:31 UTC |
| f5a5e9b | Junio C Hamano | 04 October 2005, 02:11:32 UTC | Avoid compiler warning. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2005, 02:11:32 UTC |
| 0bc4589 | Junio C Hamano | 03 October 2005, 04:40:51 UTC | Make sure get_sha1 does not accept ambiguous sha1 prefix (again). The earlier fix incorrectly dropped the code the original had to ensure the found SHA1 is at least unique within the same pack. Restore the check. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2005, 01:50:06 UTC |
| e1d04f8 | Junio C Hamano | 03 October 2005, 23:26:51 UTC | GIT 0.99.8a Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 23:27:46 UTC |
| 619e5a0 | Junio C Hamano | 03 October 2005, 22:45:44 UTC | git-pull: do not barf on -a flag meant for git-fetch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 22:45:44 UTC |
| df8baa4 | Jonas Fonseca | 03 October 2005, 17:16:30 UTC | [PATCH] Random documentation fixes The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preformatted text wrapped in lines with -----) for examples that span empty lines, so they are put in only one HTML block. - Use '1.' instead of '(1)' for numbered lists. - Fix linking to other GIT docs. - git-rev-list.txt: put option descriptions in an OPTION section. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 20:23:47 UTC |
| 5a82b4f | Junio C Hamano | 03 October 2005, 07:36:13 UTC | Error message from get_sha1() on ambiguous short SHA1. Unlike cases where "no such object exists", the case where specified prefix is ambiguous would confuse the user if we say "no such commit" or such. Give an extra error message from the uniqueness check if there are more than one objects that match the given prefix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 07:36:13 UTC |
| 88f8f0a | Fredrik Kuivinen | 03 October 2005, 06:13:09 UTC | [PATCH] Enable and fix support for base less merges. Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less merge of A and B. [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge. I fixed a small typo in git-merge-resolve fix; 'test' equality check is spelled with single equal sign -- C-style double equal sign is bashism.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 07:25:42 UTC |
| 99a19b4 | Junio C Hamano | 03 October 2005, 04:40:51 UTC | Make sure get_sha1 does not accept ambiguous sha1 prefix. The original code did not even check alternates, and was confused if an unpacked object was uniquely found when there was another object that shares the same prefix in the pack. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 04:40:51 UTC |
| c807f77 | Junio C Hamano | 03 October 2005, 00:29:21 UTC | Fix minor DOS in rev-list. A carefully crafted pathname can be used to disrupt downstream git-pack-objects that uses 'git-rev-list --objects' output. Prevent this. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2005, 00:29:21 UTC |
| 91dd674 | Junio C Hamano | 02 October 2005, 19:56:31 UTC | GIT 0.99.8 GIT already did everything I wanted it to do since mid 0.99.7, and it has almost everything I want it to have now, except a couple of minor tweaks and enhancements. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 23:07:29 UTC |
| a2775c2 | Eric W. Biederman | 02 October 2005, 19:42:57 UTC | [PATCH] Update git-clone documentation The documentation for git-clone is behind the actual command. I have been getting tired of reading the shell script to see what the arguments are so here is an update of the actual documentation. Signed-off-by: Eric Biederman <ebiederman@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 23:06:08 UTC |
| f9d7241 | Junio C Hamano | 02 October 2005, 18:13:44 UTC | Handle really trivial case inside git-merge. Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 18:13:44 UTC |
| 23822a3 | Linus Torvalds | 29 September 2005, 15:16:12 UTC | read-tree: --trivial This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 17:42:46 UTC |
| 500b97e | Fredrik Kuivinen | 02 October 2005, 15:33:38 UTC | [PATCH] Teach git-ls-files about '--' to denote end of options. Useful if you have a file whose name starts with a dash. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 17:31:18 UTC |
| af21511 | Fredrik Kuivinen | 02 October 2005, 15:43:07 UTC | [PATCH] Teach the recursive merge strategy about renames. It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 17:03:00 UTC |
| 7dd4357 | Junio C Hamano | 02 October 2005, 07:50:16 UTC | read-tree: remove --head option. Initially it was to allow specifying more than one remote to allow creation of an Octopus, but it is not being used. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 07:50:16 UTC |
| 0842acf | Junio C Hamano | 02 October 2005, 07:20:45 UTC | Customize git command for installations that lack certain commands. When the platform lacks certain git subcommands, omit them from the list of subcommands that are available from "git" wrapper. Noticed by Geert Bosch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 07:20:45 UTC |
| 18c5a52 | Han Boetes | 01 October 2005, 06:23:26 UTC | [PATCH] git on OpenBSD iconv is installed in /usr/local. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 07:00:53 UTC |
| 5cd5ace | Linus Torvalds | 01 October 2005, 20:39:47 UTC | [PATCH] Re-instate index file write optimization This makes "git-update-index" avoid the new index file write if it didn't make any changes to the index. It still doesn't make things like "git status" be read-only operations in general, but if the index file doesn't need refreshing, it now will at least avoid making unnecessary changes. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:56:16 UTC |
| 5d1a5c0 | Linus Torvalds | 01 October 2005, 20:24:27 UTC | [PATCH] Better error reporting for "git status" Instead of "git status" ignoring (and hiding) potential errors from the "git-update-index" call, make it exit if it fails, and show the error. In order to do this, use the "-q" flag (to ignore not-up-to-date files) and add a new "--unmerged" flag that allows unmerged entries in the index without any errors. This also avoids marking the index "changed" if an entry isn't actually modified, and makes sure that we exit with an understandable error message if the index is corrupt or unreadable. "read_cache()" no longer returns an error for the caller to check. Finally, make die() and usage() exit with recognizable error codes, if we ever want to check the failure reason in scripts. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:55:47 UTC |
| 455a7f3 | Junio C Hamano | 30 September 2005, 20:31:16 UTC | More portability. - The location of openssl development files got customizable. - The location of iconv development files got customizable. - Pass $TAR down to t5000 test so that the user can override with 'gmake TAR=gtar'. - Solaris 'bc' does not seem to grok "define abs()". There is no reason to use bc there -- expr would do. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 02 October 2005, 06:19:48 UTC |
| 8098a17 | Junio C Hamano | 30 September 2005, 21:26:57 UTC | Add git-symbolic-ref This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 02 October 2005, 06:19:33 UTC |
| a876ed8 | Junio C Hamano | 30 September 2005, 21:08:25 UTC | Use resolve_ref() to implement read_ref(). Symbolic refs are understood by resolve_ref(), so existing read_ref() users will automatically understand them as well. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 02 October 2005, 06:19:33 UTC |
| ca8db14 | Linus Torvalds | 25 September 2005, 16:59:37 UTC | [PATCH] Allow reading "symbolic refs" that point to other refs This extends the ref reading to understand a "symbolic ref": a ref file that starts with "ref: " and points to another ref file, and thus introduces the notion of ref aliases. This is in preparation of allowing HEAD to eventually not be a symlink, but one of these symbolic refs instead. [jc: Linus originally required the prefix to be "ref: " five bytes and nothing else, but I changed it to allow and strip any number of leading whitespaces to match what update-ref.c does.] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:19:32 UTC |
| 9b143c6 | Junio C Hamano | 26 September 2005, 02:30:24 UTC | Teach update-ref about a symbolic ref stored in a textfile. A symbolic ref is a regular file whose contents is "ref:", followed by optional leading whitespaces, followed by a GIT_DIR relative pathname, followed by optional trailing whitespaces (the optional whitespaces are unconditionally removed, so you cannot have leading nor trailing whitespaces). This can be used in place of a traditional symbolic link .git/HEAD that usually points at "refs/heads/master". You can instead have a regular file .git/HEAD whose contents is "ref: refs/heads/master". [jc: currently the code does not enforce the symbolic ref to begin with refs/, unlike the symbolic link case. It may be worthwhile to require either case to begin with refs/ and not have any /./ nor /../ in them.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:19:32 UTC |
| ed1aadf | Linus Torvalds | 29 September 2005, 21:35:15 UTC | [PATCH] git fetch --tags You can do git fetch --tags <linus-kernel-repo> and it should fetch all my tags automatically. [jc: The original by Linus fetched and overwrote branch heads with --all, which felt dangerous and wrong, so I removed it. Also this version does not use any refs that resulted as --tags for later merge. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:18:38 UTC |
| 4fa2197 | Nick Hengeveld | 30 September 2005, 23:27:47 UTC | [PATCH] HTTP partial transfer support fix. Don't unlink the temp file when an object transfer fails, so next attempt will pick up where the failed transfer left off Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:17:15 UTC |
| 271421c | Junio C Hamano | 30 September 2005, 07:07:39 UTC | Update partial HTTP transfers. Add the sanity checks discussed on the list with Nick Hengeveld in <20050927000931.GA15615@reactrix.com>. * unlink of previous and rename from temp to previous can fail for reasons other than benign ones (missing previous and missing temp). Report these failures when we encounter them, to make diagnosing problems easier. * when rewinding the partially written result, make sure to truncate the file. Also verify the pack after downloading by calling verify_packfile(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:17:14 UTC |
| 49a0f24 | Nick Hengeveld | 28 September 2005, 17:14:04 UTC | [PATCH] HTTP partial transfer support for object, pack, and index transfers HTTP partial transfer support for object, pack, and index transfers [jc: this should not be placed in "master" -- it does not have any fixes requested on the list.] Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:17:14 UTC |
| 94c2334 | Junio C Hamano | 30 September 2005, 08:48:57 UTC | Pass CVSps generated A U Thor <author@domain.xz> intact. Alexey Nezhdanov updated CVSps to generate author-name and author-email information in its output. If the input looks like it has that already properly formatted, use that without our own munging. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:15:23 UTC |
| 37f15d5 | Martin Langhoff | 30 September 2005, 07:15:12 UTC | [PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer messages. archimport was refusing to import commits that had merges from repositories that it didn't know about. Fixed. Also brings in nicer messages. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:14:48 UTC |
| 38ec15a | Junio C Hamano | 01 October 2005, 19:01:07 UTC | Honor extractor's umask in git-tar-tree. The archive generated with git-tar-tree had 0755 and 0644 mode bits. This inconvenienced the extractor with umask 002 by robbing g+w bit unconditionally. Just write it out with loose permissions bits and let the umask of the extractor do its job. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:14:06 UTC |
| f8d839a | Junio C Hamano | 01 October 2005, 18:58:43 UTC | Honor user's umask. Fix the last two holdouts that forced mode bits stricter than the user's umask. Noticed by Wolfgang Denk and fixed by Linus. [jc: applied the same fix to mailsplit just for the sake of consistency.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 October 2005, 18:58:43 UTC |
| 1fea629 | Linus Torvalds | 01 October 2005, 06:25:23 UTC | [PATCH] Flag empty patches as errors A patch that contains no actual diff, and that doesn't change any meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't just accept it. This caused a corrupted patch to be silently applied as an empty change in the kernel, because the corruption ended up making the patch look empty. An example of such a patch is one that contains the patch header, but where the initial fragment header (the "@@ -nr,.." line) is missing, causing us to not parse any fragments. The real "patch" program will also flag such patches as bad, with the message patch: **** Only garbage was found in the patch input. and we should do likewise. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 October 2005, 06:52:48 UTC |
| 88cd621 | Junio C Hamano | 30 September 2005, 21:02:47 UTC | Consolidate null_sha1[]. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 01 October 2005, 05:12:01 UTC |
| 894a8a8 | Junio C Hamano | 30 September 2005, 07:27:11 UTC | Still installing the old command names. After seeing Jeff's guide, I changed my mind about the big-rename transition plan. Even if Porcelains are kept up to date, those web documents that describes older world order would live longer and people will stumble across them via google searches. And who knows how many mirrored copies there are. The backward compatible symbolic links *will* be removed before 1.0. But that will not happen in 0.99.8. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 07:27:11 UTC |
| 264b16b | Junio C Hamano | 30 September 2005, 07:09:04 UTC | Tell which packfile is corrupt when we die. The core part detected and died upon seeing a corrupted packfile, but did not help the user by telling which packfile is corrupt and how. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 07:09:04 UTC |
| cdda474 | Pavel Roskin | 29 September 2005, 20:53:14 UTC | [PATCH] Make logerror() and loginfo() static Make logerror() and loginfo() static logerror() and loginfo() in daemon.c are never declared and never called from other files, therefore they should be declared static. Found by sparse. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 05:47:40 UTC |
| 7d167fe | Johannes Schindelin | 29 September 2005, 16:19:50 UTC | [PATCH] Old curl does not know about CURLOPT_SSLKEY ... so try to set it only in later versions. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 05:47:37 UTC |
| 60fb5b2 | Junio C Hamano | 26 September 2005, 02:43:51 UTC | Use git-merge in git-pull (second try). This again makes git-pull to use git-merge, so that different merge strategy can be specified from the command line. Without explicit strategy parameter, it defaults to git-merge-resolve if only one remote is pulled, and git-merge-octopus otherwise, to keep the default behaviour of the command the same as the original. Also this brings another usability measure: -n flag from the command line, if given, is passed to git-merge to prevent it from running the diffstat at the end of the merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2005, 07:24:41 UTC |
| bf7960e | Junio C Hamano | 28 September 2005, 01:14:27 UTC | Use git-update-ref in scripts. This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:42:44 UTC |
| a7928f8 | Peter Hagervall | 28 September 2005, 12:04:54 UTC | [PATCH] Make some needlessly global stuff static Insert 'static' where appropriate. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:38:52 UTC |
| 5acb6de | Nick Hengeveld | 27 September 2005, 17:45:27 UTC | [PATCH] Support for more CURL SSL settings via environment variables Added support for additional CURL SSL settings via environment variables. Client certificate/key files can be specified as well as alternate CA information. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:38:51 UTC |
| 49c188f | Tom Prince | 27 September 2005, 07:06:05 UTC | [PATCH] Add new programs to .gitignore. Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:38:50 UTC |
| 60fa056 | Junio C Hamano | 28 September 2005, 23:29:11 UTC | Fastpath the normal case by not checking that index matches HEAD. The merge strategy would check this itself and typically does it by using git-read-tree -m -u 3-way merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:29:11 UTC |
