Junio C Hamano [Tue, 27 Dec 2005 02:45:30 +0000 (18:45 -0800)]
Merge fixes up to GIT 1.0.5
Junio C Hamano [Tue, 27 Dec 2005 02:44:15 +0000 (18:44 -0800)]
GIT 1.0.5
Minor fixes.
Starting from this one I won't be touching debian/ directory
since the official maintainer seems to be reasonably quick to
package up things. The packaging procedure used there seems to
be quite different from what I have, so I'd like to avoid
potential confusion and reduce work by the official maintainer
and myself.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 26 Dec 2005 21:31:42 +0000 (22:31 +0100)]
Handle symlinks graciously
This patch converts a stat() to an lstat() call, thereby fixing the case
when the date of a symlink was not the same as the one recorded in the
index. The included test case demonstrates this.
This is for the case that the symlink points to a non-existing file. If
the file exists, worse things than just an error message happen.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 27 Dec 2005 02:23:41 +0000 (18:23 -0800)]
t5300: avoid false failures.
Johannes found that the test has 1/256 chance of falsely
producing an uncorrupted idx file, causing the check to detect
corruption fail. Now we have 1/2^160 chance of false failure
;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 26 Dec 2005 20:34:56 +0000 (12:34 -0800)]
avoid asking ?alloc() for zero bytes.
Avoid asking for zero bytes when that change simplifies overall
logic. Later we would change the wrapper to ask for 1 byte on
platforms that return NULL for zero byte request.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Sat, 24 Dec 2005 12:12:43 +0000 (04:12 -0800)]
short circuit out of a few places where we would allocate zero bytes
dietlibc versions of malloc, calloc and realloc all return NULL if
they're told to allocate 0 bytes, causes the x* wrappers to die().
There are several more places where these calls could end up asking
for 0 bytes, too...
Maybe simply not die()-ing in the x* wrappers if 0/NULL is returned
when the requested size is zero is a safer and easier way to go.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 26 Dec 2005 07:30:15 +0000 (23:30 -0800)]
Merge branch 'jc/checkout'
Junio C Hamano [Fri, 23 Dec 2005 23:27:18 +0000 (15:27 -0800)]
Tutorial: mention shared repository management.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 22 Dec 2005 22:19:37 +0000 (23:19 +0100)]
git-init-db: initialize shared repositories with --shared
Now you can say
git-init-db --shared
if you want other users to be able to push into that repository.
[jc: info/ and objects/info/ need to be group writable if the
repository is shared --- otherwise packs and refs files cannot
be updated.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 22 Dec 2005 22:13:56 +0000 (23:13 +0100)]
Introduce core.sharedrepository
If the config variable 'core.sharedrepository' is set, the directories
$GIT_DIR/objects/
$GIT_DIR/objects/??
$GIT_DIR/objects/pack
$GIT_DIR/refs
$GIT_DIR/refs/heads
$GIT_DIR/refs/heads/tags
are set group writable (and g+s, since the git group may be not the primary
group of all users).
Since all files are written as lock files first, and then moved to
their destination, they do not have to be group writable. Indeed, if
this leads to problems you found a bug.
Note that -- as in my first attempt -- the config variable is set in the
function which checks the repository format. If this were done in
git_default_config instead, a lot of programs would need to be modified
to call git_config(git_default_config) first.
[jc: git variables should be in environment.c unless there is a
compelling reason to do otherwise.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 24 Dec 2005 08:16:56 +0000 (00:16 -0800)]
Merge fixes up to GIT 1.0.4
Junio C Hamano [Sat, 24 Dec 2005 08:02:08 +0000 (00:02 -0800)]
GIT 1.0.4
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 24 Dec 2005 07:56:52 +0000 (23:56 -0800)]
mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
This was a stupid typo that did not follow
http://www.iana.org/assignments/character-sets
Long noticed but neglected by JC, but finally reported by
Marco.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 23:51:33 +0000 (15:51 -0800)]
ls-files --full-name: usage string and documentation.
Somehow this option was not mentioned anywhere in the
documentation nor the usage string.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 23:48:09 +0000 (15:48 -0800)]
merge --no-commit: tweak message
We did not distinguish the case the user asked not to make a
commit with --no-commit flag and the automerge failed. Tell
these cases apart and phrase dying message differently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 00:01:46 +0000 (16:01 -0800)]
git-clone: do not special case dumb http.
Underlying http-fetch is supposed to be capable of handling
packed repositories just fine, so no need to special case it in
the wrapper script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 20:47:18 +0000 (12:47 -0800)]
show-branch: usability updates.
This does three things:
. It simplifies the logic to handle the case in which no
refs are given on the command line, and fixes the bug
when only "--heads" is specified. Earlier we showed
them twice.
. It avoids to add the same ref twice.
. It sorts the glob result (e.g. "git show-branch
'tags/v1.0*'") according to a more version friendly
sort order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 06:57:20 +0000 (22:57 -0800)]
check_packed_git_idx(): check integrity of the idx file itself.
Although pack-check.c had routine to verify the checksum for the
pack index file itself, the core did not check it before using
it.
This is stolen from the patch to tighten packname requirements.
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from
797bd6f490c91c07986382b9f268e0df712cb246 commit)
Junio C Hamano [Fri, 23 Dec 2005 22:10:16 +0000 (14:10 -0800)]
Adjust to ls-tree --full-name when run from a subdirectory.
A proposed change to show cwd relative paths by default from
ls-tree when run from a subdirectory means we would need to
give --full-name option to it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 21:39:30 +0000 (13:39 -0800)]
ls-tree: chomp leading directories when run from a subdirectory
When run from a subdirectory, even though we filtered the output
based on where we were using pathspec, we wrote out the
repository relative paths, not subtree relative paths. This
changes things so that it shows only the current subdirectory
relative paths.
For example, in Documentation subdirectory of git itself, this
used to be the case:
$ git-ls-tree --name-only HEAD | grep how
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/howto-index.sh
Documentation/howto
But now it does this instead:
$ git-ls-tree --name-only HEAD | grep how
git-show-branch.txt
git-show-index.txt
howto-index.sh
howto
There are two things to keep in mind.
1. This shows nothing.
$ git-ls-tree --name-only HEAD ../ppc/
This is to make things consistent with ls-files, which
refuses relative path that goes uplevel.
2. These show things in full repository relative paths. In this
case, paths outside the current subdirectory are also shown.
$ git-ls-tree --name-only --full-name HEAD | grep how
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/howto-index.sh
Documentation/howto
$ git-ls-tree --name-only --full-name HEAD ../ppc/
ppc/sha1.c
ppc/sha1.h
ppc/sha1ppc.S
The flag --full-name gives the same behaviour as 1.0, so it
ought to be the default if we really care about the backward
compatibility, but in practice no Porcelain runs ls-tree from a
subdirectory yet, and without --full-name is more human
friendly, so hopefully the default being not --full-name would
be acceptable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 06:37:50 +0000 (22:37 -0800)]
checkout: sometimes work from a subdirectory.
git-checkout does two very different things, and what they
should do when run from subdirectory are quite different.
It does not make any sense to run the one that switches the
current head from anywhere other than the toplevel:
git-checkout [-f] <branch>
git-checkout [-b <branch>] <committish>
We could of course chdir to top and do the whole-tree checkout
in git-checkout, but the point is the operation does not make
sense on a partial tree. The whole tree is checked out.
The other form is to update the index file and working tree file
selectively:
git-checkout <treeish> <file>... ;# out of tree to index and file
git-checkout -- <file>... ;# out of index to file
This form _does_ make sense to run from subdirectory; and I
myself often wish we supported this.
So here is a patch to do both.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 06:57:20 +0000 (22:57 -0800)]
check_packed_git_idx(): check integrity of the idx file itself.
Although pack-check.c had routine to verify the checksum for the
pack index file itself, the core did not check it before using
it.
This is stolen from the patch to tighten packname requirements.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 06:35:38 +0000 (22:35 -0800)]
rev-parse: --show-cdup
When --show-prefix is useful, sometimes it is easier to cd up to
the toplevel of the tree. This is equivalent to:
git rev-parse --show-prefix | sed -e 's|[^/][^/]*|..|g'
but we do not have to invoke sed for that.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 02:19:03 +0000 (18:19 -0800)]
Merge in fixes up to 1.0.3 maintenance branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 23 Dec 2005 02:14:31 +0000 (18:14 -0800)]
GIT 1.0.3
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 22 Dec 2005 22:37:24 +0000 (23:37 +0100)]
git-clone: Support changing the origin branch with -o
Earlier, git-clone stored upstream's master in the branch named 'origin',
possibly overwriting an existing such branch.
Now you can change it by calling git-clone with '-o <other_name>'.
[jc: added ref format check, subdirectory safety, documentation
and usage string.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 22 Dec 2005 17:55:59 +0000 (18:55 +0100)]
sha1_to_hex: properly terminate the SHA1
sha1_to_hex() returns a pointer to a static buffer. Some of its users
modify that buffer by appending a newline character. Other users rely
on the fact that you can call
printf("%s", sha1_to_hex(sha1));
Just to be on the safe side, terminate the SHA1 in sha1_to_hex().
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld [Thu, 22 Dec 2005 17:09:05 +0000 (09:09 -0800)]
Fix for http-fetch from file:// URLs
Recognize missing files when using http-fetch with file:// URLs
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 22 Dec 2005 19:38:23 +0000 (20:38 +0100)]
git-format-patch should show the correct version
We want to record the version of the tools the patch was generated with.
While these tools could be rebuilt, git-format-patch stayed the same and
report the wrong version.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 22 Dec 2005 20:39:39 +0000 (12:39 -0800)]
send-pack: reword non-fast-forward error message.
Wnen refusing to push a head, we said cryptic "remote 'branch'
object X does not exist on local" or "remote ref 'branch' is not
a strict subset of local ref 'branch'". That was gittish.
Since the most likely reason this happens is because the pushed
head was not up-to-date, clarify the error message to say that
straight, and suggest pulling first.
First noticed by Johannes and seconded by Andreas.
Signed-off-by: Junio C Hamano <junkio@cox.net>
YOSHIFUJI Hideaki / 吉藤英明 [Wed, 21 Dec 2005 10:23:42 +0000 (19:23 +0900)]
GIT: Support [address] in URLs
Allow IPv6address/IPvFuture enclosed by [] in URLs, like:
git push '[3ffe:ffff:...:1]:GIT/git'
or
git push 'ssh://[3ffe:ffff:...:1]/GIT/git'
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 22 Dec 2005 06:25:00 +0000 (22:25 -0800)]
whatchanged: customize diff-tree output
This allows the configuration item whatchanged.difftree to
control the output from git-whatchanged command. For example:
[whatchanged]
difftree = --pretty=fuller --name-status -M
does rename detection, shows the commit header in "fuller"
format and lists affected pathnames and the kind of changes to
them.
When no such configuration item exists, the output format
defaults to "--pretty -M --abbrev".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 22 Dec 2005 07:48:31 +0000 (23:48 -0800)]
Merge branch 'fixes'
Alex Riesen [Thu, 15 Dec 2005 07:47:30 +0000 (08:47 +0100)]
\n usage in stderr output
fprintf and die sometimes have missing/excessive "\n" in their arguments,
correct the strings where I think it would be appropriate.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström [Tue, 20 Dec 2005 20:05:54 +0000 (21:05 +0100)]
git-pack-redundant: speed and memory usage improvements
Slab allocation of llist entries gives some speed improvements.
Not computing the pack_list permutaions all at once reduces memory
usage greatly on repositories with many packs.
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 12 Dec 2005 00:44:05 +0000 (16:44 -0800)]
merge-recursive: conflicting rename case.
This changes the way the case two branches rename the same path
to different paths is handled. Earlier, the code removed the
original path and added both destinations to the index at
stage0. This commit changes it to leave the original path at
stage1, and two destination paths at stage2 and stage3,
respectively.
[jc: I am not really sure if this makes much difference in the
real life merge situations. What should happen when our branch
renames A to B and M to N, while their branch renames A to M?
That is, M remains in our tree as is.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 22 Dec 2005 06:33:37 +0000 (22:33 -0800)]
Versioning scheme changes.
HPA suggests it is simply silly to imitate Linux versioning
scheme where the leading "2" does not mean anything anymore, and
I tend to agree.
The first feature release after 1.0.0 will be 1.1.0, and the
development path leading to 1.1.0 will carry 1.0.GIT as the
version number from now on. Similarly, the third maintenance
release that follows 1.0.0 will not be 1.0.0c as planned, but
will be called 1.0.3. The "maint" branch will merge in fixes
and immediately tagged, so there is no need for 1.0.2.GIT that
is in between 1.0.2 (aka 1.0.0b) and 1.0.3.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Wed, 21 Dec 2005 23:47:09 +0000 (18:47 -0500)]
sanity check in add_packed_git()
add_packed_git() tries to get the pack SHA1 by parsing its name. It may
access uninitialized memory for packs with short names.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 22:00:47 +0000 (14:00 -0800)]
Merge branch 'fixes'
Junio C Hamano [Wed, 21 Dec 2005 21:51:51 +0000 (13:51 -0800)]
GIT 1.0.0b
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 21:48:47 +0000 (13:48 -0800)]
server-info: skip empty lines.
Now we allow an empty line in objects/info/packs file, recognize
that and stop complaining.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Wed, 21 Dec 2005 20:35:48 +0000 (15:35 -0500)]
[PATCH] quote.c: Make loop control more readable.
quote_c_style_counted() in quote.c uses a hard-to-read construct.
Convert this to a more traditional form of the for loop.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 21:17:54 +0000 (13:17 -0800)]
GIT 1.0.0a
- Avoid misleading success message on error (Johannes)
- objects/info/packs: work around bug in http-fetch.c::fetch_indices()
- http-fetch.c: fix objects/info/pack parsing.
- An off-by-one bug found by valgrind (Pavel)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin [Wed, 21 Dec 2005 20:35:48 +0000 (15:35 -0500)]
An off-by-one bug found by valgrind
Insufficient memory is allocated in index-pack.c to hold the *.idx name.
One more byte should be allocated to hold the terminating 0.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Wed, 21 Dec 2005 16:53:29 +0000 (17:53 +0100)]
Avoid misleading success message on error
When a push fails (for example when the remote head does not fast forward
to the desired ref) it is not correct to print "Everything up-to-date".
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 20:10:10 +0000 (12:10 -0800)]
http-fetch.c: fix objects/info/pack parsing.
It failed to register the last pack in the objects/info/packs
file. Also it had an independent overrun error.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 20:09:17 +0000 (12:09 -0800)]
objects/info/packs: work around bug in http-fetch.c::fetch_indices()
The code to fetch pack index files in deployed clients have a
bug that causes it to ignore the pack file on the last line of
objects/info/packs file, so append an empty line to work it
around.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 20:12:26 +0000 (12:12 -0800)]
Post 1.0.0 development track.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 08:01:00 +0000 (00:01 -0800)]
GIT 1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 21 Dec 2005 02:13:02 +0000 (18:13 -0800)]
Make "git-send-pack" less verbose by default
It used to make sense to have git-send-pack talk about the things it sent
when (a) it was a new program and (b) nobody had a lot of tags and
branches.
These days, it's just distracting to see tons of
'refs/tags/xyz': up-to-date
...
when updating a remote repo.
So shut it up by default, and add a "--verbose" flag for those who really
want to see it.
Also, since this makes he case of everything being up-to-date just totally
silent, make it say "Everything up-to-date" if no refs needed updating.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 21 Dec 2005 04:54:28 +0000 (20:54 -0800)]
A shared repository should be writable by members.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 22:18:47 +0000 (14:18 -0800)]
ce_smudge_racily_clean_entry: explain why it works.
This is a tricky code and warrants extra commenting. I wasted
30 minutes trying to break it until I realized why it works.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 20:12:18 +0000 (12:12 -0800)]
Racy GIT (part #2)
The previous round caught the most trivial case well, but broke
down once index file is updated again. Smudge problematic
entries (they should be very few if any under normal interactive
workflow) before writing a new index file out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 08:02:15 +0000 (00:02 -0800)]
Racy GIT
This fixes the longstanding "Racy GIT" problem, which was pretty
much there from the beginning of time, but was first
demonstrated by Pasky in this message on October 24, 2005:
http://marc.theaimsgroup.com/?l=git&m=
113014629716878
If you run the following sequence of commands:
echo frotz >infocom
git update-index --add infocom
echo xyzzy >infocom
so that the second update to file "infocom" does not change
st_mtime, what is recorded as the stat information for the cache
entry "infocom" exactly matches what is on the filesystem
(owner, group, inum, mtime, ctime, mode, length). After this
sequence, we incorrectly think "infocom" file still has string
"frotz" in it, and get really confused. E.g. git-diff-files
would say there is no change, git-update-index --refresh would
not even look at the filesystem to correct the situation.
Some ways of working around this issue were already suggested by
Linus in the same thread on the same day, including waiting
until the next second before returning from update-index if a
cache entry written out has the current timestamp, but that
means we can make at most one commit per second, and given that
the e-mail patch workflow used by Linus needs to process at
least 5 commits per second, it is not an acceptable solution.
Linus notes that git-apply is primarily used to update the index
while processing e-mailed patches, which is true, and
git-apply's up-to-date check is fooled by the same problem but
luckily in the other direction, so it is not really a big issue,
but still it is disturbing.
The function ce_match_stat() is called to bypass the comparison
against filesystem data when the stat data recorded in the cache
entry matches what stat() returns from the filesystem. This
patch tackles the problem by changing it to actually go to the
filesystem data for cache entries that have the same mtime as
the index file itself. This works as long as the index file and
working tree files are on the filesystems that share the same
monotonic clock. Files on network mounted filesystems sometimes
get skewed timestamps compared to "date" output, but as long as
working tree files' timestamps are skewed the same way as the
index file's, this approach still works. The only problematic
files are the ones that have the same timestamp as the index
file's, because two file updates that sandwitch the index file
update must happen within the same second to trigger the
problem.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 05:55:12 +0000 (21:55 -0800)]
format-patch: make sure header and body are separated.
Since log message in a commit object is defined to be binary
blob, it could be something without an empty line between the
title line and the body text. Be careful to format such into
a form suitable for e-mail submission. There must be an empty
line between the headers and the body.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 18 Dec 2005 10:03:15 +0000 (02:03 -0800)]
diff --abbrev: document --abbrev=<n> form.
It was implemented there but was not advertised.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 14 Dec 2005 01:21:41 +0000 (17:21 -0800)]
diff: --abbrev option
When I show transcripts to explain how something works, I often
find myself hand-editing the diff-raw output to shorten various
object names in the output.
This adds --abbrev option to the diff family, which shortens
diff-raw output and diff-tree commit id headers.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 00:18:28 +0000 (16:18 -0800)]
xread/xwrite: do not worry about EINTR at calling sites.
We had errno==EINTR check after read(2)/write(2) sprinkled all
over the places, always doing continue. Consolidate them into
xread()/xwrite() wrapper routines.
Credits for suggestion goes to HPA -- bugs are mine.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 02:27:04 +0000 (18:27 -0800)]
tests: make scripts executable
just for consistency.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 02:03:31 +0000 (18:03 -0800)]
Remove "octopus".
We still advertise "git resolve" as a standalone command, but never
"git octopus", so nobody should be using it and it is safe to
retire it. The functionality is still available as a strategy
backend.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 02:02:20 +0000 (18:02 -0800)]
Remove unused cmd-rename.sh
This file is a remnant from the big command rename which happened
quite some time ago.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 01:59:58 +0000 (17:59 -0800)]
Remove generated files */*.py[co]
We missed ones in the compat/ subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 00:35:48 +0000 (16:35 -0800)]
Documentation: stdout of update-hook is connected to /dev/null
Mention that update-hook does not emit its stdout to the sender.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 20 Dec 2005 00:16:49 +0000 (16:16 -0800)]
rev-list --objects: fix object list without commit.
Earlier, "rev-list --objects <sha1>" for an object chain that
does not have any commit failed with a usage message. This
fixes "send-pack remote $tag" where tag points at a non-commit
(e.g. a blob).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Mon, 19 Dec 2005 01:23:50 +0000 (17:23 -0800)]
Documentation/git-archimport: document -o, -a, f, -D options
Also, ensure usage help switches are in the same order.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 19 Dec 2005 08:31:08 +0000 (00:31 -0800)]
howto/using-topic-branches: Recommend public URL git://git./
Recommending this means subsystem maintainers do not have to log-in
just to resync with upstream.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sun, 18 Dec 2005 20:41:10 +0000 (12:41 -0800)]
Make "git help" sort git commands in columns
This changes "pretty_print_string_list()" to show the git commands
alphabetically in column order, which is the normal one.
Ie instead of doing
git commands available in '/home/torvalds/bin'
----------------------------------------------
add am ...
applypatch archimport ...
cat-file check-ref-format ...
...
it does
git commands available in '/home/torvalds/bin'
----------------------------------------------
add diff-tree ...
am fetch ...
apply fetch-pack ...
...
where each column is sorted.
This is how "ls" sorts things too, and since visually the columns are much
more distinct than the rows, so it _looks_ more sorted.
The "ls" command has a "-x" option that lists entries by lines (the way
git.c used to): if somebody wants to do that, the new print-out logic
could be easily accomodated to that too. Matter of taste and preference, I
guess.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sun, 18 Dec 2005 20:15:58 +0000 (12:15 -0800)]
Make "git help" react to window size correctly
Currently the git "show commands" function will react to the environment
variable COLUMNS, or just default to a width of 80 characters.
That's just soo eighties. Nobody sane sets COLUMNS any more, unless they
need to support some stone-age software from before the age of steam
engines, SIGWINCH and TIOCGWINSZ.
So get with the new century, and use TIOCGWINSZ to get the terminal size.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 18 Dec 2005 20:11:27 +0000 (12:11 -0800)]
Documentation: typos and small fixes in "everyday".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 18 Dec 2005 09:55:29 +0000 (01:55 -0800)]
clone-pack: remove unused and undocumented --keep flag
While we are at it, give fully spelled --keep to fetch-pack.
Also give --quiet in addition to -q to fetch-pack as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 06:17:38 +0000 (22:17 -0800)]
fetch-pack: -k option to keep downloaded pack.
Split out the functions that deal with the socketpair after
finishing git protocol handshake to receive the packed data into
a separate file, and use it in fetch-pack to keep/explode the
received pack data. We earlier had something like that on
clone-pack side once, but the list discussion resulted in the
decision that it makes sense to always keep the pack for
clone-pack, so unpacking option is not enabled on the clone-pack
side, but we later still could do so easily if we wanted to with
this change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 17 Dec 2005 08:00:50 +0000 (00:00 -0800)]
Revert "get_sha1_basic(): corner case ambiguity fix"
This reverts
6677c4665af2d73f670bec382bc82d0f2e9513fb commit.
The misguided disambiguation has been reverted, so there is no point
testing that misfeature.
Junio C Hamano [Sat, 17 Dec 2005 07:48:22 +0000 (23:48 -0800)]
Revert "We do not like "HEAD" as a new branch name"
This reverts
ee34518d629331dadd58b1a75294369d679eda8b commit.
Junio C Hamano [Sat, 17 Dec 2005 07:48:14 +0000 (23:48 -0800)]
Revert "refs.c: off-by-one fix."
This reverts
06bf6ac4248e834a229027908d405f5e42ac96d7 commit.
Junio C Hamano [Sat, 17 Dec 2005 07:19:14 +0000 (23:19 -0800)]
Remove misguided branch disambiguation.
This removes the misguided attempt to refuse processing a branch
name xyzzy and insist it to be given as either heads/xyzzy or
tags/xyzzy when a tag xyzzy exists. There was no reason to do
so --- the search order was predictable and well defined, so if
the user says xyzzy we should have taken the tag xyzzy in such a
case without complaining.
This incidentally fixes another subtle bug related to this. If
such a duplicate branch/tag name happened to be a unique valid
prefix of an existing commit object name (say, "beef"), we did
not take the tag "beef" but after complaining used the commit
object whose name started with beef.
Another problem this fixes while introducing some confusion is
that there is no longer a reason to forbid a branch name HEAD
anymore. In other words, now "git pull . ref1:HEAD" would work
as expected, once we revert "We do not like HEAD branch" patch.
It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or
fast-forwards if already exists) using the tip of ref1 branch
from the current repository, and merges it into the current
branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 17 Dec 2005 19:39:39 +0000 (11:39 -0800)]
Documentation: HTTP needs update-server-info.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 17 Dec 2005 07:12:33 +0000 (23:12 -0800)]
Comment fixes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jan Harkes [Sat, 17 Dec 2005 06:01:06 +0000 (01:01 -0500)]
Fix git-am --skip
git-am --skip does not unpack the next patch and ends up reapplying the
old patch, believing that it is the new patch in the sequence.
If the old patch applied successfully it will commit it with the
supposedly skipped log message and ends up dropping the following patch.
If the patch did not apply the user is left with the conflict he tried
to skip and has to unpack the next patch in the sequence by hand to get
git-am back on track.
By clearing the resume variable whenever skips bumps the sequence
counter we correctly unpack the next patch. I also added another
resume= in the case a patch file is missing from the sequence to
avoid the same problem when a file in the sequence was removed.
Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 16 Dec 2005 02:03:59 +0000 (18:03 -0800)]
Forbid pattern maching characters in refnames.
by marking '?', '*', and '[' as bad_ref_char().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 17 Dec 2005 02:23:33 +0000 (18:23 -0800)]
Examples of resetting.
Morten Welinder says examples of resetting is really about
recovering from botched commit/pulls. I agree that pointers
from commands that cause a reset to be needed in the first place
would be very helpful.
Also reset examples did not mention "pull/merge" cases.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 16 Dec 2005 02:52:51 +0000 (18:52 -0800)]
refs.c: off-by-one fix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Fri, 16 Dec 2005 01:40:25 +0000 (02:40 +0100)]
We do not like "HEAD" as a new branch name
This makes git-check-ref-format fail for "HEAD". Since the check is only
executed when creating refs, the existing symbolic ref is safe.
Otherwise these commands, most likely are pilot errors, would do
pretty funky stuff:
git checkout -b HEAD
git pull . other:HEAD
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 16 Dec 2005 01:53:44 +0000 (17:53 -0800)]
Sort globbed refname in show-branch.
"git show-branch bugs/*" shows all branches whose name match the
specified pattern, but in the order readdir() happened to
returned. Sort them to make the output more predictable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre [Thu, 15 Dec 2005 16:10:32 +0000 (11:10 -0500)]
small cleanup for diff-delta.c
This patch removes unused remnants of the original xdiff source.
No functional change. Possible tiny speed improvement.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Thu, 15 Dec 2005 22:48:38 +0000 (23:48 +0100)]
git-whatchanged: Add usage string
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Thu, 15 Dec 2005 22:48:26 +0000 (23:48 +0100)]
git-log: Add usage string
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen [Thu, 15 Dec 2005 22:47:57 +0000 (23:47 +0100)]
git-diff: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 21:02:25 +0000 (13:02 -0800)]
applymbox: typofix
Sorry, I broke this command completely with the stupid typo.
Noticed by Marco Costalba.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 20:54:00 +0000 (12:54 -0800)]
get_sha1_basic(): corner case ambiguity fix
When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and
the object name stored in .git/refs/heads/frotz were corrupt, we
ended up picking tags/frotz without complaining. Worse yet, if
the corrupt .git/refs/heads/frotz was more than 40 bytes and
began with hexadecimal characters, it silently overwritten the
initial part of the returned result.
This commit adds a couple of tests to demonstrate these cases,
with a fix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 07:08:08 +0000 (23:08 -0800)]
Documentation: tutorial
At the beginning of tutorial, refer the reader to everyday if
she has not done so yet.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff [Thu, 15 Dec 2005 06:26:46 +0000 (19:26 +1300)]
svnimport: exit cleanly when we are up to date
Now we detect that the SVN repo does not have new commits for us and exit
cleanly, removing the lockfile. With this, svnimport supports being run
on a cronjob to maintain a SVN2GIT gateway.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 05:25:22 +0000 (21:25 -0800)]
clone-pack: make it usable for partial branch cloning.
clone-pack had some logic to accept subset of remote refs from
the command line and clone from there. However, it was never
used in practice and its problems were not found out so far.
This commit changes the command to output the object names of
refs to the standard output instead of making a clone of the
remote repository when explicit <head> parameters are given; the
output format is the same as fetch-pack.
The traditional behaviour of cloning the whole repository by
giving no explicit <head> parameters stays the same.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 01:30:03 +0000 (17:30 -0800)]
GIT 0.99.9n aka 1.0rc6
Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc. 1.0 will probably be next
Wednesday, but who knows.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Amos Waterland [Wed, 14 Dec 2005 22:48:19 +0000 (17:48 -0500)]
git rebase loses author name/email if given bad email address
If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow
away the author name and email when fast-forward merging commits. I
have not tracked it down, but here is a testcase that demonstrates the
behavior.
Signed-off-by: Amos Waterland <apw@us.ibm.com>
Acked-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström [Wed, 14 Dec 2005 23:36:35 +0000 (00:36 +0100)]
Bugfixes for git-rebase
Fix bugs in git-rebase wrt rebasing another branch than
the current HEAD, rebasing with a dirty working dir,
and rebasing a proper decendant of the target branch.
[jc: with a bit of hand-merging]
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 15 Dec 2005 00:31:06 +0000 (16:31 -0800)]
mailinfo and git-am: allow "John Doe <johndoe>"
An isolated developer could have a local-only e-mail, which will
be stripped out by mailinfo because it lacks '@'. Define a
fallback parser to accomodate that.
At the same time, reject authorless patch in git-am.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Atukunda [Tue, 13 Dec 2005 12:21:34 +0000 (15:21 +0300)]
define MAXPATHLEN for hosts that don't support it
[jc: Martin says syllable (www.syllable.org) wants this.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 14 Dec 2005 21:32:52 +0000 (13:32 -0800)]
Do not let errors pass by unnoticed when running `make check'.
[jc: originally from Amos Waterland.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 14 Dec 2005 21:04:43 +0000 (13:04 -0800)]
Merge branch 'hold/am'
Junio C Hamano [Wed, 14 Dec 2005 11:11:37 +0000 (03:11 -0800)]
rebase: do not get confused in fast-forward situation.
When switching to another branch and rebasing it in a one-go, it
failed to update the variable that holds the branch head, and
did not detect fast-forward situation correctly.
Signed-off-by: Junio C Hamano <junkio@cox.net>