1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 22:44:49 +01:00
Commit graph

2011 commits

Author SHA1 Message Date
Junio C Hamano
5a2e04d203 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>
2005-10-15 17:14:09 -07:00
Junio C Hamano
48bc2fb0cd 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>
2005-10-15 17:10:14 -07:00
Junio C Hamano
652d5dc6c0 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>
2005-10-15 17:10:14 -07:00
Junio C Hamano
494245d6d1 Revert "Adapt tutorial to cygwin and add test case"
This reverts 2ae6c70674 commit.
2005-10-15 17:03:32 -07:00
Junio C Hamano
b67b9b2034 Revert "tutorial: update the initial commit example."
This reverts 5990efb0c4 commit.
2005-10-15 17:03:30 -07:00
Junio C Hamano
2482d7d0ec Merge branch 'fixes' 2005-10-15 11:23:28 -07:00
Junio C Hamano
5990efb0c4 tutorial: update the initial commit example.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-13 11:57:05 -07:00
Johannes Schindelin
2ae6c70674 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>
2005-10-13 11:36:37 -07:00
Ralf Baechle
257380896f 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>
2005-10-13 10:01:38 -07:00
Junio C Hamano
7882213298 Merge branch 'fixes' 2005-10-11 22:04:19 -07:00
Martin Langhoff
df73e9c62a [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>
2005-10-11 21:57:04 -07:00
Junio C Hamano
e858862fd9 Merge branch 'fixes' 2005-10-10 16:17:02 -07:00
Johannes Schindelin
18e410f1ea 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>
2005-10-10 14:14:22 -07:00
Jonas Fonseca
d9c74a808e 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>
2005-10-10 14:14:06 -07:00
Johannes Schindelin
d52920e397 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>
2005-10-10 13:58:52 -07:00
Junio C Hamano
5fb41e8abf OpenBSD needs the strcasestr replacement.
Noticed by Randal L. Schwartz.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-10 11:51:11 -07:00
Junio C Hamano
899460f336 Also force LC_ALL in test scripts.
Noticed by Junichi Uekawa.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09 21:58:02 -07:00
Junio C Hamano
32e49d5d1c GIT 0.99.8c
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09 19:19:36 -07:00
Junio C Hamano
2af60a0521 Merge branch 'fixes' 2005-10-09 19:17:43 -07:00
Junio C Hamano
fb8024b414 git-tag: update usage string and documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09 19:13:47 -07:00
Kai Ruemmler
9fabdedc0e 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>
2005-10-09 16:52:50 -07:00
Paolo 'Blaisorblade' Giarrusso
5a6850e8aa 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>
2005-10-09 16:50:34 -07:00
Junio C Hamano
8c51242873 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>
2005-10-09 02:58:35 -07:00
Junio C Hamano
e1e9c25466 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>
2005-10-08 14:54:41 -07:00
Junio C Hamano
305a5c78bf Merge branch 'fixes' 2005-10-07 17:08:56 -07:00
Kai Ruemmler
33bb218e9d 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>
2005-10-07 16:55:00 -07:00
robfitz@273k.net
ab1630a3ed 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>
2005-10-07 16:54:06 -07:00
Kai Ruemmler
ab1824787d 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>
2005-10-07 14:05:03 -07:00
Jonas Fonseca
babfaba23d 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>
2005-10-05 16:56:31 -07:00
Junio C Hamano
8b1f8d04c9 GIT 0.99.8b
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05 15:41:49 -07:00
Junio C Hamano
952f87a6ca Merge branch 'fixes' 2005-10-05 15:33:58 -07:00
Junio C Hamano
4cfc63db1d 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>
2005-10-05 15:29:48 -07:00
Christian Meder
f73ae1fc5d 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>
2005-10-05 15:08:26 -07:00
Junio C Hamano
e091eb9325 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>
2005-10-05 14:49:54 -07:00
Santi_Béjar
df34297af1 [PATCH] Quote the missing GIT_DIR.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05 11:23:23 -07:00
Jonas Fonseca
85912b0673 [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>
2005-10-05 10:50:59 -07:00
Alex Riesen
d6e548d61f [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>
2005-10-05 10:50:57 -07:00
Junio C Hamano
0b34379a8d 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>
2005-10-04 17:44:17 -07:00
Junio C Hamano
129056370a Add missing documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04 17:04:03 -07:00
Junio C Hamano
b10c1a74f0 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>
2005-10-04 00:40:59 -07:00
Junio C Hamano
f6413391b1 Leave an empty line between log and sign-off.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03 23:49:46 -07:00
Junio C Hamano
e9b2e58618 Remove unused external-diff script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03 23:47:19 -07:00
Junio C Hamano
144c83f687 Merge branch 'fixes' 2005-10-03 21:57:35 -07:00
Daniel Barkalow
70a0c6fe39 [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>
2005-10-03 21:55:31 -07:00
Junio C Hamano
f5a5e9b9f4 Avoid compiler warning.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03 19:11:32 -07:00
Junio C Hamano
0bc4589020 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>
2005-10-03 18:50:06 -07:00
Junio C Hamano
e1d04f8aad GIT 0.99.8a
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03 16:27:46 -07:00
Junio C Hamano
619e5a0ed4 git-pull: do not barf on -a flag meant for git-fetch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03 15:45:44 -07:00
Jonas Fonseca
df8baa42fe [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>
2005-10-03 13:23:47 -07:00
Junio C Hamano
5a82b4fb3e 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>
2005-10-03 00:36:13 -07:00