gitweb.git
blame: Fix path pruningFredrik Kuivinen Wed, 3 May 2006 21:28:46 +0000 (23:28 +0200)

blame: Fix path pruning

This makes git-blame useable again, it has been totally broken for
some time on larger repositories.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsserver: use git-rev-list instead of git-logMartin Langhoff Wed, 3 May 2006 22:53:37 +0000 (10:53 +1200)

cvsserver: use git-rev-list instead of git-log

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix "git-log --parents" breakage post v1.3.0Linus Torvalds Wed, 3 May 2006 14:59:00 +0000 (07:59 -0700)

Fix "git-log --parents" breakage post v1.3.0

Post 1.3.0 "git log" forgets to list parent commits on the first line
when --parents is given. git-cvsserver relied on it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

add documentation for update-index --unresolveMatthias Kestenholz Wed, 3 May 2006 10:53:19 +0000 (12:53 +0200)

add documentation for update-index --unresolve

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Wed, 3 May 2006 03:07:14 +0000 (20:07 -0700)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Allow view to specify arbitrary arguments to git-rev-list
gitk: Fix file list display when files are renamed
gitk: Basic support for highlighting one view within another
gitk: Add a tree-browsing mode
gitk: Use a text widget for the file list
gitk: add menu item for editing the current view
gitk: Implement "permanent" views (stored in ~/.gitk)
gitk: Use git-rev-parse only to identify file/dir names on cmd line
gitk: Remember the view in the history list
gitk: Don't reread git-rev-list output from scratch on view switch
gitk: Fix various bugs in the view support
gitk: Make File->Update work properly again
gitk: Implement multiple views
[PATCH] gitk: Add a visual tag for remote refs

gitk: Allow view to specify arbitrary arguments to... Paul Mackerras Tue, 2 May 2006 23:32:53 +0000 (09:32 +1000)

gitk: Allow view to specify arbitrary arguments to git-rev-list

The list of arguments to git-rev-list, including arguments that
select the range of commits, is now a part of the view specification.
If any arguments are given to gitk, they become part of the
"Command line" view, and the non-file arguments become the default
for any new views created.

Getting an error from git-rev-list is no longer fatal; instead the
error window pops up, and when you press OK, the main window just
shows "No commits selected".

The git-rev-list arguments are entered in an entry widget in the
view editor window using shell quoting conventions, not Tcl quoting
conventions.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'fix'Junio C Hamano Tue, 2 May 2006 22:05:34 +0000 (15:05 -0700)

Merge branch 'fix'

* fix:
git-send-email: fix version string to be valid perl
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

git-send-email: fix version string to be valid perlMartin Langhoff Tue, 2 May 2006 21:44:36 +0000 (09:44 +1200)

git-send-email: fix version string to be valid perl

This makes git-send-email easier to develop and debug, skipping the need
to `make git-send-email` every time.

Signed-off-by: Junio C Hamano <junkio@cox.net>

repo-config: trim white-space before commentJohannes Schindelin Tue, 2 May 2006 14:58:37 +0000 (16:58 +0200)

repo-config: trim white-space before comment

Earlier, calling

git-repo-config core.hello

on a .git/config like this:

[core]
hello = world ; a comment

would yield "world " (i.e. with a trailing space).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

repo-config: fix segfault with no argument.Johannes Schindelin Tue, 2 May 2006 19:54:12 +0000 (12:54 -0700)

repo-config: fix segfault with no argument.

An earlier addition of --list feature was carelessly done and
caused an invalid access to argv[1] when it was not given.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Give the user a hint for how to continue in the case... Robert Shearman Tue, 2 May 2006 12:32:43 +0000 (13:32 +0100)

Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

Give the user a hint for how to continue in the case that git-am fails
because it requires user intervention.

Signed-off-by: Robert Shearman <rob@codeweaves.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Fix file list display when files are renamedPaul Mackerras Tue, 2 May 2006 09:55:31 +0000 (19:55 +1000)

gitk: Fix file list display when files are renamed

The conversion of the file list to use a text widget assumed incorrectly
that the list of files from git-diff-tree -r would correspond 1-1 with
the diff sections in the output of git-diff-tree -r -p -C, which is
not true when renames are detected. This fixes it by keeping the
elements in the difffilestart list in the order they appear in the
file list window.

Since this means that the elements of difffilestart are no longer
necessarily in ascending order, it's somewhat hard to do the dynamic
highlighting in the file list as the diff window is scrolled, so I
have taken that out for now.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'jc/xsha1-2'Junio C Hamano Tue, 2 May 2006 05:55:40 +0000 (22:55 -0700)

Merge branch 'jc/xsha1-2'

* jc/xsha1-2:
Extended SHA1 -- "rev^@" syntax to mean "all parents"

Merge branch 'jc/pack'Junio C Hamano Tue, 2 May 2006 05:54:22 +0000 (22:54 -0700)

Merge branch 'jc/pack'

Merge branch 'jc/pathcheck'Junio C Hamano Tue, 2 May 2006 05:51:27 +0000 (22:51 -0700)

Merge branch 'jc/pathcheck'

* jc/pathcheck:
revision parsing: make "rev -- paths" checks stronger.

Merge branch 'nh/fetch-http'Junio C Hamano Tue, 2 May 2006 05:42:01 +0000 (22:42 -0700)

Merge branch 'nh/fetch-http'

* nh/fetch-http:
git-fetch: resolve remote symrefs for HTTP transport

Merge branch 'se/rebase'Junio C Hamano Tue, 2 May 2006 05:39:57 +0000 (22:39 -0700)

Merge branch 'se/rebase'

* se/rebase:
Add --continue and --abort options to git-rebase.

gitk: Basic support for highlighting one view within... Paul Mackerras Tue, 2 May 2006 01:15:29 +0000 (11:15 +1000)

gitk: Basic support for highlighting one view within another

With this, one view can be used as a highlight for another, so that
the commits that are in the highlight view are displayed in bold.
This required some fairly major changes to how the list of ids,
parents, children, and id to row mapping were stored for each view.
We can now be reading in several views at once; for all except the
current view, we just update the displayorder and the lists of parents
and children for the view.

This also creates a little bit of infrastructure for handling the
watch cursor.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Extended SHA1 -- "rev^@" syntax to mean "all parents"Junio C Hamano Sun, 30 Apr 2006 07:54:29 +0000 (00:54 -0700)

Extended SHA1 -- "rev^@" syntax to mean "all parents"

A short-hand "rev^@" is understood to be "all parents of the
named commit" with this patch. So you can do

git show v1.0.0^@

to view the parents of a merge commit,

gitk ^v1.0.0^@ v1.0.4

to view the log between two revs (including the bottom one), and

git diff --cc v1.1.0 v1.0.0^@

to inspect what got changed from the merge parents of v1.0.0 to v1.1.0.

This might be just my shiny new toy that is not very useful in
practice. I needed it to do the multi-tree diff on Len's
infamous 12-way Octopus; typing "diff --cc funmerge funmerge^1
funmerge^2 funmerge^3 ..." was too painful.

[jc: taking suggestions from Linus and Johannes to match expectations
from shell users who are used to see $@ or $* either of which makes
sense. I tend to write "$@" more often so...]

Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Add a tree-browsing modePaul Mackerras Sun, 30 Apr 2006 23:50:57 +0000 (09:50 +1000)

gitk: Add a tree-browsing mode

You can now select whether you want to see the patch for a commit
or the whole tree. If you select the tree, gitk will now display
the commit message plus the contents of one file in the bottom-left
pane, when you click on the name of the file in the bottom-right pane.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'fix'Junio C Hamano Sun, 30 Apr 2006 07:59:10 +0000 (00:59 -0700)

Merge branch 'fix'

* fix:
git-format-patch: Use rfc2822 compliant date.

git-format-patch: Use rfc2822 compliant date.Huw Davies Sat, 29 Apr 2006 15:50:28 +0000 (15:50 +0000)

git-format-patch: Use rfc2822 compliant date.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'fix'Junio C Hamano Fri, 28 Apr 2006 23:57:32 +0000 (16:57 -0700)

Merge branch 'fix'

* fix:
Fix trivial typo in git-log man page.
Properly render asciidoc "callouts" in git man pages.
Fix up remaining man pages that use asciidoc "callouts".
Update the git-branch man page to include the "-r" option,
annotate: display usage information if no filename was given
annotate: fix warning about uninitialized scalar
git-am --resolved: more usable error message.

Fix trivial typo in git-log man page.Sean Estabrooks Fri, 28 Apr 2006 13:15:03 +0000 (09:15 -0400)

Fix trivial typo in git-log man page.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

Properly render asciidoc "callouts" in git man pages.Sean Estabrooks Fri, 28 Apr 2006 13:15:06 +0000 (09:15 -0400)

Properly render asciidoc "callouts" in git man pages.

Adds an xsl fragment to render docbook callouts when
converting to man page format. Update the Makefile
to have "xmlto" use it when generating man pages.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks Fri, 28 Apr 2006 13:15:05 +0000 (09:15 -0400)

Fix up remaining man pages that use asciidoc "callouts".

Unfortunately docbook does not allow a callout to be
referenced from inside a callout list description.
Rewrite one paragraph in git-reset man page to work
around this limitation.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

Update the git-branch man page to include the "-r"... Sean Estabrooks Fri, 28 Apr 2006 13:15:04 +0000 (09:15 -0400)

Update the git-branch man page to include the "-r" option,

and fix up asciidoc "callouts"

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>

annotate: display usage information if no filename... Matthias Kestenholz Fri, 28 Apr 2006 08:41:19 +0000 (10:41 +0200)

annotate: display usage information if no filename was given

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>

annotate: fix warning about uninitialized scalarMatthias Kestenholz Fri, 28 Apr 2006 08:42:28 +0000 (10:42 +0200)

annotate: fix warning about uninitialized scalar

Use of uninitialized value in scalar chomp at
./git-annotate.perl line 212, <$kid> chunk 4.

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>

git-am --resolved: more usable error message.Junio C Hamano Fri, 28 Apr 2006 09:32:44 +0000 (02:32 -0700)

git-am --resolved: more usable error message.

After doing the hard work of hand resolving the conflicts in the
working tree, if the user forgets to run update-index to mark
the paths that have been resolved, the command gave an
unfriendly "fatal: git-write-tree: not able to write tree" error
message. Catch the situation early and give more meaningful
message and suggestion.

Noticed and suggested by Len Brown.

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: update size heuristucs.Junio C Hamano Fri, 28 Apr 2006 02:31:46 +0000 (19:31 -0700)

pack-objects: update size heuristucs.

We used to omit delta base candidates that is much bigger than
the target, but delta size does not grow when we delete more, so
that was not a very good heuristics.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'fix'Junio C Hamano Thu, 27 Apr 2006 22:42:32 +0000 (15:42 -0700)

Merge branch 'fix'

* fix:
verify-pack: check integrity in a saner order.

verify-pack: check integrity in a saner order.Junio C Hamano Thu, 27 Apr 2006 22:42:01 +0000 (15:42 -0700)

verify-pack: check integrity in a saner order.

Check internal integrity to report corrupt pack or idx, and
then check cross-integrity between idx and pack.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'pb/config'Junio C Hamano Thu, 27 Apr 2006 19:23:01 +0000 (12:23 -0700)

Merge branch 'pb/config'

* pb/config:
git-cvsserver: typofixes
Deprecate usage of git-var -l for getting config vars list
git-repo-config --list support

Merge branch 'jc/diffstat'Junio C Hamano Thu, 27 Apr 2006 18:58:33 +0000 (11:58 -0700)

Merge branch 'jc/diffstat'

* jc/diffstat:
diff --stat: show complete rewrites consistently.

Fix "git help -a" terminal autosizingLinus Torvalds Thu, 27 Apr 2006 16:02:54 +0000 (09:02 -0700)

Fix "git help -a" terminal autosizing

When I split out the builtin commands into their own files, I left the
include of <sys/ioctl.h> in git.c rather than moving it to the file that
needed it (builtin-help.c).

Nobody seems to have noticed, because everything still worked, but because
the TIOCGWINSZ macro was now no longer defined when compiling the
"term_columns()" function, it would no longer automatically notice the
terminal size unless your system used the ancient "COLUMNS" environment
variable approach.

Trivially fixed by just moving the header include to the file that
actually needs it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Use a text widget for the file listPaul Mackerras Thu, 27 Apr 2006 09:21:49 +0000 (19:21 +1000)

gitk: Use a text widget for the file list

This lets us do things like highlighting all the entries for which
the corresponding part of the diff is at least partly visible in the
commit/patch display window, and in future it will let us display
the file list in a hierarchical form rather than as a flat file list.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff-index: fix compilation warnings.Junio C Hamano Thu, 27 Apr 2006 08:59:00 +0000 (01:59 -0700)

diff-index: fix compilation warnings.

Signed-off-by: Junio C Hamano <junkio@cox.net>

t0000-basic: more commit-tree tests.Junio C Hamano Thu, 27 Apr 2006 01:25:15 +0000 (18:25 -0700)

t0000-basic: more commit-tree tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-fetch: resolve remote symrefs for HTTP transportNick Hengeveld Wed, 26 Apr 2006 16:10:01 +0000 (09:10 -0700)

git-fetch: resolve remote symrefs for HTTP transport

git-fetch validates that a remote ref resolves to a SHA1 prior to calling
git-http-fetch. This adds support for resolving a few levels of symrefs
to get to the SHA1.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add --continue and --abort options to git-rebase.sean Wed, 26 Apr 2006 14:49:38 +0000 (10:49 -0400)

Add --continue and --abort options to git-rebase.

git rebase [--onto <newbase>] <upstream> [<branch>]
git rebase --continue
git rebase --abort

Add "--continue" to restart the rebase process after
manually resolving conflicts. The user is warned if
there are still differences between the index and the
working files.

Add "--abort" to restore the original branch, and
remove the .dotest working files.

Some minor additions to the git-rebase documentation.

[jc: fix that applies to the maintenance track has been dealt
with separately.]

Signed-off-by: Junio C Hamano <junkio@cox.net>

revision parsing: make "rev -- paths" checks stronger.Junio C Hamano Wed, 26 Apr 2006 22:09:27 +0000 (15:09 -0700)

revision parsing: make "rev -- paths" checks stronger.

If you don't have a "--" marker, then:

- all of the arguments we are going to assume are pathspecs
must exist in the working tree.

- none of the arguments we parsed as revisions could be
interpreted as a filename.

so that there really isn't any possibility of confusion in case
somebody does have a revision that looks like a pathname too.

The former rule has been in effect; this implements the latter.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'fix'Junio C Hamano Thu, 27 Apr 2006 00:08:00 +0000 (17:08 -0700)

Merge branch 'fix'

* fix:
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error

commit-tree.c: check_valid() microoptimization.Junio C Hamano Wed, 26 Apr 2006 23:55:25 +0000 (16:55 -0700)

commit-tree.c: check_valid() microoptimization.

There is no point reading the whole object just to make sure it exists and
it is of the expected type. We added sha1_object_info() for such need
after this code was written, so use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix filename verification when in a subdirectoryLinus Torvalds Wed, 26 Apr 2006 17:15:54 +0000 (10:15 -0700)

Fix filename verification when in a subdirectory

When we are in a subdirectory of a git archive, we need to take the prefix
of that subdirectory into accoung when we verify filename arguments.

Noted by Matthias Lederhofer

This also uses the improved error reporting for all the other git commands
that use the revision parsing interfaces, not just git-rev-parse. Also, it
makes the error reporting for mixed filenames and argument flags clearer
(you cannot put flags after the start of the pathname list).

[jc: with fix to a trivial typo noticed by Timo Hirvonen]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

rebase: typofix.Junio C Hamano Wed, 26 Apr 2006 19:07:42 +0000 (12:07 -0700)

rebase: typofix.

Noticed by Sean.

Signed-off-by: Junio C Hamano <junkio@cox.net>

commit-tree: allow generic object name for the tree... Junio C Hamano Wed, 26 Apr 2006 10:18:51 +0000 (03:18 -0700)

commit-tree: allow generic object name for the tree as well.

We use get_sha1() for -p (parent) objects, but still used
get_sha1_hex() for the tree. Just to be consistent, allow
extended SHA1 expression for the tree object name.

Note that this is not to encourage funky things like this:

git-commit-tree HEAD^{tree} -p HEAD

Signed-off-by: Junio C Hamano <junkio@cox.net>

Makefile: remove and create xdiff library from scratch.Junio C Hamano Wed, 26 Apr 2006 10:12:58 +0000 (03:12 -0700)

Makefile: remove and create xdiff library from scratch.

... in the same spirit as 71459c193d04870076efa0a387c317390b53e3e2.

Signed-off-by: Junio C Hamano <junkio@cox.net>

t0000-basic: Add ls-tree recursive test back.Junio C Hamano Wed, 26 Apr 2006 09:27:59 +0000 (02:27 -0700)

t0000-basic: Add ls-tree recursive test back.

When we updated ls-tree recursive output to omit the tree nodes,
246cc52f388cae8ca99e5a12b8458c9bfa467765 adjusted the old test
so that we do not expect to see trees in its output. Later,
with 0f8f45cb4a7e664b396f73c25891da46b953b8b8, we added back the
ability to show both with -t option, but we forgot to update the
test as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-cvsserver: typofixesJunio C Hamano Wed, 26 Apr 2006 06:59:28 +0000 (23:59 -0700)

git-cvsserver: typofixes

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --stat: show complete rewrites consistently.Junio C Hamano Wed, 26 Apr 2006 06:40:09 +0000 (23:40 -0700)

diff --stat: show complete rewrites consistently.

The patch format shows complete rewrite as deletion of all old lines
followed by addition of all new lines. Count lines consistenly with
that when doing diffstat.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'new'Paul Mackerras Wed, 26 Apr 2006 06:32:59 +0000 (16:32 +1000)

Merge branch 'new'

Merge branch 'jc/diff'Junio C Hamano Wed, 26 Apr 2006 06:12:21 +0000 (23:12 -0700)

Merge branch 'jc/diff'

* jc/diff:
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.

Makefile: remove and create libgit.a from scratch.Junio C Hamano Wed, 26 Apr 2006 06:11:17 +0000 (23:11 -0700)

Makefile: remove and create libgit.a from scratch.

Foolishly I renamed diff.o around which caused an old diff.o
taken out of libgit.a and got linked into resulting binary and
exhibited mysterious breakage for many people. This borrows
from the kernel Makefile (scripts/Makefile.build) to first remove
the target and then recreate.

Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] gitk: Add a visual tag for remote refsJosef Weidendorfer Tue, 18 Apr 2006 21:53:07 +0000 (23:53 +0200)

[PATCH] gitk: Add a visual tag for remote refs

This patch partly changes the background color for remote refs.
It makes it easy to quickly distinguish remote refs from local
developer branches.

I ignore remote HEADs, as these really should be drawn as
aliases to other heads. But there is no simple way to
detect that HEADs really are aliases for other refs via
"git-ls-remote".

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: add menu item for editing the current viewPaul Mackerras Tue, 25 Apr 2006 11:21:10 +0000 (21:21 +1000)

gitk: add menu item for editing the current view

This allows the user to change the name of the view, whether it is
permanent, and the list of files/directories for the view.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Implement "permanent" views (stored in ~/.gitk)Paul Mackerras Tue, 25 Apr 2006 07:12:46 +0000 (17:12 +1000)

gitk: Implement "permanent" views (stored in ~/.gitk)

With this the user can now mark a view as "permanent" and it will
appear in the list every time gitk is started (until it is deleted).
Also tidied up the view definition window, and changed the view
menu to use radiobuttons for the view selections so there is some
feedback as to which is the current view.

Signed-off-by: Paul Mackerras <paulus@samba.org>

socksetup: don't return on set_reuse_addr() error v1.3.1Serge E. Hallyn Tue, 18 Apr 2006 13:11:06 +0000 (08:11 -0500)

socksetup: don't return on set_reuse_addr() error

The set_reuse_addr() error case was the only error case in
socklist() where we returned rather than continued. Not sure
why. Either we must free the socklist, or continue. This patch
continues on error.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit)

Deprecate usage of git-var -l for getting config vars... Petr Baudis Mon, 24 Apr 2006 22:59:30 +0000 (00:59 +0200)

Deprecate usage of git-var -l for getting config vars list

This has been an unfortunate sideway in the git API evolution.
We use git-repo-config for all the other .git/config interaction
so let's also use git-repo-config -l for the variable listing.

Signed-off-by: Petr Baudis <pasky@suse.cz>

git-repo-config --list supportPetr Baudis Mon, 24 Apr 2006 22:59:25 +0000 (00:59 +0200)

git-repo-config --list support

This adds git-repo-config --list (or git-repo-config -l) support,
similar to what git-var -l does now (to be phased out so that we
have a single sane interface to the config file instead of fragmented
and confused API).

Signed-off-by: Petr Baudis <pasky@suse.cz>

Merge branch 'fix'Junio C Hamano Tue, 25 Apr 2006 05:26:57 +0000 (22:26 -0700)

Merge branch 'fix'

* fix:
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments

Document the configuration filePetr Baudis Mon, 24 Apr 2006 22:59:33 +0000 (00:59 +0200)

Document the configuration file

This patch adds a Documentation/config.txt file included by git-repo-config
and currently aggregating hopefully all the available git plumbing / core
porcelain configuration variables, as well as briefly describing the format.

It also updates an outdated bit of the example in git-repo-config(1).

Signed-off-by: Petr Baudis <pasky@suse.cz>

Document git-var -l listing also configuration variablesPetr Baudis Mon, 24 Apr 2006 22:59:28 +0000 (00:59 +0200)

Document git-var -l listing also configuration variables

Signed-off-by: Petr Baudis <pasky@suse.cz>

rev-parse: better error message for ambiguous argumentsPaul Mackerras Tue, 25 Apr 2006 00:00:03 +0000 (10:00 +1000)

rev-parse: better error message for ambiguous arguments

Currently, if git-rev-parse encounters an argument that is neither a
recognizable revision name nor the name of an existing file or
directory, and it hasn't encountered a "--" argument, it prints an
error message saying "No such file or directory". This can be
confusing for users, including users of programs such as gitk that
use git-rev-parse, who may then think that they can't ask about the
history of files that no longer exist.

This makes it print a better error message, one that points out the
ambiguity and tells the user what to do to fix it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'ar/chmod-series'Junio C Hamano Mon, 24 Apr 2006 09:08:35 +0000 (02:08 -0700)

Merge branch 'ar/chmod-series'

* ar/chmod-series:
make update-index --chmod work with multiple files and --stdin

Merge branch 'sh/daemon'Junio C Hamano Mon, 24 Apr 2006 09:08:28 +0000 (02:08 -0700)

Merge branch 'sh/daemon'

* sh/daemon:
socksetup: don't return on set_reuse_addr() error

Merge branch 'jc/cc-stat'Junio C Hamano Mon, 24 Apr 2006 09:06:40 +0000 (02:06 -0700)

Merge branch 'jc/cc-stat'

* jc/cc-stat:
Fix "git show --stat"

Merge branch 'jc/unresolve'Junio C Hamano Mon, 24 Apr 2006 09:05:55 +0000 (02:05 -0700)

Merge branch 'jc/unresolve'

* jc/unresolve:
git-update-index --unresolve
Add git-unresolve <paths>...

Merge branch 'jc/color'Junio C Hamano Mon, 24 Apr 2006 09:05:07 +0000 (02:05 -0700)

Merge branch 'jc/color'

* jc/color:
Add colordiff for git to contrib/colordiff.

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Mon, 24 Apr 2006 08:39:01 +0000 (01:39 -0700)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Let git-rev-list do the argument list parsing

Merge branch 'master' into newPaul Mackerras Sun, 23 Apr 2006 12:47:07 +0000 (22:47 +1000)

Merge branch 'master' into new

gitk: Use git-rev-parse only to identify file/dir names... Paul Mackerras Sun, 23 Apr 2006 12:45:55 +0000 (22:45 +1000)

gitk: Use git-rev-parse only to identify file/dir names on cmd line

This uses git-rev-parse --no-revs --no-flags to give us just the
file and directory names on the command line, so that we can create
the "Command line" view if any were specified. All other arguments
just get passed to git-rev-list (without a pass through git-rev-parse).

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Let git-rev-list do the argument list parsingPaul Mackerras Sun, 23 Apr 2006 08:00:24 +0000 (18:00 +1000)

gitk: Let git-rev-list do the argument list parsing

This is a fix for a problem reported by Jim Radford where an argument
list somewhere overflows on repositories with lots of tags. In fact
it's now unnecessary to use git-rev-parse since git-rev-list can take
all the arguments that git-rev-parse can. This is inspired by but not
the same as the solutions suggested by Jim Radford and Linus Torvalds.

Signed-off-by: Paul Mackerras <paulus@samba.org>

make update-index --chmod work with multiple files... Alex Riesen Sun, 23 Apr 2006 07:01:29 +0000 (09:01 +0200)

make update-index --chmod work with multiple files and --stdin

The patch makes "--chmod=-x" and "--chmod=+x" act like "--add"
and "--remove" to affect the behaviour of the command for the
rest of the path parameters, not just the following one.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Libified diff-index: backward compatibility fix.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>

Libify diff-index.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>

Libify diff-files.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>

Fix "git show --stat"Junio C Hamano Sat, 22 Apr 2006 02:39:04 +0000 (19:39 -0700)

Fix "git show --stat"

Signed-off-by: Junio C Hamano <junkio@cox.net>

Add colordiff for git to contrib/colordiff.Junio C Hamano Wed, 12 Apr 2006 06:05:14 +0000 (23:05 -0700)

Add colordiff for git to contrib/colordiff.

I hacked it up to teach it the git extended diff headers, made
it not to read the whole patch in the array.

Also, the original program, when arguments are given, ran "diff"
with the given arguments and showed the output from it. Of
course, I changed it to run "git diff" ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'jc/diff'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.

Makefile: dependency for builtin-help.oJunio 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>

Split up builtin commands into separate files from... 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>

Merge branch 'fix'Junio C Hamano Fri, 21 Apr 2006 20:14:30 +0000 (13:14 -0700)

Merge branch 'fix'

* fix:
git-log produces no output

git-log produces no outputLinus 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>

Merge branch 'fix'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"

fix pack-object buffer sizeNicolas 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>

mailinfo: decode underscore used in "Q" encoding properly.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>

Reintroduce svn pools to solve the memory leak.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>

pack-objects: do not stop at object that is "too small"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>

gitk: Remember the view in the history listPaul Mackerras Fri, 21 Apr 2006 00:35:31 +0000 (10:35 +1000)

gitk: Remember the view in the history list

When moving backwards or forwards through the history list, this
automatically switches the view so that each point that we jump to
is shown in the same view that it was originally displayed in.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'fix'Junio C Hamano Thu, 20 Apr 2006 09:52:04 +0000 (02:52 -0700)

Merge branch 'fix'

* fix:
git-commit --amend: two fixes.

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>

git-update-index --unresolveJunio C Hamano Thu, 20 Apr 2006 06:52:05 +0000 (23:52 -0700)

git-update-index --unresolve

Retire git-unresolve and make it into "git-update-index --unresolve".
It processes all paths that follow.

During a merge, you would mark a path that is dealt with with:

$ git update-index hello

and you would "undo" it with:

$ git update-index --unresolve hello

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --stat: do not drop rename information.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>

Add git-unresolve <paths>...Junio C Hamano Wed, 19 Apr 2006 19:51:29 +0000 (12:51 -0700)

Add git-unresolve <paths>...

This is an attempt to address the issue raised on #git channel
recently by Carl Worth.

After a conflicted automerge, "git diff" shows a combined diff
to give you how the tentative automerge result differs from
what came from each branch. During a complex merge, it is
tempting to be able to resolve a few paths at a time, mark
them "I've dealt with them" with git-update-index to unclutter
the next "git diff" output, and keep going. However, when the
final result does not compile or otherwise found to be a
mismerge, the workflow to fix the mismerged paths suddenly
changes to "git diff HEAD -- path" (to get a diff from our
HEAD before merging) and "git diff MERGE_HEAD -- path" (to get
a diff from theirs), and it cannot show the combined anymore.

With git-unresolve <paths>..., the versions from our branch and
their branch for specified blobs are placed in stage #2 and
stage #3, without touching the working tree files. This gives
you the combined diff back for easier review, along with
"diff --ours" and "diff --theirs".

One thing it does not do is to place the base in stage #1; this
means "diff --base" would behave differently between the run
immediately after a conflicted three-way merge, and the run
after an update-index by mistake followed by a git-unresolve.

We could theoretically run merge-base between HEAD and
MERGE_HEAD to find which tree to place in stage #1, but
reviewing "diff --base" is not that useful so....

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'lt/xsha1'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

Merge branch 'maint'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.

diff: move diff.c to diff-lib.c to make room.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>

pre-commit hook: complain about conflict markers.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>

git-merge: a bit more readable user guidance.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>