OSDN Git Service
Junio C Hamano [Sun, 4 Jun 2006 06:59:03 +0000 (23:59 -0700)]
Merge branch 'sp/reflog'
* sp/reflog:
fetch.c: do not pass uninitialized lock to unlock_ref().
Test that git-branch -l works.
Verify git-commit provides a reflog message.
Enable ref log creation in git checkout -b.
Create/delete branch ref logs.
Include ref log detail in commit, reset, etc.
Change order of -m option to update-ref.
Correct force_write bug in refs.c
Change 'master@noon' syntax to 'master@{noon}'.
Log ref updates made by fetch.
Force writing ref if it doesn't exist.
Added logs/ directory to repository layout.
General ref log reading improvements.
Fix ref log parsing so it works properly.
Support 'master@2 hours ago' syntax
Log ref updates to logs/refs/<ref>
Convert update-ref to use ref_lock API.
Improve abstraction of ref lock/write.
Junio C Hamano [Sun, 4 Jun 2006 06:58:26 +0000 (23:58 -0700)]
Merge branch 'ff/svnimport'
* ff/svnimport:
git-svnimport: Improved detection of merges.
Junio C Hamano [Sat, 3 Jun 2006 08:49:31 +0000 (01:49 -0700)]
read-tree --reset: update working tree file for conflicted paths.
The earlier "git reset --hard" simplification stopped removing
leftover working tree files from a failed automerge, when
switching back to the HEAD version that does not have the
paths.
This patch, instead of removing the unmerged paths from the
index, drops them down to stage#0 but marks them with mode=0
(the same "to be deleted" marker we internally use for paths
deleted by the merge). one_way_merge() function and the
functions it calls already know what to do with them -- if the
tree we are reading has the path the working tree file is
overwritten, and if it doesn't the working tree file is
removed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Jun 2006 06:57:15 +0000 (23:57 -0700)]
Merge branch 'jc/fmt-patch'
* jc/fmt-patch:
Update documentation for git-format-patch
format-patch: resurrect extra headers from config
format-patch --signoff
Horst H. von Brand [Sat, 3 Jun 2006 20:27:26 +0000 (16:27 -0400)]
Documentation: Spelling fixes
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Couder [Sat, 3 Jun 2006 16:45:43 +0000 (18:45 +0200)]
Builtin git-rev-parse.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Jun 2006 06:44:40 +0000 (23:44 -0700)]
fetch: do not report "same" unless -verbose.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 3 Jun 2006 01:17:35 +0000 (18:17 -0700)]
Merge branch 'ds/doc' into jc/fmt-patch
* ds/doc:
Update documentation for git-format-patch
sha1_file: avoid re-preparing duplicate packs
handle concurrent pruning of packed objects
http: prevent segfault during curl handle reuse
Remove possible segfault in http-fetch.
gitk: show_error fix
[PATCH] gitk: start-up bugfix
[PATCH] gitk: Replace "git-" commands with "git "
[PATCH] gitk: Display commit messages with word wrap
gitk: Fix bug where page-up/down wouldn't always work properly
gitk: Fix display of "(...)" for parents/children we haven't drawn
send-email: only 'require' instead of 'use' Net::SMTP
Allow multiple -m options to git-commit.
Dennis Stosberg [Wed, 31 May 2006 14:14:08 +0000 (16:14 +0200)]
Update documentation for git-format-patch
[jc: adjusted for recently resurrected features]
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jeff King [Fri, 2 Jun 2006 16:49:32 +0000 (12:49 -0400)]
sha1_file: avoid re-preparing duplicate packs
When adding packs, skip the pack if we already have it in the packed_git
list. This might happen if we are re-preparing our packs because of a
missing object.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jeff King [Fri, 2 Jun 2006 15:32:23 +0000 (11:32 -0400)]
handle concurrent pruning of packed objects
This patch causes read_sha1_file and sha1_object_info to re-examine the
list of packs if an object cannot be found. It works by re-running
prepare_packed_git() after an object fails to be found.
It does not attempt to clean up the old pack list. Old packs which are in
use can continue to be used (until unused by lru selection). New packs
are placed at the front of the list and will thus be examined before old
packs.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 2 Jun 2006 17:31:15 +0000 (10:31 -0700)]
Merge branch 'nh/http'
* nh/http:
http: prevent segfault during curl handle reuse
Remove possible segfault in http-fetch.
Johannes Schindelin [Fri, 2 Jun 2006 13:21:17 +0000 (15:21 +0200)]
format-patch: resurrect extra headers from config
Once again, if you have
[format]
headers = "Origamization: EvilEmpire\n"
format-patch will add these headers just after the "Subject:" line.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 1 Jun 2006 05:27:26 +0000 (22:27 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: show_error fix
[PATCH] gitk: start-up bugfix
[PATCH] gitk: Replace "git-" commands with "git "
[PATCH] gitk: Display commit messages with word wrap
gitk: Fix bug where page-up/down wouldn't always work properly
gitk: Fix display of "(...)" for parents/children we haven't drawn
Nick Hengeveld [Wed, 31 May 2006 23:25:03 +0000 (16:25 -0700)]
http: prevent segfault during curl handle reuse
If a curl handle is configured with special options, they may reference
information that is freed after the request is complete which can cause
a segfault if the curl handle is reused for a different type of request.
This patch resets these options to a safe state when a transfer slot is
assigned to a new request.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Wed, 31 May 2006 22:55:47 +0000 (00:55 +0200)]
send-email: only 'require' instead of 'use' Net::SMTP
This was proposed by Eric Wong and fixes the test. (Of course, git-send-email
does not work, if there is no Net::SMTP here, but it will say what is wrong
when you actually try to use send-email.)
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Mon, 29 May 2006 08:45:49 +0000 (04:45 -0400)]
Allow multiple -m options to git-commit.
I find it very convenient to be able to supply multiple paragraphs
of text on the command line with a single git-commit call. This
change permits multiple -m/--message type options to be supplied
to git-commit with each message being added as its own paragraph
of text in the commit message.
The -m option is still not permitted with -c/-C/-F nor are multiple
occurrences of these options permitted.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 31 May 2006 22:23:44 +0000 (15:23 -0700)]
fetch.c: do not pass uninitialized lock to unlock_ref().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 31 May 2006 22:11:49 +0000 (15:11 -0700)]
format-patch --signoff
This resurrects --signoff option to format-patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Florian Forster [Wed, 31 May 2006 10:32:08 +0000 (12:32 +0200)]
git-svnimport: Improved detection of merges.
The regexes detecting merges (while still relying on the commit messages,
though) have been improved to catch saner (and hopefully more) messages. The
old regex was so generic that it often matched something else and missed the
actual merge-message.
Also, the regex given with the `-M' commandline-option is checked first:
Explicitely given regexes should be considered better than the builtin ones,
and should therefore be given a chance to match a message first.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Mon, 29 May 2006 07:17:18 +0000 (03:17 -0400)]
Improved pack format documentation.
While trying to implement a pack reader in Java I was mislead by
some facts listed in this documentation as well as found a few
details to be missing about the pack header.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dmitry V. Levin [Mon, 29 May 2006 00:34:34 +0000 (04:34 +0400)]
git_exec_path, execv_git_cmd: ignore empty environment variables
Ignoring empty environment variables is good common practice.
Ignoring --exec-path with empty argument won't harm, too:
if user means current directory, there is a "--exec-path=."
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dmitry V. Levin [Tue, 30 May 2006 14:58:52 +0000 (18:58 +0400)]
execv_git_cmd: Fix stack buffer overflow.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Salikh Zakirov [Sat, 27 May 2006 17:57:29 +0000 (21:57 +0400)]
Fixed Cygwin CR-munging problem in mailsplit
Do not open mailbox file as fopen(..., "rt")
as this strips CR characters from the diff,
thus breaking the patch context for changes
in CRLF files.
Signed-off-by: Salikh Zakirov <Salikh.Zakirov@Intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 30 May 2006 08:48:54 +0000 (01:48 -0700)]
Merge branch 'ew/tests'
* ew/tests:
t6000lib: workaround a possible dash bug
t5500-fetch-pack: remove local (bashism) usage.
tests: Remove heredoc usage inside quotes
t3300-funny-names: shell portability fixes
Junio C Hamano [Tue, 30 May 2006 06:53:13 +0000 (23:53 -0700)]
send-email: do not pass bogus address to local sendmail binary
This makes t9001 test happy. Also fixes the warning on
uninitialized $references variable again.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Mon, 29 May 2006 19:30:15 +0000 (12:30 -0700)]
Add a basic test case for git send-email, and fix some real bugs discovered.
Signed-off-by: Ryan Anderson <rda@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Mon, 29 May 2006 19:30:14 +0000 (12:30 -0700)]
Fix a bug in email extraction used in git-send-email.
(Also, kill off an accidentally created warning.)
Signed-off-by: Ryan Anderson <rda@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Mon, 29 May 2006 19:30:13 +0000 (12:30 -0700)]
Add support for --bcc to git-send-email.
Signed-off-by: Ryan Anderson <rda@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson [Mon, 29 May 2006 19:30:12 +0000 (12:30 -0700)]
git-send-email: Add References: headers to emails, in addition to In-Reply-To:
Signed-off-by: Ryan Anderson <rda@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dennis Stosberg [Mon, 29 May 2006 15:06:32 +0000 (17:06 +0200)]
git-clean fails on files beginning with a dash
Reproducible with:
$ git init-db
$ echo "some text" >-file
$ git clean
Removing -file
rm: invalid option -- l
Try `rm --help' for more information.
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Tue, 30 May 2006 02:03:46 +0000 (19:03 -0700)]
git-svn: remove assertion that broke with older versions of svn
svn < 1.3.x would display changes to keywords lines as modified
if they aren't expanded in the working copy. We already check
for changes against the git tree here, so checking against the
svn one is probably excessive.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Tue, 30 May 2006 02:03:45 +0000 (19:03 -0700)]
git-svn: t0001: workaround a heredoc bug in old versions of dash
The dash installed on my Debian Sarge boxes don't seem to like
<<'' as a heredoc starter. Recent versions of dash do not need
this fix.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Mon, 29 May 2006 23:31:36 +0000 (19:31 -0400)]
Documentation: fix a tutorial-2 typo
Fix a typo.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Mon, 29 May 2006 23:31:34 +0000 (19:31 -0400)]
Documentation: retitle the git-core tutorial
Give the git-core tutorial a name that better reflects its intended
audience.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Mon, 29 May 2006 23:31:33 +0000 (19:31 -0400)]
documentation: add brief mention of cat-file to tutorial part I
I'd rather avoid git cat-file so early on, but the
git-cat-file -p old-commit:/path/to/file
trick is too useful....
Also fix a nearby typo while we're at it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
J. Bruce Fields [Mon, 29 May 2006 23:31:32 +0000 (19:31 -0400)]
documentation: mention gitk font adjustment in tutorial
Kind of silly, but the font I get by default in gitk makes it mostly
unusable for me, so this is the first thing I'd want to know about.
(But maybe there's a better suggestion than just Ctrl-='ing until
satisfied.)
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Horst von Brand [Mon, 29 May 2006 21:11:28 +0000 (17:11 -0400)]
Fix some documentation typoes
Fix some typoes in Documentation/everyday.txt
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras [Tue, 30 May 2006 02:01:38 +0000 (19:01 -0700)]
Make git-diff-tree indicate when it flushes
There are times when gitk needs to know that the commits it has sent
to git-diff-tree --stdin did not match, and it needs to know in a
timely fashion even if none of them match. At the moment,
git-diff-tree outputs nothing for non-matching commits, so it is
impossible for gitk to distinguish between git-diff-tree being slow
and git-diff-tree saying no.
This makes git-diff-tree flush its output and echo back the
input line when it is not a valid-looking object name. Gitk, or
other users of git-diff-tree --stdin, can use a blank line or
any other "marker line" to indicate that git-diff-tree has
processed all the commits on its input up to the echoed back
marker line, and any commits that have not been output do not
match.
[jc: re-done after a couple of back-and-forth discussion on the list.]
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Mon, 29 May 2006 08:06:48 +0000 (04:06 -0400)]
Remove unnecessary output from t3600-rm.
Moved the setup commands into test_expect_success blocks so their
output is hidden unless -v is used. This makes the test suite look
a little cleaner when the rm test-file setup step fails (and was
expected to fail for most cases).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 29 May 2006 06:00:50 +0000 (23:00 -0700)]
Merge branch 'lt/apply'
* lt/apply:
apply: force matching at the beginning.
Add a test-case for git-apply trying to add an ending line
apply: treat EOF as proper context.
Junio C Hamano [Mon, 29 May 2006 05:57:47 +0000 (22:57 -0700)]
Merge branch 'jc/cache-tree'
* jc/cache-tree: (26 commits)
builtin-rm: squelch compiler warnings.
git-write-tree writes garbage on sparc64
Fix crash when reading the empty tree
fsck-objects: do not segfault on missing tree in cache-tree
cache-tree: a bit more debugging support.
read-tree: invalidate cache-tree entry when a new index entry is added.
Fix test-dump-cache-tree in one-tree disappeared case.
fsck-objects: mark objects reachable from cache-tree
cache-tree: replace a sscanf() by two strtol() calls
cache-tree.c: typefix
test-dump-cache-tree: validate the cached data as well.
cache_tree_update: give an option to update cache-tree only.
read-tree: teach 1-way merege and plain read to prime cache-tree.
read-tree: teach 1 and 2 way merges about cache-tree.
update-index: when --unresolve, smudge the relevant cache-tree entries.
test-dump-cache-tree: report number of subtrees.
cache-tree: sort the subtree entries.
Teach fsck-objects about cache-tree.
index: make the index file format extensible.
cache-tree: protect against "git prune".
...
Conflicts:
Makefile, builtin.h, git.c: resolved the same way as in next.
Junio C Hamano [Mon, 29 May 2006 05:34:34 +0000 (22:34 -0700)]
Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache-tree
* jc/dirwalk-n-cache-tree: (212 commits)
builtin-rm: squelch compiler warnings.
Add builtin "git rm" command
Move pathspec matching from builtin-add.c into dir.c
Prevent bogus paths from being added to the index.
builtin-add: fix unmatched pathspec warnings.
Remove old "git-add.sh" remnants
builtin-add: warn on unmatched pathspecs
Do "git add" as a builtin
Clean up git-ls-file directory walking library interface
libify git-ls-files directory traversal
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Fix build procedure for builtin-init-db
read-tree -m -u: do not overwrite or remove untracked working tree files.
apply --cached: do not check newly added file in the working tree
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport
Revert "builtin-grep: workaround for non GNU grep."
builtin-grep: workaround for non GNU grep.
builtin-grep: workaround for non GNU grep.
...
Linus Torvalds [Sun, 28 May 2006 23:16:15 +0000 (16:16 -0700)]
Don't use "sscanf()" for tree mode scanning
Doing an oprofile run on the result of my git rev-list memory leak fixes
and tree parsing cleanups, I was surprised by the third-highest entry
being
samples % image name app name symbol name
179751 2.7163 libc-2.4.so libc-2.4.so _IO_vfscanf@@GLIBC_2.4
where that 2.7% is actually more than 5% of one CPU, because this was run
on a dual CPU setup with the other CPU just being idle.
That seems to all be from the use of 'sscanf(tree, "%o", &mode)' for the
tree buffer parsing.
So do the trivial octal parsing by hand, which also gives us where the
first space in the string is (and thus where the pathname starts) so we
can get rid of the "strchr(tree, ' ')" call too.
This brings the "git rev-list --all --objects" time down from 63 seconds
to 55 seconds on the historical kernel archive for me, so it's quite
noticeable - tree parsing is a lot of what we end up doing when following
all the objects.
[ I also see a 5% speedup on a full "git fsck-objects" on the current
kernel archive, so that sscanf() really does seem to have hurt our
performance by a surprising amount ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 29 May 2006 02:24:28 +0000 (19:24 -0700)]
git-fetch: avoid using "case ... in (arm)"
NetBSD ash chokes on the optional open parenthesis for case arms. Inside
$(command substitution), however, bash barfs without. So adjust things
accordingly.
Originally pointed out by Dennis Stosberg.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 28 May 2006 20:39:05 +0000 (13:39 -0700)]
Merge branch 'jc/mailinfo'
* jc/mailinfo:
mailinfo: skip bogus UNIX From line inside body
Junio C Hamano [Sun, 28 May 2006 20:36:37 +0000 (13:36 -0700)]
Merge branch 'eb/mailinfo'
* eb/mailinfo:
mailinfo: More carefully parse header lines in read_one_header_line()
Allow in body headers beyond the in body header prefix.
More accurately detect header lines in read_one_header_line
In handle_body only read a line if we don't already have one.
Refactor commit messge handling.
Move B and Q decoding into check header.
Make read_one_header_line return a flag not a length.
Dennis Stosberg [Sun, 28 May 2006 19:08:08 +0000 (21:08 +0200)]
git-write-tree writes garbage on sparc64
In the "next" branch, write_index_ext_header() writes garbage on a
64-bit big-endian machine; the written index file will be unreadable.
I noticed this on NetBSD/sparc64. Reproducible with:
$ git init-db
$ :>file
$ git-update-index --add file
$ git-write-tree
$ git-update-index
error: index uses extension, which we do not understand
fatal: index file corrupt
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sun, 28 May 2006 18:37:23 +0000 (11:37 -0700)]
Fix memory leak in "git rev-list --objects"
Martin Langhoff points out that "git repack -a" ends up using up a lot of
memory for big archives, and that git cvsimport probably should do only
incremental repacks in order to avoid having repacking flush all the
caches.
The big majority of the memory usage of repacking is from git rev-list
tracking all objects, and this patch should go a long way in avoiding the
excessive memory usage: the bulk of it was due to the object names being
leaked from the tree parser.
For the historic Linux kernel archive, this simple patch does:
Before:
/usr/bin/time git-rev-list --all --objects > /dev/null
72.45user 0.82system 1:13.55elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+125376minor)pagefaults 0swaps
After:
/usr/bin/time git-rev-list --all --objects > /dev/null
75.22user 0.48system 1:16.34elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+43921minor)pagefaults 0swaps
where we do end up wasting a bit of time on some extra strdup()s (which
could be avoided, but that would require tracking where the pathnames came
from), but we avoid a lot of memory usage.
Minor page faults track maximum RSS very closely (each page fault maps in
one page into memory), so the reduction from 125376 page faults to 43921
means a rough reduction of VM footprint from almost half a gigabyte to
about a third of that. Those numbers were also double-checked by looking
at "top" while the process was running.
(Side note: at least part of the remaining VM footprint is the mapping of
the 177MB pack-file, so the remaining memory use is at least partly "well
behaved" from a project caching perspective).
For the current git archive itself, the memory usage for a "--all
--objects" rev-list invocation dropped from 7128 pages to 2318 (27MB to
9MB), so the reduction seems to hold for much smaller projects too.
For regular "git-rev-list" usage (ie without the "--objects" flag) this
patch has no impact.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Aneesh Kumar K.V [Sat, 27 May 2006 10:25:32 +0000 (15:55 +0530)]
gitview: Move the console error messages to message dialog
Signed-off-by: Junio C Hamano <junkio@cox.net>
Aneesh Kumar K.V [Sat, 27 May 2006 10:24:14 +0000 (15:54 +0530)]
gitview: Add key binding for F5.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 28 May 2006 17:14:38 +0000 (10:14 -0700)]
Let git-clone to pass --template=dir option to git-init-db.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Yann Dirson [Sat, 27 May 2006 16:39:35 +0000 (18:39 +0200)]
Make cvsexportcommit create parent directories as needed.
This is a quick port of my initial patch for 1.0.7, that I had forgotten to
post. Possibly needs some testing before applying to master.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Yann Dirson [Sat, 27 May 2006 16:39:33 +0000 (18:39 +0200)]
Document current cvsexportcommit limitations.
Since there is no bugtracker that I know of, let's just use the scripts
themselves to document their limitations.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Yann Dirson [Sat, 27 May 2006 16:39:31 +0000 (18:39 +0200)]
Do not call 'cmp' with non-existant -q flag.
I cannot find when that flag was removed if it ever existed, I can find
nothing about it in the ChangeLog and NEWS file of GNU diff. The current
flag is -s aka --quiet aka --silent, so let's use -s, assuming it is a
portable flag. Feel free to lart me with a POSIX bible if needed.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 27 May 2006 19:24:30 +0000 (12:24 -0700)]
Fix "--abbrev=xyz" for revision listing
The revision argument parsing was happily parsing "--abbrev", but it
didn't parse "--abbrev=<n>".
Which was hidden by the fact that the diff options _would_ parse
--abbrev=<n>, so it would actually silently parse it, it just
wouldn't use it for the same things that a plain "--abbrev" was
used for.
Which seems a bit insane.
With this patch, if you do "git log --abbrev=10" it will abbreviate the
merge parent commit ID's to ten hex characters, which was probably what
you expected.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Fri, 26 May 2006 05:41:02 +0000 (22:41 -0700)]
t1002: use -U0 instead of --unified=0
Using "-U0" is definitely more portable than using "--unified=0",
so we should do that regardless.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 28 May 2006 16:23:29 +0000 (09:23 -0700)]
format-patch: -n and -k are mutually exclusive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis [Fri, 26 May 2006 16:59:17 +0000 (18:59 +0200)]
Call builtin ls-tree in git-cat-file -p
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 26 May 2006 18:30:49 +0000 (11:30 -0700)]
built-in format-patch: various fixups.
- The --start-number handling introduced breakage in the normal
code path. It started numbering at 0 when not --numbered,
for example.
- When generating one file per patch, we needlessly added an
extra blank line in front for second and subsequent files.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras [Fri, 26 May 2006 12:34:30 +0000 (22:34 +1000)]
gitk: show_error fix
Bug noted by Junio C Hamano: show_error can be passed "." (root
window) as its $w argument, but appending ".m" and ".ok" results in
creating "..m" and "..ok" as window paths, which were invalid.
This fixes it in a slightly different way from Junio's patch, though.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Fri, 26 May 2006 07:07:15 +0000 (00:07 -0700)]
[PATCH] gitk: start-up bugfix
The code to extract a message part from the error message was
not passing the error message to [string range], and resulted
in the show_error not getting called.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Timo Hirvonen [Wed, 24 May 2006 07:57:40 +0000 (10:57 +0300)]
[PATCH] gitk: Replace "git-" commands with "git "
git-* commands work only if gitexecdir is in PATH.
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Martin Waitz [Thu, 25 May 2006 23:42:18 +0000 (01:42 +0200)]
Add instructions to commit template.
New users can be irritated by the git status text in their editor.
Let's give them a short help.
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 26 May 2006 07:46:58 +0000 (00:46 -0700)]
mailinfo: More carefully parse header lines in read_one_header_line()
We exited prematurely from header parsing loop when the header
field did not have a space after the colon but we insisted on
it, and we got the check wrong because we forgot that we strip
the trailing whitespace before we do the check.
The space after the colon is not even required by RFC2822, so
stop requiring it. While we are at it, the header line is
specified to be more strict than "anything with a colon in it"
(there must be one or more characters before the colon, and they
must not be controls, SP or non US-ASCII), so implement that
check as well, lest we mistakenly think something like:
Bogus not a header line: this is not.
as a header line.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 26 May 2006 02:06:18 +0000 (19:06 -0700)]
t6000lib: workaround a possible dash bug
pdksh doesn't need this patch, of course bash works fine since
that what most users use.
Normally, 'var=val command' seems to work fine with dash, but
perhaps there's something weird going on with "$@". dash is
pretty widespread, so it'll be good to support this even though
it does seem like a bug in dash.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 26 May 2006 02:06:17 +0000 (19:06 -0700)]
t5500-fetch-pack: remove local (bashism) usage.
None of the variables seem to conflict, so local was unnecessary.
Also replaced ${var:pos:len} with the sed equivalent.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 26 May 2006 02:06:16 +0000 (19:06 -0700)]
tests: Remove heredoc usage inside quotes
The use of heredoc inside quoted strings doesn't seem to be
supported by dash. pdksh seems to handle it fine, however.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Fri, 26 May 2006 02:06:15 +0000 (19:06 -0700)]
t3300-funny-names: shell portability fixes
echo isn't remotely standardized for handling backslashes,
so cat + heredoc seems better
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 25 May 2006 21:55:11 +0000 (23:55 +0200)]
git-format-patch --start-number <n>
Since the "a..b c..d" syntax is interpreted as "b ^a d ^c" as other
range-ish commands, if you want to format a..b and then c..d and end
up with files consecutively numbered, the second run needs to be able
to tell the command what number to start from.
This does not imply --numbered (which gives [PATCH n/m] to the subject).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jim Meyering [Thu, 25 May 2006 16:52:01 +0000 (18:52 +0200)]
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Thu, 25 May 2006 15:22:42 +0000 (08:22 -0700)]
bogus "fatal: Not a git repository"
I was just testing that "git ls-remote" change by Junio, and when you're
not in a git repository, it gives this totally bogus warning. The _target_
obviously has to be a git repository, but there's no reason why you'd have
to be in a local git repo when doing an ls-remote.
The reason is commit
73136b2e8a8ee024320c5ac6a0f14f912432bf03 by Dscho: it
adds calls to git-repo-config in git-parse-remote.sh to get the remote
shorthands etc.
Now, either we should just hide and ignore the error from git-repo-config
(probably bad, because some errors _are_ valid - like git-repo-config
failing due to bad syntax in the config file), or we should just make
git-repo-config quietly handle the case of not being in a git repository.
This does the latter: just quietly accepting (and doing nothing - trying
to set a value will result in the lock-file failing) our lot in life
sounds better than dying with a bogus error message.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Acked-By: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Waitz [Thu, 25 May 2006 12:37:46 +0000 (14:37 +0200)]
Documentation/Makefile: remove extra /
As both DESTDIR and the prefix are supposed to be absolute pathnames
they can simply be concatenated without an extra / (like in the main Makefile).
The extra slash may even break installation on Windows.
[jc: adjusted an earlier workaround for this problem in the dist-doc
target in the main Makefile as well. ]
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jeff King [Wed, 24 May 2006 13:58:28 +0000 (09:58 -0400)]
cvsimport: avoid "use" with :tag
Avoid "use POSIX qw(strftime dup2 :errno_h)"; it was reported
that a Perl installations on Mandrake 9.1 did not like it, even
though it understood "use POSIX qw(:errno_h)". Funny.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jeff King [Thu, 25 May 2006 01:22:32 +0000 (21:22 -0400)]
cat-file: document -p option
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Thu, 25 May 2006 03:34:04 +0000 (23:34 -0400)]
Test that git-branch -l works.
If the user supplies -l to git-branch when creating a new branch
then the new branch's log should be created automatically and the
branch creation should be logged in that log.
Further if a branch is being deleted and it had a log then also
verify that the log was deleted.
Test git-checkout -b foo -l for creating a new branch foo with a
log and checking out that branch.
Fixed git-checkout -b foo -l as the branch variable name was
incorrect in the script.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Thu, 25 May 2006 03:33:18 +0000 (23:33 -0400)]
Verify git-commit provides a reflog message.
The reflog message from git-commit should include the first line
of the commit message as supplied by the user.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Thu, 25 May 2006 02:48:39 +0000 (22:48 -0400)]
Built git-upload-tar should be ignored.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 25 May 2006 04:36:14 +0000 (21:36 -0700)]
ls-remote: fix rsync:// to report HEAD
This prevented recent git-clone from checking out the working
tree files in the cloned repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 24 May 2006 23:49:24 +0000 (16:49 -0700)]
Merge branch 'master' into sp/reflog
* master: (90 commits)
fetch.c: remove an unused variable and dead code.
Clean up sha1 file writing
Builtin git-cat-file
builtin format-patch: squelch content-type for 7-bit ASCII
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
add more informative error messages to git-mktag
remove the artificial restriction tagsize < 8kb
git-rebase: use canonical A..B syntax to format-patch
git-format-patch: now built-in.
fmt-patch: Support --attach
fmt-patch: understand old <his> notation
Teach fmt-patch about --keep-subject
Teach fmt-patch about --numbered
fmt-patch: implement -o <dir>
fmt-patch: output file names to stdout
Teach fmt-patch to write individual files.
built-in tar-tree and remote tar-tree
Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
Builtin git-show-branch.
Builtin git-apply.
...
Junio C Hamano [Wed, 24 May 2006 23:42:38 +0000 (16:42 -0700)]
fetch.c: remove an unused variable and dead code.
Funnily enough, this variable was never assigned ever since it
was introduced, and has been protecting some code that has never
been executed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 24 May 2006 21:08:30 +0000 (14:08 -0700)]
Merge branch 'master' into lt/apply
* master: (40 commits)
Clean up sha1 file writing
Builtin git-cat-file
builtin format-patch: squelch content-type for 7-bit ASCII
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
add more informative error messages to git-mktag
remove the artificial restriction tagsize < 8kb
git-rebase: use canonical A..B syntax to format-patch
git-format-patch: now built-in.
fmt-patch: Support --attach
fmt-patch: understand old <his> notation
Teach fmt-patch about --keep-subject
Teach fmt-patch about --numbered
fmt-patch: implement -o <dir>
fmt-patch: output file names to stdout
Teach fmt-patch to write individual files.
Use RFC2822 dates from "git fmt-patch".
git-fmt-patch: thinkofix to show [PATCH] properly.
rename internal format-patch wip
Minor tweak on subject line in --pretty=email
Tentative built-in format-patch.
...
Linus Torvalds [Wed, 24 May 2006 15:30:54 +0000 (08:30 -0700)]
Clean up sha1 file writing
This cleans up and future-proofs the sha1 file writing in sha1_file.c.
In particular, instead of doing a simple "write()" call and just verifying
that it succeeds (or - as in one place - just assuming it does), it uses
"write_buffer()" to write data to the file descriptor while correctly
checking for partial writes, EINTR etc.
It also splits up write_sha1_to_fd() to be a lot more readable: if we need
to re-create the compressed object, we do so in a separate helper
function, making the logic a whole lot more modular and obvious.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen [Wed, 24 May 2006 11:08:46 +0000 (14:08 +0300)]
Builtin git-cat-file
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 24 May 2006 20:19:50 +0000 (13:19 -0700)]
apply: force matching at the beginning.
When there is no leading context, the patch must match at the
beginning of preimage; otherwise there is a "patch adds these
lines while the other lines were added to the original file"
conflict.
This is the opposite of match_end fix earlier in this series.
Unlike matching at the end case, we can additionally check the
preimage line number recorded in the patch, so the change is not
symmetrical with the earlier one.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 24 May 2006 19:21:17 +0000 (12:21 -0700)]
Merge branch 'jc/fmt-patch'
* jc/fmt-patch:
builtin format-patch: squelch content-type for 7-bit ASCII
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
Junio C Hamano [Wed, 24 May 2006 19:20:48 +0000 (12:20 -0700)]
Merge branch 'be/tag'
* be/tag:
add more informative error messages to git-mktag
remove the artificial restriction tagsize < 8kb
Junio C Hamano [Wed, 24 May 2006 19:19:47 +0000 (12:19 -0700)]
Merge branch 'js/fmt-patch'
This makes "git format-patch" a built-in.
* js/fmt-patch:
git-rebase: use canonical A..B syntax to format-patch
git-format-patch: now built-in.
fmt-patch: Support --attach
fmt-patch: understand old <his> notation
Teach fmt-patch about --keep-subject
Teach fmt-patch about --numbered
fmt-patch: implement -o <dir>
fmt-patch: output file names to stdout
Teach fmt-patch to write individual files.
Use RFC2822 dates from "git fmt-patch".
git-fmt-patch: thinkofix to show [PATCH] properly.
rename internal format-patch wip
Minor tweak on subject line in --pretty=email
Tentative built-in format-patch.
Junio C Hamano [Wed, 24 May 2006 18:24:50 +0000 (11:24 -0700)]
Merge branch 'jc/builtin-n-tar-tree'
This pulls in "make many commands built-in" branches.
* jc/builtin-n-tar-tree:
built-in tar-tree and remote tar-tree
Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
Builtin git-show-branch.
Builtin git-apply.
Builtin git-commit-tree.
Builtin git-read-tree.
Builtin git-tar-tree.
Builtin git-ls-tree.
Builtin git-ls-files.
Junio C Hamano [Wed, 24 May 2006 18:04:55 +0000 (11:04 -0700)]
Merge branch 'jc/fetch-sorted'
* jc/fetch-sorted:
fetch-pack: output refs in the order they were given on the command line.
Junio C Hamano [Wed, 24 May 2006 18:04:16 +0000 (11:04 -0700)]
Merge branch 'lt/dirwalk'
This makes 'git add' and 'git rm' built-ins.
* lt/dirwalk:
Add builtin "git rm" command
Move pathspec matching from builtin-add.c into dir.c
Prevent bogus paths from being added to the index.
builtin-add: fix unmatched pathspec warnings.
Remove old "git-add.sh" remnants
builtin-add: warn on unmatched pathspecs
Do "git add" as a builtin
Clean up git-ls-file directory walking library interface
libify git-ls-files directory traversal
Catalin Marinas [Tue, 23 May 2006 21:48:36 +0000 (22:48 +0100)]
Add a test-case for git-apply trying to add an ending line
git-apply adding an ending line doesn't seem to fail if the ending line is
already present in the patched file.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Sean [Tue, 23 May 2006 09:34:23 +0000 (05:34 -0400)]
--summary output should print immediately after stats.
Currently the summary is displayed after the patch. Fix this so
that the output order is stat-summary-patch. As a consequence of
the way this is coded, the --summary option will only actually
display summary data if combined with either the --stat or
--patch-with-stat option.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 24 May 2006 02:08:01 +0000 (19:08 -0700)]
apply: treat EOF as proper context.
Catalin noticed that we do not treat end-of-file condition shown
in the patch text as the patch context. This causes a patch
that appends at the end of the file to cleanly apply even if
something else has been appended to the file. If this happened
in the middle, we would refuse by saying that the file has
conflicting modifications.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Wed, 24 May 2006 02:23:41 +0000 (19:23 -0700)]
git-svn: ignore expansion of svn:keywords
Unlike my earlier test patch, this also checks svn:eol-style and
makes sure it's applied to working copy updates. This is
definitely more correct than my original attempt at killing
keyword expansions, but I still haven't tested it enough to
know. Feedback would be much appreciated.
Also changed assert_svn_wc_clean() to only work on the svn
working copy. This requires a separate call to assert_tree() to
check wc integrity against git in preparation for another change
I'm planning.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Wed, 24 May 2006 02:23:40 +0000 (19:23 -0700)]
git-svn: starting a 1.1.0-pre development version
Some not-very-well-tested changes coming...
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jeff King [Tue, 23 May 2006 20:59:44 +0000 (16:59 -0400)]
cvsimport: set up commit environment in perl instead of using env
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 23 May 2006 23:30:39 +0000 (16:30 -0700)]
cvsimport: do not barf on creation of an empty file.
When the server says "created this file whose length is empty",
we mistakenly said "oops, the server did not say a sensible
thing". Fix it.
Spotted and fixed by Linus, acked by Martin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 23 May 2006 21:44:31 +0000 (14:44 -0700)]
Merge branch 'jc/tartree' into jc/builtin-n-tar-tree
* jc/tartree:
built-in tar-tree and remote tar-tree
Eric W. Biederman [Tue, 23 May 2006 19:58:36 +0000 (13:58 -0600)]
Allow in body headers beyond the in body header prefix.
- handle_from is fixed to not mangle it's input line.
- Then handle_inbody_header is allowed to look in
the body of a commit message for additional headers
that we haven't already seen.
This allows patches with all of the right information in
unfortunate places to be imported.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>