summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-10-15GIT v0.99.8dv0.99.8dJunio C Hamano
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>
2005-10-15Introduce notation "ref^{type}".Junio C Hamano
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>
2005-10-15Ignore funny refname sent from remoteJunio C Hamano
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>
2005-10-15Refuse to create funny refs in clone-pack, git-fetch and receive-pack.Junio C Hamano
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>
2005-10-15git-check-ref-format: reject funny ref names.Junio C Hamano
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>
2005-10-15Revert "Adapt tutorial to cygwin and add test case"Junio C Hamano
This reverts 2ae6c706749b44f05917fcd04037f545d16fb345 commit.
2005-10-15Revert "tutorial: update the initial commit example."Junio C Hamano
This reverts 5990efb0c4f6d1a19c4702bf50ef8cc5ac902a78 commit.
2005-10-15Merge branch 'fixes'Junio C Hamano
2005-10-13tutorial: update the initial commit example.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-13Adapt tutorial to cygwin and add test caseJohannes Schindelin
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>
2005-10-13rsh.c: typo fixRalf Baechle
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>
2005-10-11Merge branch 'fixes'Junio C Hamano
2005-10-11[PATCH] cvsimport: don't pass --cvs-direct if user options contradict usMartin Langhoff
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>
2005-10-10Merge branch 'fixes'Junio C Hamano
2005-10-10t5400-send-pack relies on a working cpioJohannes Schindelin
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>
2005-10-10git.sh: quote all pathsJonas Fonseca
This makes it handle spaces in paths. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-10Teach git-status about spaces in file names also on MacOSXJohannes Schindelin
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>
2005-10-10OpenBSD needs the strcasestr replacement.Junio C Hamano
Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09Also force LC_ALL in test scripts.Junio C Hamano
Noticed by Junichi Uekawa. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09GIT 0.99.8cv0.99.8cJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09Merge branch 'fixes'Junio C Hamano
2005-10-09git-tag: update usage string and documentation.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09ignore new git-diff index header when computing patch idsKai Ruemmler
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>
2005-10-09Fix git-verify-tag for light-weight tagsPaolo 'Blaisorblade' Giarrusso
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>
2005-10-09Make sure 'make install' does not have to rebuild templates.Junio C Hamano
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>
2005-10-08Give proper prototype to gitstrcasestr.Junio C Hamano
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>
2005-10-07Merge branch 'fixes'Junio C Hamano
2005-10-07teach git-status about spaces in filenamesKai Ruemmler
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>
2005-10-07Fix wrong filename listing bug in git-ls-tree.robfitz@273k.net
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>
2005-10-07s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txtKai Ruemmler
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>
2005-10-05Fix usage of carets in git-rev-parse(1)Jonas Fonseca
... but using a {caret} attribute. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05GIT 0.99.8bv0.99.8bJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05Merge branch 'fixes'Junio C Hamano
2005-10-05clone-pack: use create_symref() instead of raw symlink.Junio C Hamano
This was the last instance of symlink() in coreish part. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05Some typos and light editing of various manpagesChristian Meder
Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05upload-pack: Do not choke on too many heads request.Junio C Hamano
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>
2005-10-05[PATCH] Quote the missing GIT_DIR.Santi_Béjar
Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05[PATCH] Fix symbolic ref validationJonas Fonseca
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>
2005-10-05[PATCH] hold_index_file_for_update should not unlink failed to open .lock ↵Alex Riesen
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>
2005-10-04Fix diff-filter All-Or-None mark.Junio C Hamano
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>
2005-10-04Add missing documentation.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04Remove useless use of sed in git-format-patch.Junio C Hamano
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>
2005-10-03Leave an empty line between log and sign-off.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Remove unused external-diff script.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Merge branch 'fixes'Junio C Hamano
2005-10-03[PATCH] Limit the number of requests outstanding in ssh-fetch.Daniel Barkalow
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>
2005-10-03Avoid compiler warning.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Make sure get_sha1 does not accept ambiguous sha1 prefix (again).Junio C Hamano
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>
2005-10-03GIT 0.99.8av0.99.8aJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>