git/git.git
10 years agoMerge branch 'jk/t2107-now-passes'
Junio C Hamano [Tue, 21 Dec 2010 22:30:47 +0000 (14:30 -0800)]
Merge branch 'jk/t2107-now-passes'

* jk/t2107-now-passes:
  t2107: mark passing test as success

10 years agoMerge branch 'jk/maint-decorate-01-bool'
Junio C Hamano [Tue, 21 Dec 2010 22:30:43 +0000 (14:30 -0800)]
Merge branch 'jk/maint-decorate-01-bool'

* jk/maint-decorate-01-bool:
  handle arbitrary ints in git_config_maybe_bool

10 years agoMerge branch 'tc/completion-reflog'
Junio C Hamano [Tue, 21 Dec 2010 22:30:23 +0000 (14:30 -0800)]
Merge branch 'tc/completion-reflog'

* tc/completion-reflog:
  bash completion: add basic support for git-reflog

10 years agoMerge branch 'nd/oneline-sha1-name-from-specific-ref'
Junio C Hamano [Tue, 21 Dec 2010 22:30:19 +0000 (14:30 -0800)]
Merge branch 'nd/oneline-sha1-name-from-specific-ref'

* nd/oneline-sha1-name-from-specific-ref:
  get_sha1: handle special case $commit^{/}
  get_sha1: support $commit^{/regex} syntax
  get_sha1_oneline: make callers prepare the commit list to traverse
  get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable

10 years agoMerge branch 'jn/maint-gitweb-pathinfo-fix'
Junio C Hamano [Tue, 21 Dec 2010 22:30:09 +0000 (14:30 -0800)]
Merge branch 'jn/maint-gitweb-pathinfo-fix'

* jn/maint-gitweb-pathinfo-fix:
  gitweb: Fix handling of whitespace in generated links

10 years agoset_try_to_free_routine(NULL) means "do nothing special"
Junio C Hamano [Tue, 21 Dec 2010 17:24:18 +0000 (09:24 -0800)]
set_try_to_free_routine(NULL) means "do nothing special"

This way, the next caller that wants to disable our memory reclamation
machinery does not have to define its own do_nothing() stub.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agocompletion: add missing configuration variables
Martin von Zweigbergk [Mon, 20 Dec 2010 15:18:25 +0000 (16:18 +0100)]
completion: add missing configuration variables

Quite a few configuration variables have been added since 226b343
(completion: add missing configuration variables to _git_config(),
2009-05-03). Add these variables to the Bash completion script.

Also remove the obsolete 'add.ignore-errors' and
'color.grep.external', as well as 'diff.renameLimit.', which never
existed and rename the misspelled 'sendemail.aliasesfiletype'.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'maint'
Junio C Hamano [Mon, 20 Dec 2010 01:49:42 +0000 (17:49 -0800)]
Merge branch 'maint'

* maint:
  gitweb: Include links to feeds in HTML header only for '200 OK' response
  fsck docs: remove outdated and useless diagnostic
  userdiff: fix typo in ruby and python word regexes
  trace.c: mark file-local function static
  Fix typo in git-gc document.

10 years agot9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
Jonathan Nieder [Mon, 13 Dec 2010 09:28:05 +0000 (03:28 -0600)]
t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge

It is unfortunate to have to issue thousands of one-byte read calls to
work around dd's refusal to buffer input that would fill a block after
a short read (a3a6f4, 2010-12-13).  We could do better by using
"head -c", if it were available on all platforms we cared about.
Replace it with some simple perl.

While doing so, restructure 9300.114 to use a subshell instead of a
script.  Subshells can inherit functions (like the new head_c) from
the parent shell while external scripts cannot.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agot2107: mark passing test as success
Jeff King [Sun, 19 Dec 2010 03:53:58 +0000 (22:53 -0500)]
t2107: mark passing test as success

This failed on the branch where it was introduced, but was fixed
by merging with 6e67619 (Merge branch 'jn/parse-options-extra').

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agohandle arbitrary ints in git_config_maybe_bool
Jeff King [Sun, 19 Dec 2010 03:36:41 +0000 (22:36 -0500)]
handle arbitrary ints in git_config_maybe_bool

This function recently gained the ability to recognize the documented "0"
and "1" values as false/true. However, unlike regular git_config_bool, it
did not treat arbitrary non-zero numbers as true.

While this is undocumented and probably ridiculous for somebody to rely
on, it is safer to behave exactly as git_config_bool would. Because
git_config_maybe_bool can be used to retrofit new non-bool values onto
existing bool options, not behaving in exactly the same way is technically
a regression.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agobuiltin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
Thiago Farina [Sun, 19 Dec 2010 11:56:25 +0000 (09:56 -0200)]
builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agobuiltin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
Thiago Farina [Tue, 14 Dec 2010 01:59:55 +0000 (23:59 -0200)]
builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agogitweb: Include links to feeds in HTML header only for '200 OK' response
Jakub Narebski [Sat, 18 Dec 2010 20:02:13 +0000 (21:02 +0100)]
gitweb: Include links to feeds in HTML header only for '200 OK' response

To do that, generating "<link />"s to feeds were refactored into
print_feed_meta() subroutine, to keep nesting (indent) level in
git_header_html() low.  This has also the advantage of making code
more clear.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agofsck docs: remove outdated and useless diagnostic
Mark Lodato [Sat, 18 Dec 2010 05:38:38 +0000 (00:38 -0500)]
fsck docs: remove outdated and useless diagnostic

In git-fsck(1), there was a reference to the warning "<tree> has full
pathnames in it".  This exact wording has not been used since 2005
(commit f1f0d0889e55), when the wording was changed slightly.  More
importantly, the description of that warning was useless, and there were
many other similar warning messages which were not document at all.
Since all these warnings are fairly obvious, there is no need for them
to be in the man page.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agouserdiff: fix typo in ruby and python word regexes
Thomas Rast [Sat, 18 Dec 2010 16:17:53 +0000 (17:17 +0100)]
userdiff: fix typo in ruby and python word regexes

Both had an unclosed ] that ruined the safeguard against not matching
a non-space char.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agotrace.c: mark file-local function static
Vasyl' Vavrychuk [Thu, 16 Dec 2010 22:38:42 +0000 (00:38 +0200)]
trace.c: mark file-local function static

Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agobash completion: add basic support for git-reflog
Tay Ray Chuan [Thu, 16 Dec 2010 06:56:08 +0000 (14:56 +0800)]
bash completion: add basic support for git-reflog

"Promote" the reflog command out of plumbing, so that we now run
completion for it. After all, it's listed under porcelain (ancillary),
and we do run completion for those commands.

Add basic completion for the three subcommands - show, expire, delete.
Try completing refs for these too.

Helped-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoFix typo in git-gc document.
Jiang Xin [Thu, 16 Dec 2010 07:16:49 +0000 (15:16 +0800)]
Fix typo in git-gc document.

The variable gc.packrefs for git-gc can be set to true, false and
"notbare", not "nobare".

Signed-off-by: Jiang Xin <jiangxin@ossxp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoUpdate draft release notes to 1.7.4
Junio C Hamano [Fri, 17 Dec 2010 05:43:08 +0000 (21:43 -0800)]
Update draft release notes to 1.7.4

We are getting closer to -rc0 ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'maint'
Junio C Hamano [Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)]
Merge branch 'maint'

* maint:
  difftool: provide basename to external tools
  git-difftool.txt: correct the description of $BASE and describe $MERGED

10 years agoget_sha1: handle special case $commit^{/}
Nguyễn Thái Ngọc Duy [Wed, 15 Dec 2010 09:02:54 +0000 (16:02 +0700)]
get_sha1: handle special case $commit^{/}

Empty regex pattern should always match. But the exact behavior of
regexec() may vary. Because it always matches anyway, we can just
return 'matched' without calling regex machinery.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agodifftool: provide basename to external tools
Michael J Gruber [Tue, 14 Dec 2010 09:18:35 +0000 (10:18 +0100)]
difftool: provide basename to external tools

Currently, only configured diff helpers get the basename of the file
being compared. Tools specified with "git difftool -x" only get the
names of temporary files for the different versions.

Export BASE so that an external tool can read the name from the
environment. Rather than using a third argument, this avoids breaking
existing scripts which may somewhat carelessly be using "$@" rather than
"$1" "$2".

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agogit-difftool.txt: correct the description of $BASE and describe $MERGED
Michael J Gruber [Tue, 14 Dec 2010 09:18:34 +0000 (10:18 +0100)]
git-difftool.txt: correct the description of $BASE and describe $MERGED

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'kb/diff-C-M-synonym'
Junio C Hamano [Thu, 16 Dec 2010 20:58:59 +0000 (12:58 -0800)]
Merge branch 'kb/diff-C-M-synonym'

* kb/diff-C-M-synonym:
  diff: use "find" instead of "detect" as prefix for long forms of -M and -C
  diff: add --detect-copies-harder as a synonym for --find-copies-harder

10 years agoMerge branch 'jn/fast-import-blob-access'
Junio C Hamano [Thu, 16 Dec 2010 20:58:38 +0000 (12:58 -0800)]
Merge branch 'jn/fast-import-blob-access'

* jn/fast-import-blob-access:
  t9300: avoid short reads from dd
  t9300: remove unnecessary use of /dev/stdin
  fast-import: Allow cat-blob requests at arbitrary points in stream
  fast-import: let importers retrieve blobs
  fast-import: clarify documentation of "feature" command
  fast-import: stricter parsing of integer options

Conflicts:
fast-import.c

10 years agoMerge branch 'jl/fetch-submodule-recursive'
Junio C Hamano [Thu, 16 Dec 2010 20:57:15 +0000 (12:57 -0800)]
Merge branch 'jl/fetch-submodule-recursive'

* jl/fetch-submodule-recursive:
  fetch_populated_submodules(): document dynamic allocation
  Submodules: Add the "fetchRecurseSubmodules" config option
  Add the 'fetch.recurseSubmodules' config setting
  fetch/pull: Add the --recurse-submodules option

Conflicts:
builtin/fetch.c

10 years agoMerge branch 'rj/msvc-fix'
Junio C Hamano [Thu, 16 Dec 2010 20:55:36 +0000 (12:55 -0800)]
Merge branch 'rj/msvc-fix'

* rj/msvc-fix:
  msvc: Fix macro redefinition warnings
  msvc: Fix build by adding missing INTMAX_MAX define
  msvc: git-daemon.exe: Fix linker "unresolved externals" error
  msvc: Fix compilation errors in compat/win32/sys/poll.c

10 years agoMerge branch 'nd/extended-sha1-relpath'
Junio C Hamano [Thu, 16 Dec 2010 20:51:05 +0000 (12:51 -0800)]
Merge branch 'nd/extended-sha1-relpath'

* nd/extended-sha1-relpath:
  get_sha1: teach ":$n:<path>" the same relative path logic
  get_sha1: support relative path ":path" syntax
  Make prefix_path() return char* without const

Conflicts:
sha1_name.c

10 years agoMerge branch 'aa/status-hilite-branch'
Junio C Hamano [Thu, 16 Dec 2010 20:50:03 +0000 (12:50 -0800)]
Merge branch 'aa/status-hilite-branch'

* aa/status-hilite-branch:
  default color.status.branch to "same as header"
  status: show branchname with a configurable color

10 years agoMerge branch 'ak/describe-exact'
Junio C Hamano [Thu, 16 Dec 2010 20:49:59 +0000 (12:49 -0800)]
Merge branch 'ak/describe-exact'

* ak/describe-exact:
  describe: Delay looking up commits until searching for an inexact match
  describe: Store commit_names in a hash table by commit SHA1
  describe: Do not use a flex array in struct commit_name
  describe: Use for_each_rawref

10 years agoMerge branch 'nd/maint-relative'
Junio C Hamano [Thu, 16 Dec 2010 20:49:48 +0000 (12:49 -0800)]
Merge branch 'nd/maint-relative'

* nd/maint-relative:
  get_cwd_relative(): do not misinterpret root path

10 years agoMerge branch 'jn/maint-svn-fe'
Junio C Hamano [Thu, 16 Dec 2010 20:49:35 +0000 (12:49 -0800)]
Merge branch 'jn/maint-svn-fe'

* jn/maint-svn-fe:
  t9010 fails when no svn is available
  vcs-svn: fix intermittent repo_tree corruption
  treap: make treap_insert return inserted node
  t9010 (svn-fe): Eliminate dependency on svn perl bindings

10 years agoMerge branch 'jc/maint-svn-info-test-fix'
Junio C Hamano [Thu, 16 Dec 2010 20:49:28 +0000 (12:49 -0800)]
Merge branch 'jc/maint-svn-info-test-fix'

* jc/maint-svn-info-test-fix:
  t9119: do not compare "Text Last Updated" line from "svn info"

10 years agoMerge branch 'jn/submodule-b-current'
Junio C Hamano [Thu, 16 Dec 2010 20:49:22 +0000 (12:49 -0800)]
Merge branch 'jn/submodule-b-current'

* jn/submodule-b-current:
  git submodule: Remove now obsolete tests before cloning a repo
  git submodule -b ... of current HEAD fails

10 years agoMerge branch 'jn/maint-fast-import-object-reuse'
Junio C Hamano [Thu, 16 Dec 2010 20:49:16 +0000 (12:49 -0800)]
Merge branch 'jn/maint-fast-import-object-reuse'

* jn/maint-fast-import-object-reuse:
  fast-import: insert new object entries at start of hash bucket

10 years agoMerge branch 'jn/fast-import-ondemand-checkpoint'
Junio C Hamano [Thu, 16 Dec 2010 20:49:11 +0000 (12:49 -0800)]
Merge branch 'jn/fast-import-ondemand-checkpoint'

* jn/fast-import-ondemand-checkpoint:
  fast-import: treat SIGUSR1 as a request to access objects early

10 years agoSync with 1.7.3.4
Junio C Hamano [Wed, 15 Dec 2010 23:30:49 +0000 (15:30 -0800)]
Sync with 1.7.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.7.3.4 v1.7.3.4
Junio C Hamano [Wed, 15 Dec 2010 19:47:40 +0000 (11:47 -0800)]
Git 1.7.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.7.2.5 v1.7.2.5
Junio C Hamano [Wed, 15 Dec 2010 19:45:36 +0000 (11:45 -0800)]
Git 1.7.2.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.7.1.4 v1.7.1.4
Junio C Hamano [Wed, 15 Dec 2010 19:40:40 +0000 (11:40 -0800)]
Git 1.7.1.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.7.0.9 v1.7.0.9
Junio C Hamano [Wed, 15 Dec 2010 19:38:19 +0000 (11:38 -0800)]
Git 1.7.0.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.6.6.3 v1.6.6.3
Junio C Hamano [Wed, 15 Dec 2010 19:32:57 +0000 (11:32 -0800)]
Git 1.6.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.6.5.9 v1.6.5.9
Junio C Hamano [Wed, 15 Dec 2010 19:27:41 +0000 (11:27 -0800)]
Git 1.6.5.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.6.4.5 v1.6.4.5
Junio C Hamano [Wed, 15 Dec 2010 19:19:11 +0000 (11:19 -0800)]
Git 1.6.4.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agogitweb: Introduce esc_attr to escape attributes of HTML elements
Jakub Narebski [Tue, 14 Dec 2010 23:34:01 +0000 (00:34 +0100)]
gitweb: Introduce esc_attr to escape attributes of HTML elements

It is needed only to escape attributes of handcrafted HTML elements,
and not those generated using CGI.pm subroutines / methods for HTML
generation.

While at it, add esc_url and esc_html where needed, and prefer to use
CGI.pm HTML generating methods than handcrafted HTML code.  Most of
those are probably unnecessary (could be exploited only by person with
write access to gitweb config, or at least access to the repository).

This fixes CVE-2010-3906

Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it>
Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoget_sha1: support $commit^{/regex} syntax
Nguyễn Thái Ngọc Duy [Mon, 13 Dec 2010 03:01:15 +0000 (10:01 +0700)]
get_sha1: support $commit^{/regex} syntax

This works like ":/regex" syntax that finds a recently created commit
starting from all refs, but limits the discovery to those reachable from
the named commit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agogitweb: Fix handling of whitespace in generated links
Jakub Narebski [Tue, 14 Dec 2010 15:54:31 +0000 (16:54 +0100)]
gitweb: Fix handling of whitespace in generated links

When creating path_info part of link, don't encode space as '+', because
while $cgi->param('foo') translates '+' in query param to ' ', neither
$ENV{'PATH_INFO'} nor $cgi->path_info() do.

This fixes the issue with pathnames with embedded whitespace and
$feature{'pathinfo'} / path_info links.  It is done by using newly
introduced esc_path_info() instead of esc_url() in href() subroutine.

Also while links are more clear not escaping space (' ') characters in
generated links, the trailing space must be URI-encoded, otherwise would
get discarded.

Issue noticed thanks to John 'Warthog9' Hawley.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Tue, 14 Dec 2010 17:09:13 +0000 (09:09 -0800)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Add Brazilian Portuguese (pt-BR) translation
  gitk: Make text selectable on Mac
  gitk: Prevent the text pane from becoming editable
  gitk: Add the equivalent of diff --color-words
  gitk: Update Swedish translation (290t)
  gitk: Show notes by default (like git log does)

10 years agoMerge branch 'maint'
Junio C Hamano [Tue, 14 Dec 2010 16:57:38 +0000 (08:57 -0800)]
Merge branch 'maint'

* maint:
  Prepare for 1.7.3.4
  use persistent memory for rejected paths
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD
  Do not link with -lcrypto under NO_OPENSSL

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoPrepare for 1.7.3.4
Junio C Hamano [Tue, 14 Dec 2010 15:51:35 +0000 (07:51 -0800)]
Prepare for 1.7.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agouse persistent memory for rejected paths
Clemens Buchacher [Mon, 15 Nov 2010 19:52:19 +0000 (20:52 +0100)]
use persistent memory for rejected paths

An aborted merge prints the list of rejected paths as part of the
error message. Since commit f66caaf9 (do not overwrite files in
leading path), some of those paths do not have static buffers, so
we have to keep a copy. Use string_list's to accomplish this.

This changes the order of the list to the order in which the paths
are processed. Previously, it was reversed.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agodo not overwrite files in leading path
Clemens Buchacher [Sat, 9 Oct 2010 13:53:00 +0000 (15:53 +0200)]
do not overwrite files in leading path

If the work tree contains an untracked file x, and
unpack-trees wants to checkout a path x/*, the
file x is removed unconditionally.

Instead, apply the same checks that are normally
used for untracked files, and abort if the file
cannot be removed.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agolstat_cache: optionally return match_len
Clemens Buchacher [Sat, 9 Oct 2010 13:52:59 +0000 (15:52 +0200)]
lstat_cache: optionally return match_len

Return match_len so that the caller can know which leading path
component matched.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoadd function check_ok_to_remove()
Clemens Buchacher [Sat, 9 Oct 2010 13:52:58 +0000 (15:52 +0200)]
add function check_ok_to_remove()

This wraps some inline code into the function check_ok_to_remove(),
which will later be used for leading path components as well.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agot7607: add leading-path tests
Clemens Buchacher [Sun, 10 Oct 2010 08:38:58 +0000 (10:38 +0200)]
t7607: add leading-path tests

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agot7607: use test-lib functions and check MERGE_HEAD
Clemens Buchacher [Sun, 10 Oct 2010 08:35:43 +0000 (10:35 +0200)]
t7607: use test-lib functions and check MERGE_HEAD

Use the test_commit and test_path_is_missing
functions from the test library.

Also make sure that a merge which fails due to
pre-merge checks aborts properly and does not
leave MERGE_HEAD behind.

The "will not overwrite removed file" test is an
exception to this. It notices the untracked file
at a stage where the merge is already well under
way. Therefore we cannot abort the merge without
major restructuring. See the following thread for
more details.

http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.org

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'jc/maint-no-openssl-build-fix' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:50:20 +0000 (07:50 -0800)]
Merge branch 'jc/maint-no-openssl-build-fix' into maint

* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL

10 years agoMerge branch 'ja/maint-pull-rebase-doc' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:36:23 +0000 (07:36 -0800)]
Merge branch 'ja/maint-pull-rebase-doc' into maint

* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase

10 years agoMerge branch 'tc/http-urls-ends-with-slash' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:36:10 +0000 (07:36 -0800)]
Merge branch 'tc/http-urls-ends-with-slash' into maint

* tc/http-urls-ends-with-slash:
  http-fetch: rework url handling
  http-push: add trailing slash at arg-parse time, instead of later on
  http-push: check path length before using it
  http-push: Normalise directory names when pushing to some WebDAV servers
  http-backend: use end_url_with_slash()
  url: add str wrapper for end_url_with_slash()
  shift end_url_with_slash() from http.[ch] to url.[ch]
  t5550-http-fetch: add test for http-fetch
  t5550-http-fetch: add missing '&&'

10 years agoMerge branch 'nd/maint-hide-checkout-index-from-error' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:36:00 +0000 (07:36 -0800)]
Merge branch 'nd/maint-hide-checkout-index-from-error' into maint

* nd/maint-hide-checkout-index-from-error:
  entry.c: remove "checkout-index" from error messages

10 years agoMerge branch 'jk/maint-reflog-bottom' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:35:50 +0000 (07:35 -0800)]
Merge branch 'jk/maint-reflog-bottom' into maint

* jk/maint-reflog-bottom:
  reflogs: clear flags properly in corner case

10 years agoMerge branch 'mz/rebase-abort-reflog-fix' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:35:44 +0000 (07:35 -0800)]
Merge branch 'mz/rebase-abort-reflog-fix' into maint

* mz/rebase-abort-reflog-fix:
  rebase --abort: do not update branch ref

10 years agoMerge branch 'mz/maint-rebase-stat-config' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:35:31 +0000 (07:35 -0800)]
Merge branch 'mz/maint-rebase-stat-config' into maint

* mz/maint-rebase-stat-config:
  rebase: only show stat if configured to true

10 years agoMerge branch 'gc/http-with-non-ascii-username-url' into maint
Junio C Hamano [Tue, 14 Dec 2010 15:35:18 +0000 (07:35 -0800)]
Merge branch 'gc/http-with-non-ascii-username-url' into maint

* gc/http-with-non-ascii-username-url:
  Fix username and password extraction from HTTP URLs
  t5550: test HTTP authentication and userinfo decoding

Conflicts:
t/lib-httpd/apache.conf

10 years agogitk: Add Brazilian Portuguese (pt-BR) translation
Alexandre Erwin Ittner [Tue, 7 Dec 2010 22:56:06 +0000 (20:56 -0200)]
gitk: Add Brazilian Portuguese (pt-BR) translation

Translating a SCM is tricky due to amount of jargon, so, I tried to
keep the wording consistent with both the German and Italian git
translations and the pt-BR translation of other SCMs.

Signed-off-by: Alexandre Erwin Ittner <alexandre@ittner.com.br>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agot800?-blame.sh: retitle uniquely
Michael J Gruber [Mon, 13 Dec 2010 16:12:29 +0000 (17:12 +0100)]
t800?-blame.sh: retitle uniquely

Currently we have three test files matching t800?-blame.sh.

Rename the latter two to make it easier to spot where additions would
go.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agotests: flip executable bit on t9158
Jeff King [Mon, 13 Dec 2010 17:07:34 +0000 (12:07 -0500)]
tests: flip executable bit on t9158

All tests are supposed to be executable.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agotests: add some script lint checks
Jeff King [Mon, 13 Dec 2010 17:22:38 +0000 (12:22 -0500)]
tests: add some script lint checks

There are some common but minor errors we tend to make in
writing test scripts:

  1. Scripts are left non-executable. This is not usually
     noticed immediately because "make test" does not need
     the bit, but it is a matter of git policy to make them
     executable (and is a slight convenience when running
     individual scripts).

  2. Two scripts are allocated the same number. Usually this
     happens on separate branches, and the problem only
     comes about during a merge. But since there is no
     textual conflict, the merger would have to be very
     observant to notice.

     This is also a minor error, but can make GIT_SKIP_TESTS
     ambiguous.

This patch introduces a "test-lint" target which checks
both. It is not invoked by default. You can invoke it as
"make test-lint", or you can make it a prerequisite of
running the tests by specifying "TEST_LINT = test-lint" in
your config.mak or on the command line.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoAvoid duplicate test number t7609
Johannes Sixt [Mon, 13 Dec 2010 10:14:02 +0000 (11:14 +0100)]
Avoid duplicate test number t7609

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agot9300: avoid short reads from dd
Jonathan Nieder [Mon, 13 Dec 2010 06:31:51 +0000 (00:31 -0600)]
t9300: avoid short reads from dd

dd is a thin wrapper around read(2).  As open group Issue 7 explains:

It shall read the input one block at a time, using the specified
input block size; it shall then process the block of data
actually returned, which could be smaller than the requested
block size.

Any short read --- for example from a pipe whose capacity cannot fill
a block --- results in that block being truncated.  As a result, the
first cat-blob test (9300.114) fails on Mac OS X, where the pipe
capacity is around 8 KiB.

Fix the test by using a block size of 1.  Each read will block until
the next byte of input is available.

It would be even nicer to use head -c which expresses the intention
more clearly.  Alas, IRIX "head" does not support the -c option.

Reported-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoget_sha1_oneline: make callers prepare the commit list to traverse
Nguyễn Thái Ngọc Duy [Mon, 13 Dec 2010 03:01:14 +0000 (10:01 +0700)]
get_sha1_oneline: make callers prepare the commit list to traverse

This gives callers more control, i.e. which ref will be searched from.
They must prepare the list ordered by committer date.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoget_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
Junio C Hamano [Mon, 13 Dec 2010 06:19:00 +0000 (22:19 -0800)]
get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable

This is trying to free only what we ourselves read (as opposed to what
we borrowed from commit->buffer) but do so lazily only to work around
the fact that the code has many irregular exit points, and doing it right
makes it necessary to call free() from many different places in the loop.

Rewrite the structure of the code inside the loop so that the variable
has to live within a single iteration, ever.  This should make the logic
easier to follow as well.

Also we didn't free a temporary commit list we kept to hold the original
set of commits.  Free it.

Noticed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'jn/parse-options-extra'
Junio C Hamano [Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)]
Merge branch 'jn/parse-options-extra'

* jn/parse-options-extra:
  update-index: migrate to parse-options API
  setup: save prefix (original cwd relative to toplevel) in startup_info
  parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
  parse-options: allow git commands to invent new option types
  parse-options: never suppress arghelp if LITERAL_ARGHELP is set
  parse-options: do not infer PARSE_OPT_NOARG from option type
  parse-options: sanity check PARSE_OPT_NOARG flag
  parse-options: move NODASH sanity checks to parse_options_check
  parse-options: clearer reporting of API misuse
  parse-options: Don't call parse_options_check() so much

10 years agoMerge branch 'ja/maint-pull-rebase-doc'
Junio C Hamano [Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)]
Merge branch 'ja/maint-pull-rebase-doc'

* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase

10 years agoMerge branch 'gb/web--browse'
Junio C Hamano [Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)]
Merge branch 'gb/web--browse'

* gb/web--browse:
  web--browse: better support for chromium
  web--browse: support opera, seamonkey and elinks
  web--browse: split valid_tool list
  web--browse: coding style

10 years agoMerge branch 'js/configurable-tab'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'js/configurable-tab'

* js/configurable-tab:
  Make the tab width used for whitespace checks configurable
  apply --whitespace=fix: fix tab-in-indent

10 years agoMerge branch 'nd/maint-hide-checkout-index-from-error'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'nd/maint-hide-checkout-index-from-error'

* nd/maint-hide-checkout-index-from-error:
  entry.c: remove "checkout-index" from error messages

10 years agoMerge branch 'jn/gitweb-per-request-config'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'jn/gitweb-per-request-config'

* jn/gitweb-per-request-config:
  gitweb: document $per_request_config better
  gitweb: selectable configurations that change with each request

10 years agoMerge branch 'ef/help-cmd-prefix'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'ef/help-cmd-prefix'

* ef/help-cmd-prefix:
  help: always suggest common-cmds if prefix of cmd

10 years agoMerge branch 'tc/http-urls-ends-with-slash'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'tc/http-urls-ends-with-slash'

* tc/http-urls-ends-with-slash:
  http-fetch: rework url handling
  http-push: add trailing slash at arg-parse time, instead of later on
  http-push: check path length before using it
  http-push: Normalise directory names when pushing to some WebDAV servers
  http-backend: use end_url_with_slash()
  url: add str wrapper for end_url_with_slash()
  shift end_url_with_slash() from http.[ch] to url.[ch]
  t5550-http-fetch: add test for http-fetch
  t5550-http-fetch: add missing '&&'

10 years agoMerge branch 'tc/format-patch-p'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'tc/format-patch-p'

* tc/format-patch-p:
  format-patch: page output with --stdout

10 years agoMerge branch 'ef/win32-dirent'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'ef/win32-dirent'

* ef/win32-dirent:
  win32: use our own dirent.h
  msvc: opendir: handle paths ending with a slash
  win32: dirent: handle errors
  msvc: opendir: do not start the search
  msvc: opendir: allocate enough memory
  msvc: opendir: fix malloc-failure

Conflicts:
Makefile

10 years agoMerge branch 'mz/rebase-i-verify'
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'mz/rebase-i-verify'

* mz/rebase-i-verify:
  rebase: support --verify

10 years agoMerge branch 'mz/rebase-abort-reflog-fix'
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'mz/rebase-abort-reflog-fix'

* mz/rebase-abort-reflog-fix:
  rebase --abort: do not update branch ref

10 years agoMerge branch 'jk/maint-reflog-bottom'
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'jk/maint-reflog-bottom'

* jk/maint-reflog-bottom:
  reflogs: clear flags properly in corner case

10 years agoMerge branch 'jk/asciidoc-update'
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'jk/asciidoc-update'

* jk/asciidoc-update:
  docs: default to more modern toolset

10 years agoMerge branch 'mz/pull-rebase-rebased'
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'mz/pull-rebase-rebased'

* mz/pull-rebase-rebased:
  Use reflog in 'pull --rebase . foo'

10 years agoMerge branch 'mz/maint-rebase-stat-config'
Junio C Hamano [Mon, 13 Dec 2010 05:49:50 +0000 (21:49 -0800)]
Merge branch 'mz/maint-rebase-stat-config'

* mz/maint-rebase-stat-config:
  rebase: only show stat if configured to true

10 years agoMerge branch 'jn/git-cmd-h-bypass-setup'
Junio C Hamano [Mon, 13 Dec 2010 05:49:50 +0000 (21:49 -0800)]
Merge branch 'jn/git-cmd-h-bypass-setup'

* jn/git-cmd-h-bypass-setup:
  update-index -h: show usage even with corrupt index
  merge -h: show usage even with corrupt index
  ls-files -h: show usage even with corrupt index
  gc -h: show usage even with broken configuration
  commit/status -h: show usage even with broken configuration
  checkout-index -h: show usage even in an invalid repository
  branch -h: show usage even in an invalid repository

Conflicts:
builtin/merge.c

10 years agogitk: Make text selectable on Mac
Stefan Haller [Sun, 14 Nov 2010 12:22:56 +0000 (13:22 +0100)]
gitk: Make text selectable on Mac

Stolen from git-gui, 23effa79f7 (original log message by
Shawn O. Pearce <spearce@spearce.org> follows):

    git-gui: Force focus to the diff viewer on mouse click.

    Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text
    widget cannot receive focus or receive a selection within it.  This
    makes the diff viewer almost useless on that platform as you cannot
    select individual parts of the buffer.

    Now we force focus into the diff viewer when its clicked on with
    button 1.  This works around the feature and allows selection to
    work within the viewer just like it does on other less sane systems,
    like Microsoft Windows.

Signed-off-by: Stefan Haller <stefan@haller-berlin.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Prevent the text pane from becoming editable
Stefan Haller [Sun, 14 Nov 2010 12:21:50 +0000 (13:21 +0100)]
gitk: Prevent the text pane from becoming editable

When setting the "Patch/Tree" radio buttons to "Tree" and
clicking on a file to display it, the text pane would
accidentally become editable (because of the early return
in getblobline).

Signed-off-by: Stefan Haller <stefan@haller-berlin.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Add the equivalent of diff --color-words
Thomas Rast [Sat, 16 Oct 2010 10:15:10 +0000 (12:15 +0200)]
gitk: Add the equivalent of diff --color-words

Use the newly added 'diff --word-diff=porcelain' to teach gitk a
color-words mode, with two different modes analogous to the
--word-diff=plain and --word-diff=color settings.  These are selected
by a dropdown box.

As an extra twist, automatically enable this word-diff support when
the user mentions a word-diff related option on the command line.
These options were previously ignored because they would break diff
parsing.

Both of these features are only enabled if we have a version of git
that supports --word-diff=porcelain, meaning at least 1.7.2.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Update Swedish translation (290t)
Peter Krefting [Sun, 12 Sep 2010 20:17:05 +0000 (21:17 +0100)]
gitk: Update Swedish translation (290t)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agoRelnotes: remove items fixed on 'maint'
Junio C Hamano [Sat, 11 Dec 2010 00:40:00 +0000 (16:40 -0800)]
Relnotes: remove items fixed on 'maint'

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'maint'
Junio C Hamano [Sat, 11 Dec 2010 00:36:19 +0000 (16:36 -0800)]
Merge branch 'maint'

10 years agoPrepare for 1.7.3.4
Junio C Hamano [Sat, 11 Dec 2010 00:35:00 +0000 (16:35 -0800)]
Prepare for 1.7.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'jk/maint-decorate-01-bool' into maint
Junio C Hamano [Sat, 11 Dec 2010 00:13:14 +0000 (16:13 -0800)]
Merge branch 'jk/maint-decorate-01-bool' into maint

* jk/maint-decorate-01-bool:
  log.decorate: accept 0/1 bool values

10 years agoMerge branch 'mg/maint-tag-rfc1991' into maint
Junio C Hamano [Sat, 11 Dec 2010 00:13:03 +0000 (16:13 -0800)]
Merge branch 'mg/maint-tag-rfc1991' into maint

* mg/maint-tag-rfc1991:
  tag: recognize rfc1991 signatures
  tag: factor out sig detection for tag display
  tag: factor out sig detection for body edits
  verify-tag: factor out signature detection
  t/t7004-tag: test handling of rfc1991 signatures

10 years agoMerge branch 'ks/maint-getenv-fix' into maint
Junio C Hamano [Sat, 11 Dec 2010 00:12:51 +0000 (16:12 -0800)]
Merge branch 'ks/maint-getenv-fix' into maint

* ks/maint-getenv-fix:
  setup: make sure git_dir path is in a permanent buffer, getenv(3) case