gitweb.git
Merge branch 'da/difftool'Junio C Hamano Sat, 18 Apr 2009 04:42:12 +0000 (21:42 -0700)

Merge branch 'da/difftool'

* da/difftool:
mergetool--lib: simplify API usage by removing more global variables
Fix misspelled mergetool.keepBackup
difftool/mergetool: refactor commands to use git-mergetool--lib
mergetool: use $( ... ) instead of `backticks`
bash completion: add git-difftool
difftool: add support for a difftool.prompt config variable
difftool: add various git-difftool tests
difftool: move 'git-difftool' out of contrib
difftool/mergetool: add diffuse as merge and diff tool
difftool: add a -y shortcut for --no-prompt
difftool: use perl built-ins when testing for msys
difftool: remove the backup file feature
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
git-mergetool: add new merge tool TortoiseMerge
git-mergetool/difftool: make (g)vimdiff workable under Windows
doc/merge-config: list ecmerge as a built-in merge tool

Merge branch 'maint'Junio C Hamano Sat, 18 Apr 2009 04:29:15 +0000 (21:29 -0700)

Merge branch 'maint'

* maint:
doc/gitattributes: clarify location of config text
Fix buffer overflow in config parser
git-apply: fix option description

doc/gitattributes: clarify location of config textJeff King Thu, 16 Apr 2009 07:17:12 +0000 (03:17 -0400)

doc/gitattributes: clarify location of config text

The gitattributes documentation has a section on the "diff"
attribute, with subsections for each of the things you might
want to configure in your diff config section (external
diff, hunk headers, etc). The first such subsection
specifically notes that the definition of the diff driver
should go into $GIT_DIR/config, but subsequent sections do
not.

This location is implied if you are reading the
documentation sequentially, but it is not uncommon for a new
user to jump to (or be referred to) a specific section. For
a new user who does not know git well enough to recognize
the config syntax, it is not clear that those directives
don't also go into the gitattributes file.

This patch just mentions the config file in each subsection,
similar to the way it is mentioned in the first.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

hook/update: example of how to prevent branch creationPierre Habouzit Thu, 16 Apr 2009 20:00:44 +0000 (22:00 +0200)

hook/update: example of how to prevent branch creation

Since git doesn't provide a receive.denyBranchCreation or similar, here is
an example of how to be sure users cannot create branches remotely by
pushing a new reference.

This setup has been proven useful to prevent creation of spurious branches
because of users having their remote.origin.push set to HEAD, when they
use `git push` while being on a local topic branch of theirs instead of
the proper one.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.1' into maintJunio C Hamano Sat, 18 Apr 2009 04:20:58 +0000 (21:20 -0700)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
Fix buffer overflow in config parser

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Sat, 18 Apr 2009 04:06:11 +0000 (21:06 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
Fix buffer overflow in config parser

Fix buffer overflow in config parserThomas Jarosch Fri, 17 Apr 2009 12:05:11 +0000 (14:05 +0200)

Fix buffer overflow in config parser

When interpreting a config value, the config parser reads in 1+ space
character(s) and puts -one- space character in the buffer as soon as
the first non-space character is encountered (if not inside quotes).

Unfortunately the buffer size check lacks the extra space character
which gets inserted at the next non-space character, resulting in
a crash with a specially crafted config entry.

The unit test now uses Java to compile a platform independent
.NET framework to output the test string in C# :o)

Read: Thanks to Johannes Sixt for the correct printf call
which replaces the perl invocation.

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

get_local_heads(): do not return random pointer if... Nguyễn Thái Ngọc Duy Thu, 16 Apr 2009 22:16:23 +0000 (08:16 +1000)

get_local_heads(): do not return random pointer if there is no head

it's silly to do this:

mkdir foo && cd foo && git init && git push somewhere.git

but segfault should not happen even in that case.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-apply: fix option descriptionUlrich Windl Thu, 9 Apr 2009 09:12:58 +0000 (11:12 +0200)

git-apply: fix option description

Do not use non ASCII single quote.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitignore git-bisect--helperJunio C Hamano Mon, 13 Apr 2009 04:15:59 +0000 (21:15 -0700)

gitignore git-bisect--helper

Signed-off-by: Junio C Hamano <gitster@pobox.com>

GIT 1.6.3-rc0 v1.6.3-rc0Junio C Hamano Mon, 13 Apr 2009 00:05:55 +0000 (17:05 -0700)

GIT 1.6.3-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git.txt: GIT 1.6.2.2 has been out for... Nanako Shiraishi Fri, 10 Apr 2009 00:34:40 +0000 (09:34 +0900)

Documentation/git.txt: GIT 1.6.2.2 has been out for a while

These links inside "stalenotes" section need to be updated on the master
branch every time a new stable or maintenance release is made.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/no-perl'Junio C Hamano Sun, 12 Apr 2009 23:46:42 +0000 (16:46 -0700)

Merge branch 'jk/no-perl'

* jk/no-perl:
tests: skip perl tests if NO_PERL is defined
Makefile: allow building without perl

Merge branch 'sb/doc-upstream-branch'Junio C Hamano Sun, 12 Apr 2009 23:46:42 +0000 (16:46 -0700)

Merge branch 'sb/doc-upstream-branch'

* sb/doc-upstream-branch:
Documentation: Introduce "upstream branch"

Merge branch 'jk/show-upstream'Junio C Hamano Sun, 12 Apr 2009 23:46:42 +0000 (16:46 -0700)

Merge branch 'jk/show-upstream'

* jk/show-upstream:
branch: show upstream branch when double verbose
make get_short_ref a public function
for-each-ref: add "upstream" format field
for-each-ref: refactor refname handling
for-each-ref: refactor get_short_ref function

Merge branch 'fg/remote-prune'Junio C Hamano Sun, 12 Apr 2009 23:46:41 +0000 (16:46 -0700)

Merge branch 'fg/remote-prune'

* fg/remote-prune:
add tests for remote groups
git remote update: Fallback to remote if group does not exist
remote: New function remote_is_configured()
git remote update: Report error for non-existing groups
git remote update: New option --prune
builtin-remote.c: Split out prune_remote as a separate function.

Merge branch 'cc/sha1-bsearch'Junio C Hamano Sun, 12 Apr 2009 23:46:41 +0000 (16:46 -0700)

Merge branch 'cc/sha1-bsearch'

* cc/sha1-bsearch:
sha1-lookup: fix up the assertion message

Merge branch 'cc/bisect-filter'Junio C Hamano Sun, 12 Apr 2009 23:46:40 +0000 (16:46 -0700)

Merge branch 'cc/bisect-filter'

* cc/bisect-filter: (21 commits)
rev-list: add "int bisect_show_flags" in "struct rev_list_info"
rev-list: remove last static vars used in "show_commit"
list-objects: add "void *data" parameter to show functions
bisect--helper: string output variables together with "&&"
rev-list: pass "int flags" as last argument of "show_bisect_vars"
t6030: test bisecting with paths
bisect: use "bisect--helper" and remove "filter_skipped" function
bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
bisect--helper: implement "git bisect--helper"
bisect: use the new generic "sha1_pos" function to lookup sha1
rev-list: call new "filter_skip" function
patch-ids: use the new generic "sha1_pos" function to lookup sha1
sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
rev-list: pass "revs" to "show_bisect_vars"
rev-list: make "show_bisect_vars" non static
rev-list: move code to show bisect vars into its own function
rev-list: move bisect related code into its own file
rev-list: make "bisect_list" variable local to "cmd_rev_list"
refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
...

Merge branch 'maint'Junio C Hamano Sun, 12 Apr 2009 23:01:25 +0000 (16:01 -0700)

Merge branch 'maint'

* maint:
GIT 1.6.2.3
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls

Conflicts:
GIT-VERSION-GEN

GIT 1.6.2.3 v1.6.2.3Junio C Hamano Sun, 12 Apr 2009 22:43:24 +0000 (15:43 -0700)

GIT 1.6.2.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.1' into maintJunio C Hamano Sun, 12 Apr 2009 22:34:53 +0000 (15:34 -0700)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Sun, 12 Apr 2009 22:20:29 +0000 (15:20 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls

mergetool--lib: simplify API usage by removing more... David Aguilar Sun, 12 Apr 2009 03:41:56 +0000 (20:41 -0700)

mergetool--lib: simplify API usage by removing more global variables

The mergetool--lib scriplet was tricky to use because it relied upon
the existance of several global shell variables. This removes more
global variables so that things are simpler for callers.

A side effect is that some variables are recomputed each time
run_merge_tool() is called, but the overhead for recomputing
them is justified by the simpler implementation.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ) Fri, 10 Apr 2009 06:26:49 +0000 (14:26 +0800)

State the effect of filter-branch on graft explicitly

Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

process_{tree,blob}: Remove useless xstrdup callsLinus Torvalds Fri, 10 Apr 2009 22:20:18 +0000 (15:20 -0700)

process_{tree,blob}: Remove useless xstrdup calls

On Wed, 8 Apr 2009, Björn Steinbrink wrote:
>
> The name of the processed object was duplicated for passing it to
> add_object(), but that already calls path_name, which allocates a new
> string anyway. So the memory allocated by the xstrdup calls just went
> nowhere, leaking memory.

Ack, ack.

There's another easy 5% or so for the built-in object walker: once we've
created the hash from the name, the name isn't interesting any more, and
so something trivial like this can help a bit.

Does it matter? Probably not on its own. But a few more memory saving
tricks and it might all make a difference.

Linus

Signed-off-by: Junio C Hamano <gitster@pobox.com>

documentation: Makefile accounts for SHELL_PATH settingBen Walton Sun, 22 Mar 2009 13:20:44 +0000 (09:20 -0400)

documentation: Makefile accounts for SHELL_PATH setting

Ensure that the Makefile that generates and installs the Documentation is
aware of any SHELL_PATH setting. Use this value if found or the current
setting for SHELL if not. This is an accommodation for systems where sh
is not POSIX enough.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Allow users to un-configure rename detectionLinus Torvalds Thu, 9 Apr 2009 18:46:15 +0000 (11:46 -0700)

Allow users to un-configure rename detection

I told people on the kernel mailing list to please use "-M" when sending
me rename patches, so that I can see what they do while reading email
rather than having to apply the patch and then look at the end result.

I also told them that if they want to make it the default, they can just
add

[diff]
renames

to their ~/.gitconfig file. And while I was thinking about that, I wanted
to also check whether you can then mark individual projects to _not_ have
that default in the per-repository .git/config file.

And you can't. Currently you cannot have a global "enable renames by
default" and then a local ".. but not for _this_ project". Why? Because if
somebody writes

[diff]
renames = no

we simply ignore it, rather than resetting "diff_detect_rename_default"
back to zero.

Fixed thusly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Replace ",<,>,& with their respective XML entities... Mike Hommey Thu, 9 Apr 2009 22:25:37 +0000 (00:25 +0200)

Replace ",<,>,& with their respective XML entities in DAV requests

If the repo url or the user email contain XML special characters, the
remote DAV server is likely to reject the LOCK requests because the XML
is then malformed.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: always initialize with core.autocrlf=falseJohannes Schindelin Thu, 9 Apr 2009 11:29:57 +0000 (13:29 +0200)

git-svn: always initialize with core.autocrlf=false

It has been reported time and time again in relation to msysGit that
git-svn does not work well when core.autocrlf has any value other than
'false'. So let's make it so by default.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update delta compression message to be less misleadingDan McGee Thu, 9 Apr 2009 15:45:39 +0000 (10:45 -0500)

Update delta compression message to be less misleading

In the case of a small repository, pack-objects is smart enough to not
start more threads than necessary. However, the output to the user always
reports the value of the pack.threads configuration and not the real
number of threads to be used.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: Save init/clone --ignore-paths in configBen Jackson Sat, 11 Apr 2009 17:46:18 +0000 (10:46 -0700)

git-svn: Save init/clone --ignore-paths in config

The --ignored-paths argument is now stored as
"svn-remote.$REMOTE_NAME.ignore-paths" in the config file.

[ew: edited subject and message]
Signed-off-by: Ben Jackson <ben@ben.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: Add per-svn-remote ignore-paths configBen Jackson Sat, 11 Apr 2009 17:46:17 +0000 (10:46 -0700)

git-svn: Add per-svn-remote ignore-paths config

The --ignore-paths option to fetch is very useful for working on a subset
of a SVN repository. For proper operation, every command that causes a
fetch (explicit or implied) must include a matching --ignore-paths option.

This patch adds a persistent svn-remote.$repo_id.ignore-paths config by
promoting Fetcher::is_path_ignored to a member function and initializing
$self->{ignore_regex} in Fetcher::new. Command line --ignore-paths is
still recognized and acts in addition to the config value.

Signed-off-by: Ben Jackson <ben@ben.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: speed up blame commandBoris Byk Fri, 10 Apr 2009 20:32:41 +0000 (00:32 +0400)

git-svn: speed up blame command

'git svn blame' now uses the 'git cat-file --batch' command to
speed up resolving SVN revision number out of commit SHA by
removing fork+exec overhead.

[ew: enforced 80-column line wrap]

Signed-off-by: Boris Byk <boris.byk@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: add fetch --parent optionJason Merrill Mon, 6 Apr 2009 20:37:59 +0000 (16:37 -0400)

git-svn: add fetch --parent option

Signed-off-by: Jason Merrill <jason@redhat.com>
Acked-By: Eric Wong <normalperson@yhbt.net>

Fix misspelled mergetool.keepBackupFerry Huberts Fri, 10 Apr 2009 19:33:57 +0000 (21:33 +0200)

Fix misspelled mergetool.keepBackup

In several places mergetool.keepBackup was misspelled as merge.keepBackup.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

add tests for remote groupsJeff King Mon, 6 Apr 2009 20:18:23 +0000 (16:18 -0400)

add tests for remote groups

This tries to systematically cover existing behavior, and
also mark some expect_failure cases for desired behavior.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.6.3Junio C Hamano Thu, 9 Apr 2009 07:04:17 +0000 (00:04 -0700)

Update draft release notes to 1.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Thu, 9 Apr 2009 06:41:27 +0000 (23:41 -0700)

Merge branch 'maint'

* maint:
Start 1.6.2.3 preparation
process_{tree,blob}: Remove useless xstrdup calls
git-pull.sh: better warning message for "git pull" on detached head.

Conflicts:
RelNotes

Start 1.6.2.3 preparationJunio C Hamano Thu, 9 Apr 2009 06:40:33 +0000 (23:40 -0700)

Start 1.6.2.3 preparation

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/shared-literally' into maintJunio C Hamano Thu, 9 Apr 2009 06:23:41 +0000 (23:23 -0700)

Merge branch 'jc/shared-literally' into maint

* jc/shared-literally:
t1301: loosen test for forced modes
set_shared_perm(): sometimes we know what the final mode bits should look like
move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
Move chmod(foo, 0444) into move_temp_to_file()
"core.sharedrepository = 0mode" should set, not loosen

Merge branch 'jc/maint-1.6.0-diff-borrow-carefully... Junio C Hamano Thu, 9 Apr 2009 06:23:17 +0000 (23:23 -0700)

Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint

* jc/maint-1.6.0-diff-borrow-carefully:
diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged

Merge branch 'maint-1.6.1' into maintJunio C Hamano Thu, 9 Apr 2009 06:22:09 +0000 (23:22 -0700)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
process_{tree,blob}: Remove useless xstrdup calls

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Thu, 9 Apr 2009 06:22:05 +0000 (23:22 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
process_{tree,blob}: Remove useless xstrdup calls

Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano Thu, 9 Apr 2009 06:21:10 +0000 (23:21 -0700)

Merge branch 'jc/maint-1.6.0-keep-pack' into maint

* jc/maint-1.6.0-keep-pack:
pack-objects: don't loosen objects available in alternate or kept packs
t7700: demonstrate repack flaw which may loosen objects unnecessarily
Remove --kept-pack-only option and associated infrastructure
pack-objects: only repack or loosen objects residing in "local" packs
git-repack.sh: don't use --kept-pack-only option to pack-objects
t7700-repack: add two new tests demonstrating repacking flaws
is_kept_pack(): final clean-up
Simplify is_kept_pack()
Consolidate ignore_packed logic more
has_sha1_kept_pack(): take "struct rev_info"
has_sha1_pack(): refactor "pretend these packs do not exist" interface
git-repack: resist stray environment variable

Conflicts:
t/t7700-repack.sh

Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano Thu, 9 Apr 2009 06:02:17 +0000 (23:02 -0700)

Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1

* jc/maint-1.6.0-blame-s:
blame: read custom grafts given by -S before calling setup_revisions()

Conflicts:
builtin-blame.c

Merge branch 'bc/maint-1.6.1-branch-deleted-was' into... Junio C Hamano Thu, 9 Apr 2009 06:01:15 +0000 (23:01 -0700)

Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1

* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"

Merge branch 'js/maint-1.6.0-exec-path-env' into maint... Junio C Hamano Thu, 9 Apr 2009 06:01:10 +0000 (23:01 -0700)

Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1

* js/maint-1.6.0-exec-path-env:
Propagate --exec-path setting to external commands via GIT_EXEC_PATH

Merge branch 'tr/maint-1.6.1-doc-format-patch--root... Junio C Hamano Thu, 9 Apr 2009 06:00:21 +0000 (23:00 -0700)

Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1

* tr/maint-1.6.1-doc-format-patch--root:
Documentation: format-patch --root clarifications

process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink Wed, 8 Apr 2009 11:28:54 +0000 (13:28 +0200)

process_{tree,blob}: Remove useless xstrdup calls

The name of the processed object was duplicated for passing it to
add_object(), but that already calls path_name, which allocates a new
string anyway. So the memory allocated by the xstrdup calls just went
nowhere, leaking memory.

This reduces the RSS usage for a "rev-list --all --objects" by about 10% on
the gentoo repo (fully packed) as well as linux-2.6.git:

gentoo:
| old | new
----------------|-------------------------------
RSS | 1537284 | 1388408
VSZ | 1816852 | 1667952
time elapsed | 1:49.62 | 1:48.99
min. page faults| 417178 | 379919

linux-2.6.git:
| old | new
----------------|-------------------------------
RSS | 324452 | 292996
VSZ | 491792 | 460376
time elapsed | 0:14.53 | 0:14.28
min. page faults| 89360 | 81613

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: skip perl tests if NO_PERL is definedJeff King Fri, 3 Apr 2009 19:33:59 +0000 (15:33 -0400)

tests: skip perl tests if NO_PERL is defined

These scripts all test git programs that are written in
perl, and thus obviously won't work if NO_PERL is defined.
We pass NO_PERL to the scripts from the building Makefile
via the GIT-BUILD-OPTIONS file.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: allow building without perlJeff King Fri, 3 Apr 2009 19:32:20 +0000 (15:32 -0400)

Makefile: allow building without perl

For systems with a missing or broken perl, it is nicer to
explicitly say "we don't want perl" because:

1. The Makefile knows not to bother with Perl-ish things
like Git.pm.

2. We can print a more user-friendly error message
than "foo is not a git command" or whatever the broken
perl might barf

3. Test scripts that require perl can mark themselves and
such and be skipped

This patch implements parts (1) and (2). The perl/
subdirectory is skipped entirely, gitweb is not built, and
any git commands which rely on perl will print a
human-readable message and exit with an error code.

This patch is based on one from Robin H. Johnson.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-pull.sh: better warning message for "git pull"... Matthieu Moy Wed, 8 Apr 2009 07:24:03 +0000 (09:24 +0200)

git-pull.sh: better warning message for "git pull" on detached head.

Otherwise, git complains about not finding a branch to pull from in
'branch..merge', which is hardly understandable. While we're there,
reword the sentences slightly.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool/mergetool: refactor commands to use git-merget... David Aguilar Wed, 8 Apr 2009 07:17:20 +0000 (00:17 -0700)

difftool/mergetool: refactor commands to use git-mergetool--lib

This consolidates the common functionality from git-mergetool and
git-difftool--helper into a single git-mergetool--lib scriptlet.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

branch: show upstream branch when double verboseJeff King Tue, 7 Apr 2009 07:16:56 +0000 (03:16 -0400)

branch: show upstream branch when double verbose

This information is easily accessible when we are
calculating the relationship. The only reason not to print
it all the time is that it consumes a fair bit of screen
space, and may not be of interest to the user.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make get_short_ref a public functionJeff King Tue, 7 Apr 2009 07:14:20 +0000 (03:14 -0400)

make get_short_ref a public function

Often we want to shorten a full ref name to something "prettier"
to show a user. For example, "refs/heads/master" is often shown
simply as "master", or "refs/remotes/origin/master" is shown as
"origin/master".

Many places in the code use a very simple formula: skip common
prefixes like refs/heads, refs/remotes, etc. This is codified in
the prettify_ref function.

for-each-ref has a more correct (but more expensive) approach:
consider the ref lookup rules, and try shortening as much as
possible while remaining unambiguous.

This patch makes the latter strategy globally available as
shorten_unambiguous_ref.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

for-each-ref: add "upstream" format fieldJeff King Tue, 7 Apr 2009 07:09:39 +0000 (03:09 -0400)

for-each-ref: add "upstream" format field

The logic for determining the upstream ref of a branch is
somewhat complex to perform in a shell script. This patch
provides a plumbing mechanism for scripts to access the C
logic used internally by git-status, git-branch, etc.

For example:

$ git for-each-ref \
--format='%(refname:short) %(upstream:short)' \
refs/heads/
master origin/master

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

for-each-ref: refactor refname handlingJeff King Tue, 7 Apr 2009 07:06:51 +0000 (03:06 -0400)

for-each-ref: refactor refname handling

This code handles some special magic like *-deref and the
:short formatting specifier. The next patch will add another
field which outputs a ref and wants to use the same code.

This patch splits the "which ref are we outputting" from the
actual formatting. There should be no behavioral change.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 8 Apr 2009 06:05:43 +0000 (23:05 -0700)

Merge branch 'maint'

* maint:
Change double quotes to single quotes in message
Documentation: clarify .gitattributes search
git-checkout.txt: clarify that <branch> applies when no path is given.
git-checkout.txt: fix incorrect statement about HEAD and index

Conflicts:
Documentation/git-checkout.txt

Merge branch 'maint-1.6.1' into maintJunio C Hamano Wed, 8 Apr 2009 06:05:14 +0000 (23:05 -0700)

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
Documentation: clarify .gitattributes search
git-checkout.txt: clarify that <branch> applies when no path is given.
git-checkout.txt: fix incorrect statement about HEAD and index

Change double quotes to single quotes in messageJari Aalto Sat, 21 Mar 2009 09:00:54 +0000 (11:00 +0200)

Change double quotes to single quotes in message

Most of the time when we give branch name in the message, we quote it
inside a pair of single-quotes. git-checkout uses double-quotes; this
patch corrects the inconsistency.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano Wed, 8 Apr 2009 05:51:14 +0000 (22:51 -0700)

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
Documentation: clarify .gitattributes search
git-checkout.txt: clarify that <branch> applies when no path is given.
git-checkout.txt: fix incorrect statement about HEAD and index

Merge branch 'lt/reflog-expire'Junio C Hamano Wed, 8 Apr 2009 05:33:13 +0000 (22:33 -0700)

Merge branch 'lt/reflog-expire'

* lt/reflog-expire:
Speed up reflog pruning of unreachable commits
Clean up reflog unreachability pruning decision

Merge branch 'bs/maint-1.6.0-tree-walk-prefix'Junio C Hamano Wed, 8 Apr 2009 05:33:10 +0000 (22:33 -0700)

Merge branch 'bs/maint-1.6.0-tree-walk-prefix'

* bs/maint-1.6.0-tree-walk-prefix:
match_tree_entry(): a pathspec only matches at directory boundaries
tree_entry_interesting: a pathspec only matches at directory boundary

Merge branch 'ms/http-auth'Junio C Hamano Wed, 8 Apr 2009 05:33:05 +0000 (22:33 -0700)

Merge branch 'ms/http-auth'

* ms/http-auth:
Allow curl to rewind the read buffers

Merge branch 'js/maint-submodule-checkout'Junio C Hamano Wed, 8 Apr 2009 05:33:02 +0000 (22:33 -0700)

Merge branch 'js/maint-submodule-checkout'

* js/maint-submodule-checkout:
Fix 'git checkout <submodule>' to update the index

Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano Wed, 8 Apr 2009 05:32:56 +0000 (22:32 -0700)

Merge branch 'cb/maint-merge-recursive-submodule-fix'

* cb/maint-merge-recursive-submodule-fix:
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules

Merge branch 'mh/html-path'Junio C Hamano Wed, 8 Apr 2009 05:32:51 +0000 (22:32 -0700)

Merge branch 'mh/html-path'

* mh/html-path:
add --html-path to get the location of installed HTML docs

mergetool: use $( ... ) instead of `backticks`David Aguilar Mon, 6 Apr 2009 08:31:28 +0000 (01:31 -0700)

mergetool: use $( ... ) instead of `backticks`

This makes mergetool consistent with Documentation/CodingGuidelines.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash completion: add git-difftoolDavid Aguilar Mon, 6 Apr 2009 08:31:27 +0000 (01:31 -0700)

bash completion: add git-difftool

This adds completion for difftool's --tool flag.
The known diff tool names were also consolidated into
a single variable.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: add support for a difftool.prompt config... David Aguilar Tue, 7 Apr 2009 08:21:22 +0000 (01:21 -0700)

difftool: add support for a difftool.prompt config variable

difftool now supports difftool.prompt so that users do not have to
pass --no-prompt or hit enter each time a diff tool is launched.
The --prompt flag overrides the configuration variable.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: add various git-difftool testsDavid Aguilar Tue, 7 Apr 2009 23:30:53 +0000 (16:30 -0700)

difftool: add various git-difftool tests

t7800-difftool.sh tests the various command-line flags,
git-config variables, and environment settings supported by
git-difftool.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: move 'git-difftool' out of contribDavid Aguilar Tue, 7 Apr 2009 08:21:20 +0000 (01:21 -0700)

difftool: move 'git-difftool' out of contrib

This prepares 'git-difftool' and its documentation for
mainstream use.

'git-difftool-helper' became 'git-difftool--helper'
since users should not use it directly.

'git-difftool' was added to the list of commands as
an ancillaryinterrogator.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping Mon, 6 Apr 2009 08:31:23 +0000 (01:31 -0700)

difftool/mergetool: add diffuse as merge and diff tool

This adds diffuse as a built-in merge tool.

Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: add a -y shortcut for --no-promptDavid Aguilar Tue, 7 Apr 2009 08:21:19 +0000 (01:21 -0700)

difftool: add a -y shortcut for --no-prompt

This is another consistency cleanup to make git-difftool's options
match git-mergetool.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: use perl built-ins when testing for msysDavid Aguilar Mon, 6 Apr 2009 08:31:21 +0000 (01:31 -0700)

difftool: use perl built-ins when testing for msys

I don't even know what $COMSPEC means so let's be safe and use the
same perly $^O test add--interactive uses. While we're at it, make
git-difftool match the prevalent git-perl style.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: remove the backup file featureDavid Aguilar Mon, 6 Apr 2009 08:31:20 +0000 (01:31 -0700)

difftool: remove the backup file feature

Most users find the backup file feature annoying and there's no
need for it since diff is supposed to be a read-only operation.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

difftool: remove merge options for opendiff, tkdiff... David Aguilar Mon, 6 Apr 2009 08:31:19 +0000 (01:31 -0700)

difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff

We shouldn't try to merge files when using difftool, so remove
any merge-specific options.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg Mon, 6 Apr 2009 08:31:18 +0000 (01:31 -0700)

git-mergetool: add new merge tool TortoiseMerge

TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can
only be used as a merge tool with an existing base file. It cannot be
used without a base nor as a diff tool.

The documentation only mentions the slash '/' as command line option
prefix, which refused to work, but the parser also accepts the dash '-'

See http://code.google.com/p/msysgit/issues/detail?id=226

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-mergetool/difftool: make (g)vimdiff workable under... Markus Heidelberg Mon, 6 Apr 2009 08:31:17 +0000 (01:31 -0700)

git-mergetool/difftool: make (g)vimdiff workable under Windows

Under Windows vimdiff and gvimdiff are not available as symbolic links,
but as batch files vimdiff.bat and gvimdiff.bat. These files weren't
found by 'type vimdiff' which led to the following error:

The merge tool vimdiff is not available as 'vimdiff'

Even if they were found, it wouldn't work to invoke these batch files
from git-mergetool.

To solve this, use vim and gvim (vim.exe and gvim.exe) and pass the -d
command line switch over to them.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

doc/merge-config: list ecmerge as a built-in merge... Markus Heidelberg Mon, 6 Apr 2009 08:31:16 +0000 (01:31 -0700)

doc/merge-config: list ecmerge as a built-in merge tool

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rev-list: add "int bisect_show_flags" in "struct rev_li... Christian Couder Tue, 7 Apr 2009 03:08:42 +0000 (05:08 +0200)

rev-list: add "int bisect_show_flags" in "struct rev_list_info"

This is a cleanup patch to make it easier to use the
"show_bisect_vars" function and take advantage of the rev_list_info
struct.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rev-list: remove last static vars used in "show_commit"Christian Couder Mon, 6 Apr 2009 20:28:00 +0000 (22:28 +0200)

rev-list: remove last static vars used in "show_commit"

This patch removes the last static variables that were used in
the "show_commit" function.

To do that, we create a new "rev_list_info" struct that we will pass
in the "void *data" argument to "show_commit".

This means that we have to change the first argument to
"show_bisect_vars" too.

While at it, we also remove a "struct commit_list *list" variable
in "cmd_rev_list" that is not really needed.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

list-objects: add "void *data" parameter to show functionsChristian Couder Mon, 6 Apr 2009 19:28:36 +0000 (21:28 +0200)

list-objects: add "void *data" parameter to show functions

The goal of this patch is to get rid of the "static struct rev_info
revs" static variable in "builtin-rev-list.c".

To do that, we need to pass the revs to the "show_commit" function
in "builtin-rev-list.c" and this in turn means that the
"traverse_commit_list" function in "list-objects.c" must be passed
functions pointers to functions with 2 parameters instead of one.

So we have to change all the callers and all the functions passed
to "traverse_commit_list".

Anyway this makes the code more clean and more generic, so it
should be a good thing in the long run.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-rev-list.txt: make ascii markup uniform with other... Matthieu Moy Tue, 7 Apr 2009 17:24:33 +0000 (19:24 +0200)

git-rev-list.txt: make ascii markup uniform with other pages.

Other pages use --option=<argument>, not --option='argument', do the
same here.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-send-email.txt: clarify which options take an argument.Matthieu Moy Tue, 7 Apr 2009 17:24:32 +0000 (19:24 +0200)

git-send-email.txt: clarify which options take an argument.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

for-each-ref: refactor get_short_ref functionJeff King Tue, 7 Apr 2009 07:05:01 +0000 (03:05 -0400)

for-each-ref: refactor get_short_ref function

This function took a "refinfo" object which is unnecessarily
restrictive; it only ever looked at the refname field. This
patch refactors it to take just the ref name as a string.

While we're touching the relevant lines, let's give it
consistent memory semantics. Previously, some code paths
would return an allocated string and some would return the
original string; now it will always return a malloc'd
string.

This doesn't actually fix a bug or a leak, because
for-each-ref doesn't clean up its memory, but it makes the
function a lot less surprising for reuse (which will
happen in a later patch).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: Introduce "upstream branch"Santi Béjar Mon, 6 Apr 2009 23:24:30 +0000 (01:24 +0200)

Documentation: Introduce "upstream branch"

Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: clarify .gitattributes searchJason Merrill Mon, 6 Apr 2009 15:03:36 +0000 (11:03 -0400)

Documentation: clarify .gitattributes search

Use the term "toplevel of the work tree" in gitattributes.txt and
gitignore.txt to define the limits of the search for those files.

Signed-off-by: Jason Merrill <jason@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-checkout.txt: clarify that <branch> applies when... Matthieu Moy Tue, 7 Apr 2009 12:43:53 +0000 (14:43 +0200)

git-checkout.txt: clarify that <branch> applies when no path is given.

Otherwise, the sentence "Defaults to HEAD." can be mis-read to mean
that "git checkout -- hello.c" checks-out from HEAD.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-checkout.txt: fix incorrect statement about HEAD... Matthieu Moy Mon, 6 Apr 2009 20:45:21 +0000 (22:45 +0200)

git-checkout.txt: fix incorrect statement about HEAD and index

The command "git checkout" checks out from the index by default, not
HEAD (the introducing comment were correct, but the detailled
explanation added below were not).

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git remote update: Fallback to remote if group does... Finn Arne Gangstad Mon, 6 Apr 2009 13:41:02 +0000 (15:41 +0200)

git remote update: Fallback to remote if group does not exist

Previously, git remote update <remote> would fail unless there was
a remote group configured with the same name as the remote.
git remote update will now fall back to using the remote if no matching
group can be found.

This enables "git remote update -p <remote>..." to fetch and prune one
or more remotes, for example.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote: New function remote_is_configured()Finn Arne Gangstad Mon, 6 Apr 2009 13:41:01 +0000 (15:41 +0200)

remote: New function remote_is_configured()

Previously, there was no easy way to check for the existence of a
configured remote. remote_get for example would always create the remote
"on demand".

This new function returns 1 if the remote is configured, 0 otherwise.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git remote update: Report error for non-existing groupsFinn Arne Gangstad Mon, 6 Apr 2009 13:41:00 +0000 (15:41 +0200)

git remote update: Report error for non-existing groups

Previosly, git remote update <non-existing-group> would just silently fail
and do nothing. Now it will report an error saying that the group does
not exist.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

sha1-lookup: fix up the assertion messageJunio C Hamano Mon, 6 Apr 2009 07:48:49 +0000 (00:48 -0700)

sha1-lookup: fix up the assertion message

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/name-branch'Junio C Hamano Mon, 6 Apr 2009 07:43:44 +0000 (00:43 -0700)

Merge branch 'jc/name-branch'

* jc/name-branch:
Don't permit ref/branch names to end with ".lock"
check_ref_format(): tighten refname rules
strbuf_check_branch_ref(): a helper to check a refname for a branch
Fix branch -m @{-1} newname
check-ref-format --branch: give Porcelain a way to grok branch shorthand
strbuf_branchname(): a wrapper for branch name shorthands
Rename interpret/substitute nth_last_branch functions

Conflicts:
Documentation/git-check-ref-format.txt

Merge branch 'jc/shared-literally'Junio C Hamano Mon, 6 Apr 2009 07:42:52 +0000 (00:42 -0700)

Merge branch 'jc/shared-literally'

* jc/shared-literally:
t1301: loosen test for forced modes
set_shared_perm(): sometimes we know what the final mode bits should look like
move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
Move chmod(foo, 0444) into move_temp_to_file()
"core.sharedrepository = 0mode" should set, not loosen

Merge branch 'mg/tracked-local-branches'Junio C Hamano Mon, 6 Apr 2009 07:42:31 +0000 (00:42 -0700)

Merge branch 'mg/tracked-local-branches'

* mg/tracked-local-branches:
Make local branches behave like remote branches when --tracked
Test for local branches being followed with --track

Merge branch 'sb/format-patch-patchname'Junio C Hamano Mon, 6 Apr 2009 07:42:23 +0000 (00:42 -0700)

Merge branch 'sb/format-patch-patchname'

* sb/format-patch-patchname:
format_sanitized_subject: Don't trim past initial length of strbuf
log-tree: fix patch filename computation in "git format-patch"
format-patch: --numbered-files and --stdout aren't mutually exclusive
format-patch: --attach/inline uses filename instead of SHA1
format-patch: move get_patch_filename() into log-tree
format-patch: pass a commit to reopen_stdout()
format-patch: construct patch filename in one function
pretty.c: add %f format specifier to format_commit_message()

user-manual: the name of the hash function is SHA-1... Felipe Contreras Sat, 4 Apr 2009 09:38:27 +0000 (12:38 +0300)

user-manual: the name of the hash function is SHA-1, not sha1

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

docbook: change css styleFelipe Contreras Sat, 4 Apr 2009 09:38:24 +0000 (12:38 +0300)

docbook: change css style

A handful of random personal preference:

- Force sans-serif for the text.
- Quote code sample literal inside a single-quote pair.
- Show emphasis in blue-green italics.
- Do not use itarlics for term definition, but show them in navy.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>