OSDN Git Service
Junio C Hamano [Sat, 22 Apr 2006 10:58:04 +0000 (03:58 -0700)]
Libified diff-index: backward compatibility fix.
"diff-index -m" does not mean "do not ignore merges", but means
"pretend missing files match the index".
The previous round tried to address this, but failed because
setup_revisions() ate "-m" flag before the caller had a chance
to intervene.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 22 Apr 2006 09:43:00 +0000 (02:43 -0700)]
Libify diff-index.
The second installment to libify diff brothers. The pathname
arguments are checked more strictly than before because we now
use the revision.c::setup_revisions() infrastructure.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 22 Apr 2006 06:57:45 +0000 (23:57 -0700)]
Libify diff-files.
This is the first installment to libify diff brothers.
The updated diff-files uses revision.c::setup_revisions()
infrastructure to parse its command line arguments, which means
the pathname arguments are checked more strictly than before.
The tests are adjusted to separate possibly missing paths from
the rest of arguments with double-dashes, to show the kosher
way.
As Linus pointed out, renaming diff.c to diff-lib.c was simply
stupid, so I am renaming it back. The new diff-lib.c is to
contain pieces extracted from diff brothers.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 22 Apr 2006 05:03:07 +0000 (22:03 -0700)]
Merge branch 'jc/diff'
* jc/diff:
diff --stat: do not drop rename information.
Junio C Hamano [Sat, 22 Apr 2006 04:56:13 +0000 (21:56 -0700)]
Makefile: dependency for builtin-help.o
builtin-help.c wants to include common-cmds.h which is a
generated file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Fri, 21 Apr 2006 17:27:34 +0000 (10:27 -0700)]
Split up builtin commands into separate files from git.c
Right now it split it into "builtin-log.c" for log-related commands
("log", "show" and "whatchanged"), and "builtin-help.c" for the
informational commands (usage printing and "help" and "version").
This just makes things easier to read, I find.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 21 Apr 2006 20:14:30 +0000 (13:14 -0700)]
Merge branch 'fix'
* fix:
git-log produces no output
Linus Torvalds [Fri, 21 Apr 2006 19:25:13 +0000 (12:25 -0700)]
git-log produces no output
When $PAGER is set to 'less -i', we used to fail because we
assumed the $PAGER is a command and simply exec'ed it.
Try exec first, and then run it through shell if it fails. This
allows even funkier PAGERs like these ;-):
PAGER='sed -e "s/^/`date`: /" | more'
PAGER='contrib/colordiff.perl | less -RS'
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 21 Apr 2006 07:45:40 +0000 (00:45 -0700)]
Merge branch 'fix'
* fix:
fix pack-object buffer size
mailinfo: decode underscore used in "Q" encoding properly.
Reintroduce svn pools to solve the memory leak.
pack-objects: do not stop at object that is "too small"
Nicolas Pitre [Thu, 20 Apr 2006 21:25:37 +0000 (17:25 -0400)]
fix pack-object buffer size
The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also
account for the space before the pathname, and the terminating \n and \0.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 21 Apr 2006 07:06:58 +0000 (00:06 -0700)]
mailinfo: decode underscore used in "Q" encoding properly.
Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are
subtly different; the latter is used on the mail header and an
underscore needs to be decoded to 0x20.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Santi_Béjar [Mon, 27 Mar 2006 11:26:01 +0000 (13:26 +0200)]
Reintroduce svn pools to solve the memory leak.
Introduced in
4802426.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 21 Apr 2006 06:36:22 +0000 (23:36 -0700)]
pack-objects: do not stop at object that is "too small"
Because we sort the delta window by name-hash and then size,
hitting an object that is too small to consider as a delta base
for the current object does not mean we do not have better
candidate in the window beyond it.
Noticed by Shawn Pearce, analyzed by Nico, Linus and me.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 20 Apr 2006 09:52:04 +0000 (02:52 -0700)]
Merge branch 'fix'
* fix:
git-commit --amend: two fixes.
Junio C Hamano [Thu, 20 Apr 2006 08:20:56 +0000 (01:20 -0700)]
git-commit --amend: two fixes.
When running "git commit --amend" only to fix the commit log
message without any content change, we mistakenly showed the
git-status output that says "nothing to commit" without
commenting it out.
If you have already run update-index but you want to amend the
top commit, "git commit --amend --only" without any paths should
have worked, because --only means "starting from the base
commit, update-index these paths only to prepare the index to
commit, and perform the commit". However, we refused -o without
paths.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 20 Apr 2006 03:41:14 +0000 (20:41 -0700)]
diff --stat: do not drop rename information.
When a verbatim rename or copy is detected, we did not show
anything on the "diff --stat" for the filepair. This makes it
to show the rename information.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 22:57:45 +0000 (15:57 -0700)]
Merge branch 'lt/xsha1'
* lt/xsha1:
get_tree_entry(): make it available from tree-walk
sha1_name.c: no need to include diff.h; tree-walk.h will do.
sha1_name.c: prepare to make get_tree_entry() reusable from others.
get_sha1() shorthands for blob/tree objects
Junio C Hamano [Wed, 19 Apr 2006 22:41:55 +0000 (15:41 -0700)]
Merge branch 'maint'
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
Junio C Hamano [Wed, 19 Apr 2006 22:12:02 +0000 (15:12 -0700)]
diff: move diff.c to diff-lib.c to make room.
Now I am not doing any real "git-diff in C" yet, but this would
help before doing so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 21:58:24 +0000 (14:58 -0700)]
pre-commit hook: complain about conflict markers.
Several <<< or === or >>> characters at the beginning of a line
is very likely to be leftover conflict markers from a failed
automerge the user resolved incorrectly, so detect them.
As usual, this can be defeated with "git commit --no-verify" if
you really do want to have those files, just like changes that
introduce trailing whitespaces.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 21:54:27 +0000 (14:54 -0700)]
git-merge: a bit more readable user guidance.
We said "fix up by hand" after failed automerge, which was a big
"Huh? Now what?". Be a bit more explicit without being too
verbose. Suggested by Carl Worth.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 21:05:47 +0000 (14:05 -0700)]
get_tree_entry(): make it available from tree-walk
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 18:56:53 +0000 (11:56 -0700)]
sha1_name.c: no need to include diff.h; tree-walk.h will do.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 18:56:07 +0000 (11:56 -0700)]
sha1_name.c: prepare to make get_tree_entry() reusable from others.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 19 Apr 2006 17:20:49 +0000 (10:20 -0700)]
git log: don't do merge diffs by default
I personally prefer "ignore_merges" to be on by default, because quite
often the merge diff is distracting and not interesting. That's true both
with "-p" and with "--stat" output.
If you want output from merges, you can trivially use the "-m", "-c" or
"--cc" flags to tell that you're interested in merges, which also tells
the diff generator what kind of diff to do (for --stat, any of the three
will do, of course, but they differ for plain patches or for
--patch-with-stat).
This trivial patch just removes the two lines that tells "git log" not to
ignore merges. It will still show the commit log message, of course, due
to the "always_show_header" part.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 19 Apr 2006 17:05:12 +0000 (10:05 -0700)]
Allow "git repack" users to specify repacking window/depth
.. but don't even bother documenting it. I don't think any normal person
is supposed to ever really care, but it simplifies testing when you want
to use the "git repack" wrapper rather than forcing you to use the core
programs (which already do support the window/depth arguments, of course).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 19 Apr 2006 09:25:29 +0000 (02:25 -0700)]
Merge branch 'fix'
* fix:
Document git-clone --reference
Fix filename scaling for binary files
Linus Torvalds [Tue, 18 Apr 2006 23:45:16 +0000 (16:45 -0700)]
get_sha1() shorthands for blob/tree objects
This is a fairly straightforward patch to allow "get_sha1()" to also have
shorthands for tree and blob objects.
The syntax is very simple and intuitive: you can specify a tree or a blob
by simply specifying <revision>:<path>, and get_sha1() will do the SHA1
lookup from the tree for you.
You can currently do it with "git ls-tree <rev> <path>" and parsing the
output, but that's actually pretty awkward.
With this, you can do something like
git cat-file blob v1.2.4:Makefile
to get the contents of "Makefile" at revision v1.2.4.
Now, this isn't necessarily something you really need all that often, but
the concept itself is actually pretty powerful. We could, for example,
allow things like
git diff v0.99.6:git-commit-script..v1.3.0:git-commit.sh
to see the difference between two arbitrary files in two arbitrary
revisions. To do that, the only thing we'd have to do is to make
git-diff-tree accept two blobs to diff, in addition to the two trees it
now expects.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Wed, 19 Apr 2006 03:31:41 +0000 (20:31 -0700)]
Fix uninteresting tags in new revision parsing
When I unified the revision argument parsing, I introduced a simple bug
wrt tags that had been marked uninteresting. When it was preparing for the
revision walk, it would mark all the parent commits of an uninteresting
tag correctly uninteresting, but it would forget about the commit itself.
This means that when I just did my 2.6.17-rc2 release, and my scripts
generated the log for "v2.6.17-rc1..v2.6.17-rc2", everything was fine,
except the commit pointed to by 2.6.17-rc1 (which shouldn't have been
there) was included. Even though it should obviously have been marked as
being uninteresting.
Not a huge deal, and the fix is trivial.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Wed, 19 Apr 2006 00:19:48 +0000 (20:19 -0400)]
Document git-clone --reference
The new --reference flag introduced to git-clone in
GIT 1.3.0 was not documented but is rather handy.
So document it.
Also corrected a minor issue with the documentation for the
-s flag; the info/alternates file name was spelled wrong.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca [Tue, 18 Apr 2006 21:26:43 +0000 (23:26 +0200)]
Fix filename scaling for binary files
Set maximum filename length for binary files so that scaling won't be
triggered and result in invalid string access.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 18 Apr 2006 20:57:22 +0000 (13:57 -0700)]
Merge branch 'jc/pager-cat'
* jc/pager-cat:
Do not fork PAGER=cat
Junio C Hamano [Tue, 18 Apr 2006 20:56:36 +0000 (13:56 -0700)]
Merge branch 'lt/logopt'
* lt/logopt:
Fix "git log --stat": make sure to set recursive with --stat.
combine-diff: show diffstat with the first parent.
git.c: LOGSIZE is unused after log printing cleanup.
Log message printout cleanups (#3): fix --pretty=oneline
Log message printout cleanups (#2)
Log message printout cleanups
rev-list --header: output format fix
Fixes for option parsing
log/whatchanged/show - log formatting cleanup.
Simplify common default options setup for built-in log family.
Tentative built-in "git show"
Built-in git-whatchanged.
rev-list option parser fix.
Split init_revisions() out of setup_revisions()
Fix up rev-list option parsing.
Fix up default abbrev in setup_revisions() argument parser.
Common option parsing for "git log --diff" and friends
Junio C Hamano [Tue, 18 Apr 2006 20:15:18 +0000 (13:15 -0700)]
GIT 1.3.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca [Mon, 6 Mar 2006 05:24:44 +0000 (06:24 +0100)]
Add git-annotate(1) and git-blame(1)
[jc: with entries in git.txt]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 18 Apr 2006 18:41:28 +0000 (11:41 -0700)]
Fix "git log --stat": make sure to set recursive with --stat.
Just like "patch" format always needs recursive, "diffstat"
format does not make sense without setting recursive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 18 Apr 2006 18:29:33 +0000 (11:29 -0700)]
diff --stat: make sure to set recursive.
Just like "patch" format always needs recursive, "diffstat"
format does not make sense without setting recursive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Herbert Valerio Riedel [Mon, 17 Apr 2006 10:58:39 +0000 (06:58 -0400)]
git-svnimport symlink support
added svn:special symlink support for access methods other than
direct-http
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Acked-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 18 Apr 2006 05:53:03 +0000 (22:53 -0700)]
combine-diff: show diffstat with the first parent.
Asking for stat (either with --stat or --patch-with-stat) gives
you diffstat for the first parent, even under combine-diff.
While the combined patch is useful to highlight the complexity
and interaction of the parts touched by all branches when
reviewing a merge commit, diffstat is a tool to assess the
extent of damage the merge brings in, and showing stat with the
first parent is more sensible than clever per-parent diffstat.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 18 Apr 2006 04:47:35 +0000 (21:47 -0700)]
git.c: LOGSIZE is unused after log printing cleanup.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Tue, 18 Apr 2006 00:43:40 +0000 (17:43 -0700)]
Log message printout cleanups (#3): fix --pretty=oneline
This option is very special, since pretty_print_commit() will _remove_
the newline at the end of it, so we want to have an extra separator
between the things.
I added a honking big comment this time, so that (a) I don't forget this
_again_ (I broke "oneline" several times during this printout cleanup),
and so that people can understand _why_ the code does what it does.
Now, arguably the alternate fix is to always have the '\n' at the end in
pretty-print-commit, but git-rev-list depends on the current behaviour
(but we could have git-rev-list remove it, whatever).
With the big comment, the code hopefully doesn't get broken again. And now
things like
git log --pretty=oneline --cc --patch-with-stat
works (even if that is admittedly a totally insane combination: if you
want the patch, having the "oneline" log format is just crazy, but hey,
it _works_. Even insane people are people).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Mon, 17 Apr 2006 23:59:42 +0000 (16:59 -0700)]
Log message printout cleanups (#2)
Here's a further patch on top of the previous one with cosmetic
improvements (no "real" code changes, just trivial updates):
- it gets the "---" before a diffstat right, including for the combined
merge case. Righ now the logic is that we always use "---" when we have
a diffstat, and an empty line otherwise. That's how I visually prefer
it, but hey, it can be tweaked later.
- I made "diff --cc/combined" add the "---/+++" header lines too. The
thing won't be mistaken for a valid diff, since the "@@" lines have too
many "@" characters (three or more), but it just makes it visually
match a real diff, which at least to me makes a big difference in
readability. Without them, it just looks very "wrong".
I guess I should have taken the filename from each individual entry
(and had one "---" file per parent), but I didn't even bother to try to
see how that works, so this was the simple thing.
With this, doing a
git log --cc --patch-with-stat
looks quite readable, I think. The only nagging issue - as far as I'm
concerned - is that diffstats for merges are pretty questionable the way
they are done now. I suspect it would be better to just have the _first_
diffstat, and always make the merge diffstat be the one for "result
against first parent".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 18 Apr 2006 00:46:07 +0000 (17:46 -0700)]
packed_object_info_detail(): check for corrupt packfile.
Serge E. Hallyn noticed that we compute how many input bytes are
still left, but did not use it for sanity checking.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Mon, 17 Apr 2006 18:59:32 +0000 (11:59 -0700)]
Log message printout cleanups
On Sun, 16 Apr 2006, Junio C Hamano wrote:
>
> In the mid-term, I am hoping we can drop the generate_header()
> callchain _and_ the custom code that formats commit log in-core,
> found in cmd_log_wc().
Ok, this was nastier than expected, just because the dependencies between
the different log-printing stuff were absolutely _everywhere_, but here's
a patch that does exactly that.
The patch is not very easy to read, and the "--patch-with-stat" thing is
still broken (it does not call the "show_log()" thing properly for
merges). That's not a new bug. In the new world order it _should_ do
something like
if (rev->logopt)
show_log(rev, rev->logopt, "---\n");
but it doesn't. I haven't looked at the --with-stat logic, so I left it
alone.
That said, this patch removes more lines than it adds, and in particular,
the "cmd_log_wc()" loop is now a very clean:
while ((commit = get_revision(rev)) != NULL) {
log_tree_commit(rev, commit);
free(commit->buffer);
commit->buffer = NULL;
}
so it doesn't get much prettier than this. All the complexity is entirely
hidden in log-tree.c, and any code that needs to flush the log literally
just needs to do the "if (rev->logopt) show_log(...)" incantation.
I had to make the combined_diff() logic take a "struct rev_info" instead
of just a "struct diff_options", but that part is pretty clean.
This does change "git whatchanged" from using "diff-tree" as the commit
descriptor to "commit", and I changed one of the tests to reflect that new
reality. Otherwise everything still passes, and my other tests look fine
too.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Serge E. Hallyn [Mon, 17 Apr 2006 15:14:48 +0000 (10:14 -0500)]
cleanups: remove unused variable from exec_cmd.c
Not sure whether it should be removed, or whether
execv_git_cmd() should return it rather than -1 at bottom.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Serge E. Hallyn [Mon, 17 Apr 2006 15:14:48 +0000 (10:14 -0500)]
cleanups: prevent leak of two strduped strings in config.c
Config_filename and lockfile are strduped and then leaked in
git_config_set_multivar.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Serge E. Hallyn [Mon, 17 Apr 2006 15:14:48 +0000 (10:14 -0500)]
cleanups: Remove impossible case in quote.c
The switch is inside an if statement which is false if
the character is ' '. Either the if should be <=' '
instead of <' ', or the case should be removed as it could
be misleading.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Serge E. Hallyn [Mon, 17 Apr 2006 15:14:47 +0000 (10:14 -0500)]
cleanups: Remove unused vars from combine-diff.c
Mod_type in particular sure looks like it wants to be used, but isn't.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Serge E. Hallyn [Mon, 17 Apr 2006 15:14:47 +0000 (10:14 -0500)]
cleanups: Fix potential bugs in connect.c
The strncmp for ACK was ACK does not include the final space.
Presumably either we should either remove the trailing space,
or compare 4 chars (as this patch does).
'path' is sometimes strdup'ed, but never freed.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 17 Apr 2006 22:03:11 +0000 (15:03 -0700)]
Merge branch 'jc/boundary'
* jc/boundary:
rev-list --boundary: show boundary commits even when limited otherwise.
Junio C Hamano [Mon, 17 Apr 2006 22:03:10 +0000 (15:03 -0700)]
Merge branch 'jc/bottomless'
* jc/bottomless:
rev-list --bisect: limit list before bisecting.
Yann Dirson [Mon, 17 Apr 2006 11:41:49 +0000 (13:41 +0200)]
Allow empty lines in info/grafts
In addition to the existing comment support, that just allows the user
to use a convention that works pretty much everywhere else.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 17 Apr 2006 19:42:36 +0000 (12:42 -0700)]
rev-list --header: output format fix
Initial fix prepared by Johannes, but I did it slightly differently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 17 Apr 2006 01:12:49 +0000 (18:12 -0700)]
rev-list --boundary: show boundary commits even when limited otherwise.
The boundary commits are shown for UI like gitk to draw them as
soon as topo-order sorting allows, and should not be omitted by
get_revision() filtering logic. As long as their immediate
child commits are shown, we should not filter them out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
A Large Angry SCM [Mon, 17 Apr 2006 03:17:38 +0000 (20:17 -0700)]
Makefile fixups.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 17 Apr 2006 01:59:30 +0000 (18:59 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix bug caused by missing commitlisted elements
Paul Mackerras [Mon, 17 Apr 2006 00:27:59 +0000 (10:27 +1000)]
gitk: Fix bug caused by missing commitlisted elements
This bug was reported by Yann Dirson, and results in an 'Error:
expected boolean value but got ""' dialog when scrolling to the bottom
of the graph under some circumstances. The issue is that git-rev-list
isn't outputting all the boundary commits when it is asked for commits
affecting only certain files. We already cope with that by adding the
missing boundary commits in addextraid, but there we weren't adding a
0 to the end of the commitlisted list when we added the extra id to
the end of the displayorder list.
This fixes it by appending 0 to commitlisted in addextraid, thus keeping
commitlisted and displayorder in sync.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Linus Torvalds [Sun, 16 Apr 2006 22:17:23 +0000 (15:17 -0700)]
Fixes for option parsing
Make sure "git show" always show the header, regardless of whether there
is a diff or not.
Also, make sure "always_show_header" actually works, since generate_header
only tested it in one out of three return paths.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 21:24:56 +0000 (14:24 -0700)]
reading $GIT_DIR/info/graft - skip comments correctly.
Noticed by Yann Dirson.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 10:29:10 +0000 (03:29 -0700)]
log/whatchanged/show - log formatting cleanup.
This moves the decision to print the log message, while diff
options are in effect, to log-tree. It gives behaviour closer
to the traditional one.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 09:42:00 +0000 (02:42 -0700)]
Simplify common default options setup for built-in log family.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 09:31:11 +0000 (02:31 -0700)]
Merge branch 'master' into lt/logopt
* master:
pager: do not fork a pager if PAGER is set to empty.
diff-options: add --patch-with-stat
diff-files --stat: do not dump core with unmerged index.
Support "git cmd --help" syntax
diff --stat: do not do its own three-dashes.
diff-tree: typefix.
GIT v1.3.0-rc4
xdiff: post-process hunks to make them consistent.
Junio C Hamano [Sun, 16 Apr 2006 08:46:08 +0000 (01:46 -0700)]
Do not fork PAGER=cat
Unless the user has a nonstandard "cat" command that does not
meow like a cat, this should not break anything and would save an
extra pipe.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sun, 16 Apr 2006 02:44:25 +0000 (04:44 +0200)]
pager: do not fork a pager if PAGER is set to empty.
This skips an extra pipe, and helps debugging tremendously.
[jc: PAGER=cat is a questionable hack and should be done as a separate
patch. ]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 15 Apr 2006 19:09:56 +0000 (12:09 -0700)]
Tentative built-in "git show"
This uses the "--no-walk" flag that I never actually implemented (but I'm
sure I mentioned it) to make "git show" be essentially the same thing as
"git whatchanged --no-walk".
It just refuses to add more interesting parents to the revision walking
history, so you don't actually get any history, you just get the commit
you asked for.
I was going to add "--no-walk" as a real argument flag to git-rev-list
too, but I'm not sure anybody actually needs it. Although it might be
useful for porcelain, so I left the door open.
[jc: ported to the unified option structure by Linus]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 07:07:41 +0000 (00:07 -0700)]
Built-in git-whatchanged.
Split internal "git log" into reusable piece and add "git
whatchanged". This is based on the option parsing unification
work Linus did.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 06:48:27 +0000 (23:48 -0700)]
rev-list option parser fix.
The big option parser unification broke rev-list the big way;
this makes it use options from the parsed revs structure.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 06:46:36 +0000 (23:46 -0700)]
Split init_revisions() out of setup_revisions()
Merging all three option parsers related to whatchanged is
unarguably the right thing, but the fallout was too big to scare
me away. Let's try it once again, but once step at time.
This splits out init_revisions() call from setup_revisions(), so
that the callers can set different defaults to match the
traditional benaviour.
The rev-list command is still broken in a big way, which is the
topic of next step.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sat, 15 Apr 2006 11:41:18 +0000 (13:41 +0200)]
diff-options: add --patch-with-stat
With this option, git prepends a diffstat in front of the patch.
Since I really, really do not know what a diffstat of a combined diff
("merge diff") should look like, the diffstat is not generated for these.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 16 Apr 2006 01:38:32 +0000 (18:38 -0700)]
diff-files --stat: do not dump core with unmerged index.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 15 Apr 2006 18:13:49 +0000 (11:13 -0700)]
Support "git cmd --help" syntax
The "--help" argument is special, in that it is (along with "--version")
in that is taken by the "git" program itself rather than the sub-command,
and thus we've had the syntax "git --help cmd".
However, as anybody who has ever used CVS or some similar devil-spawn
program, it's confusing as h*ll when options before the sub-command act
differently from options after the sub-command, so this quick hack just
makes it acceptable to do "git cmd --help" instead, and get the exact same
result.
It may be hacky, but it's simple and does the trick.
Of course, this does not help if you use one of the non-builtin commands
without using the "git" helper. Ie you won't be getting a man-page just
because you do "git-rev-list --help". Don't expect us to be quite _that_
helpful.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 15 Apr 2006 21:02:10 +0000 (14:02 -0700)]
diff --stat: do not do its own three-dashes.
I missed that "git-diff-* --stat" spits out three-dash separator
on its own without being asked. Remove it.
When we output commit log followed by diff, perhaps --patch-with-stat,
for downstream consumer, we _would_ want the three-dash between
the message and the diff material, but that logic belongs to the
caller, not diff generator.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 15 Apr 2006 10:22:00 +0000 (03:22 -0700)]
diff-tree: typefix.
Recent diff_tree_setup_paths() update made it take a second
argument of type "struct diff_options", but we passed another
struct that happenes to have that type at the beginning by
mistake.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 15 Apr 2006 06:21:34 +0000 (23:21 -0700)]
GIT v1.3.0-rc4
I've merged everything I think is ready for 1.3.0, so this is
the final round -- hopefully I can release this with minimum
last-minute fixup as v1.3.0 early next week.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 15 Apr 2006 05:58:17 +0000 (22:58 -0700)]
Merge branch 'dl/xdiff'
* dl/xdiff:
xdiff: post-process hunks to make them consistent.
Junio C Hamano [Sat, 15 Apr 2006 05:43:34 +0000 (22:43 -0700)]
Fix up rev-list option parsing.
rev-list does not take diff options, so barf after seeing some.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 15 Apr 2006 05:19:38 +0000 (22:19 -0700)]
Fix up default abbrev in setup_revisions() argument parser.
The default abbreviation precision should be DEFAULT_ABBREV as before.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Fri, 14 Apr 2006 23:52:13 +0000 (16:52 -0700)]
Common option parsing for "git log --diff" and friends
This basically does a few things that are sadly somewhat interdependent,
and nontrivial to split out
- get rid of "struct log_tree_opt"
The fields in "log_tree_opt" are moved into "struct rev_info", and all
users of log_tree_opt are changed to use the rev_info struct instead.
- add the parsing for the log_tree_opt arguments to "setup_revision()"
- make setup_revision set a flag (revs->diff) if the diff-related
arguments were used. This allows "git log" to decide whether it wants
to show diffs or not.
- make setup_revision() also initialize the diffopt part of rev_info
(which we had from before, but we just didn't initialize it)
- make setup_revision() do all the "finishing touches" on it all (it will
do the proper flag combination logic, and call "diff_setup_done()")
Now, that was the easy and straightforward part.
The slightly more involved part is that some of the programs that want to
use the new-and-improved rev_info parsing don't actually want _commits_,
they may want tree'ish arguments instead. That meant that I had to change
setup_revision() to parse the arguments not into the "revs->commits" list,
but into the "revs->pending_objects" list.
Then, when we do "prepare_revision_walk()", we walk that list, and create
the sorted commit list from there.
This actually cleaned some stuff up, but it's the less obvious part of the
patch, and re-organized the "revision.c" logic somewhat. It actually paves
the way for splitting argument parsing _entirely_ out of "revision.c",
since now the argument parsing really is totally independent of the commit
walking: that didn't use to be true, since there was lots of overlap with
get_commit_reference() handling etc, now the _only_ overlap is the shared
(and trivial) "add_pending_object()" thing.
However, I didn't do that file split, just because I wanted the diff
itself to be smaller, and show the actual changes more clearly. If this
gets accepted, I'll do further cleanups then - that includes the file
split, but also using the new infrastructure to do a nicer "git diff" etc.
Even in this form, it actually ends up removing more lines than it adds.
It's nice to note how simple and straightforward this makes the built-in
"git log" command, even though it continues to support all the diff flags
too. It doesn't get much simpler that this.
I think this is worth merging soonish, because it does allow for future
cleanup and even more sharing of code. However, it obviously touches
"revision.c", which is subtle. I've tested that it passes all the tests we
have, and it passes my "looks sane" detector, but somebody else should
also give it a good look-over.
[jc: squashed the original and three "oops this too" updates, with
another fix-up.]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 15 Apr 2006 04:55:23 +0000 (21:55 -0700)]
Merge branch 'js/diffstat'
* js/diffstat:
diff --stat: no need to ask funcnames nor context.
diff-options: add --stat (take 2)
diff-options: add --stat (take 2)
Junio C Hamano [Sat, 15 Apr 2006 04:55:22 +0000 (21:55 -0700)]
Merge branch 'jc/fix5500'
* jc/fix5500:
t5500: test fix
Junio C Hamano [Fri, 14 Apr 2006 22:57:32 +0000 (15:57 -0700)]
rev-list --bisect: limit list before bisecting.
I noticed bisect does not work well without both good and bad.
Running this script in git.git repository would give you quite
different results:
#!/bin/sh
initial=
e83c5163316f89bfbde7d9ab23ca2e25604af290
mid0=`git rev-list --bisect ^$initial --all`
git rev-list $mid0 | wc -l
git rev-list ^$mid0 --all | wc -l
mid1=`git rev-list --bisect --all`
git rev-list $mid1 | wc -l
git rev-list ^$mid1 --all | wc -l
The $initial commit is the very first commit you made. The
first midpoint bisects things evenly as designed, but the latter
does not.
The reason I got interested in this was because I was wondering
if something like the following would help people converting a
huge repository from foreign SCM, or preparing a repository to
be fetched over plain dumb HTTP only:
#!/bin/sh
N=4
P=.git/objects/pack
bottom=
while test 0 \< $N
do
N=$((N-1))
if test -z "$bottom"
then
newbottom=`git rev-list --bisect --all`
else
newbottom=`git rev-list --bisect ^$bottom --all`
fi
if test -z "$bottom"
then
rev_list="$newbottom"
elif test 0 = $N
then
rev_list="^$bottom --all"
else
rev_list="^$bottom $newbottom"
fi
p=$(git rev-list --unpacked --objects $rev_list |
git pack-objects $P/pack)
git show-index <$P/pack-$p.idx | wc -l
bottom=$newbottom
done
The idea is to pack older half of the history to one pack, then
older half of the remaining history to another, to continue a
few times, using finer granularity as we get closer to the tip.
This may not matter, since for a truly huge history, running
bisect number of times could be quite time consuming, and we
might be better off running "git rev-list --all" once into a
temporary file, and manually pick cut-off points from the
resulting list of commits. After all we are talking about
"approximately half" for such an usage, and older history does
not matter much.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Sat, 15 Apr 2006 04:20:51 +0000 (21:20 -0700)]
Clean up trailing whitespace when pretty-printing commits
Partly because we've messed up and now have some commits with trailing
whitespace, but partly because this also just simplifies the code, let's
remove trailing whitespace from the end when pretty-printing commits.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 22:54:51 +0000 (15:54 -0700)]
"git cmd -h" for shell scripts.
Wrappers that use sh-setup took --help but not -h. Noticed by
Sébastien Pierre.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 19:59:09 +0000 (12:59 -0700)]
git-log <diff-options> <paths> documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 19:47:10 +0000 (12:47 -0700)]
Retire git-log.sh (take #4)
Noticed by Johannes. We do not install it anymore, but still have
been shipping the source, which was crazy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 19:41:51 +0000 (12:41 -0700)]
stripspace: incomplete line fix (take #2)
This fixes
f4ee3eb68906f079dea45de4f1bbb03d68189eb3 breakage, which
added an extra trailing blank line after stripping trailing blank lines
by mistake.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 05:28:06 +0000 (22:28 -0700)]
t5500: test fix
Relying on eye-candy progress bar was fragile to begin with.
Run fetch-pack with -k option, and count the objects that are in
the pack that were transferred from the other end.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 04:35:54 +0000 (21:35 -0700)]
diff --stat: no need to ask funcnames nor context.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 14 Apr 2006 02:05:38 +0000 (19:05 -0700)]
Fix-up previous expr changes.
The regexp on the right hand side of expr : operator somehow was
broken.
expr 'z+pu:refs/tags/ko-pu' : 'z\+\(.*\)'
does not strip '+'; write 'z+\(.*\)' instead.
We probably should switch to shell based substring post 1.3.0;
that's not bashism but just POSIX anyway.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Thu, 13 Apr 2006 23:09:48 +0000 (01:09 +0200)]
diff-options: add --stat (take 2)
... and a fix for an invalid free():
Signed-off-by: Junio C Hamano <junkio@cox.net>
Davide Libenzi [Thu, 13 Apr 2006 23:45:13 +0000 (16:45 -0700)]
xdiff: post-process hunks to make them consistent.
Johannes Schindelin [Thu, 13 Apr 2006 22:15:30 +0000 (00:15 +0200)]
diff-options: add --stat (take 2)
Now, you can say "git diff --stat" (to get an idea how many changes are
uncommitted), or "git log --stat".
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Mark Wooding [Thu, 13 Apr 2006 22:01:24 +0000 (22:01 +0000)]
Shell utilities: Guard against expr' magic tokens.
Some words, e.g., `match', are special to expr(1), and cause strange
parsing effects. Track down all uses of expr and mangle the arguments
so that this isn't a problem.
Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 13 Apr 2006 18:57:57 +0000 (11:57 -0700)]
t3600-rm: skip failed-remove test when we cannot make an unremovable file.
When running t3600-rm test under fakeroot (or as root), we
cannot make a file unremovable with "chmod a-w .". Detect this
case early and skip that test.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds [Thu, 13 Apr 2006 17:01:02 +0000 (10:01 -0700)]
Use less memory in "git log"
This trivially avoids keeping the commit message data around after we
don't need it any more, avoiding a continually growing "git log" memory
footprint.
It's not a huge deal, but it's somewhat noticeable. For the current kernel
tree, doing a full "git log" I got
- before: /usr/bin/time git log > /dev/null
0.81user 0.02system 0:00.84elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+8851minor)pagefaults 0swaps
- after: /usr/bin/time git log > /dev/null
0.79user 0.03system 0:00.83elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+5039minor)pagefaults 0swaps
ie the touched pages dropped from 8851 to 5039. For the historic kernel
archive, the numbers are 18357->11037 minor page faults.
We could/should in theory free the commits themselves, but that's really a
lot harder, since during revision traversal we may hit the same commit
twice through different children having it as a parent, even after we've
shown it once (when that happens, we'll silently ignore it next time, but
we still need the "struct commit" to know).
And as the commit message data is clearly the biggest part of the commit,
this is the really easy 60% solution.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 13 Apr 2006 07:26:21 +0000 (00:26 -0700)]
git-log: do not output excess blank line between commits
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 13 Apr 2006 07:17:19 +0000 (00:17 -0700)]
Makefile: $(MAKE) check-docs
This target lists undocumented commands, and/or whose document
is not referenced from the main git documentation.
For now, there are some exceptions I added primarily because I
lack the energy to document them myself:
- merge backends (we should really document them)
- ssh-push/ssh-pull (does anybody still use them?)
- annotate and blame (maybe after one of them eats the other ;-)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 13 Apr 2006 07:09:54 +0000 (00:09 -0700)]
Documentation: add a couple of missing docs.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 12 Apr 2006 20:24:48 +0000 (13:24 -0700)]
Merge branch 'jc/combine' into next
* jc/combine:
stripspace: make sure not to leave an incomplete line.
git-commit: do not muck with commit message when no_edit is set.
When showing a commit message, do not lose an incomplete line.
Retire t5501-old-fetch-and-upload test.
combine-diff: type fix.
Junio C Hamano [Wed, 12 Apr 2006 20:24:04 +0000 (13:24 -0700)]
Merge branch 'master' into jc/combine
* master:
stripspace: make sure not to leave an incomplete line.
git-commit: do not muck with commit message when no_edit is set.
When showing a commit message, do not lose an incomplete line.
Retire t5501-old-fetch-and-upload test.