git/git.git
8 years agoMerge branch 'jk/pickaxe-textconv'
Junio C Hamano [Wed, 28 Nov 2012 21:42:24 +0000 (13:42 -0800)]
Merge branch 'jk/pickaxe-textconv'

Use textconv filters when searching with "log -S".

* jk/pickaxe-textconv:
  pickaxe: use textconv for -S counting
  pickaxe: hoist empty needle check

8 years agoMerge branch 'maint'
Junio C Hamano [Tue, 27 Nov 2012 21:29:08 +0000 (13:29 -0800)]
Merge branch 'maint'

8 years agoMerge branch 'nd/maint-compat-fnmatch-fix' into maint
Junio C Hamano [Tue, 27 Nov 2012 21:29:00 +0000 (13:29 -0800)]
Merge branch 'nd/maint-compat-fnmatch-fix' into maint

* nd/maint-compat-fnmatch-fix:
  compat/fnmatch: fix off-by-one character class's length check

8 years agoMerge branch 'jh/update-ref-d-through-symref' into maint
Junio C Hamano [Tue, 27 Nov 2012 21:28:45 +0000 (13:28 -0800)]
Merge branch 'jh/update-ref-d-through-symref' into maint

* jh/update-ref-d-through-symref:
  Fix failure to delete a packed ref through a symref
  t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

8 years agoMerge branch 'esr/maint-doc-fast-import' into maint
Junio C Hamano [Tue, 27 Nov 2012 21:28:31 +0000 (13:28 -0800)]
Merge branch 'esr/maint-doc-fast-import' into maint

* esr/maint-doc-fast-import:
  doc/fast-import: clarify how content states are built

8 years agoMerge branch 'wtk/submodule-doc-fixup' into maint
Junio C Hamano [Tue, 27 Nov 2012 21:28:18 +0000 (13:28 -0800)]
Merge branch 'wtk/submodule-doc-fixup' into maint

* wtk/submodule-doc-fixup:
  git-submodule: wrap branch option with "<>" in usage strings.

8 years agoDocumentation: improve phrasing in git-push.txt
Mark Szepieniec [Tue, 27 Nov 2012 01:37:34 +0000 (01:37 +0000)]
Documentation: improve phrasing in git-push.txt

The current version contains the sentence:

Further suppose that the other person already pushed changes leading to
A back to the original repository you two obtained the original commit
X.

which doesn't parse for me; I've changed it to

Further suppose that the other person already pushed changes leading to
A back to the original repository from which you two obtained the
original commit X.

Signed-off-by: Mark Szepieniec <mszepien@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Mon, 26 Nov 2012 22:12:07 +0000 (14:12 -0800)]
Merge branch 'maint'

* maint:
  Fix typo in remote set-head usage
  Makefile: hide stderr of curl-config test

8 years agoFix typo in remote set-head usage
Antoine Pelisse [Mon, 26 Nov 2012 19:21:54 +0000 (20:21 +0100)]
Fix typo in remote set-head usage

parenthesis are not matching in `builtin_remote_sethead_usage`
as a square bracket is closing something never opened.

Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMakefile: hide stderr of curl-config test
Paul Gortmaker [Thu, 22 Nov 2012 03:19:57 +0000 (22:19 -0500)]
Makefile: hide stderr of curl-config test

You will get

    $ make distclean 2>&1 | grep curl
    /bin/sh: curl-config: not found
    /bin/sh: curl-config: not found
    /bin/sh: curl-config: not found
    /bin/sh: curl-config: not found
    /bin/sh: curl-config: not found
    $

if you don't have a curl development package installed.

The intent is not to alarm the user, but just to test if there is
a new enough curl installed.  However, if you look at search engine
suggested completions, the above "error" messages are confusing
people into thinking curl is a hard requirement.

Redirect this error output to /dev/null as it is not necessary to be
shown to the end users.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoemacs: make 'git-status' work with separate git dirs
Enrico Scholz [Thu, 22 Nov 2012 15:58:54 +0000 (16:58 +0100)]
emacs: make 'git-status' work with separate git dirs

when trying 'M-x git-status' in a submodule created with recent (1.7.5+)
git, the command fails with

| ... is not a git working tree

This is caused by creating submodules with '--separate-git-dir' but
still checking for a working tree by testing for a '.git' directory.

The patch fixes this by relaxing the existing detection a little bit.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Acked-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUpdate draft release notes to 1.8.1
Junio C Hamano [Mon, 26 Nov 2012 02:52:42 +0000 (18:52 -0800)]
Update draft release notes to 1.8.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'rr/submodule-diff-config'
Junio C Hamano [Mon, 26 Nov 2012 02:44:50 +0000 (18:44 -0800)]
Merge branch 'rr/submodule-diff-config'

Allow "git diff --submodule=log" to set to be the default via
configuration.

* rr/submodule-diff-config:
  submodule: display summary header in bold
  diff: rename "set" variable
  diff: introduce diff.submodule configuration variable
  Documentation: move diff.wordRegex from config.txt to diff-config.txt

8 years agoMerge branch 'nd/maint-compat-fnmatch-fix'
Junio C Hamano [Mon, 26 Nov 2012 02:44:41 +0000 (18:44 -0800)]
Merge branch 'nd/maint-compat-fnmatch-fix'

* nd/maint-compat-fnmatch-fix:
  compat/fnmatch: fix off-by-one character class's length check

8 years agoMerge branch 'bc/do-not-recurse-in-die'
Junio C Hamano [Mon, 26 Nov 2012 02:44:36 +0000 (18:44 -0800)]
Merge branch 'bc/do-not-recurse-in-die'

* bc/do-not-recurse-in-die:
  usage.c: detect recursion in die routines and bail out immediately

8 years agoMerge branch 'mk/complete-tcsh'
Junio C Hamano [Mon, 26 Nov 2012 02:44:28 +0000 (18:44 -0800)]
Merge branch 'mk/complete-tcsh'

* mk/complete-tcsh:
  tcsh-completion re-using git-completion.bash

8 years agoMerge branch 'jh/update-ref-d-through-symref'
Junio C Hamano [Mon, 26 Nov 2012 02:44:17 +0000 (18:44 -0800)]
Merge branch 'jh/update-ref-d-through-symref'

"update-ref -d --deref SYM" to delete a ref through a symbolic ref
that points to it did not remove it correctly.

* jh/update-ref-d-through-symref:
  Fix failure to delete a packed ref through a symref
  t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

8 years agoMerge branch 'lt/diff-stat-show-0-lines'
Junio C Hamano [Mon, 26 Nov 2012 02:44:06 +0000 (18:44 -0800)]
Merge branch 'lt/diff-stat-show-0-lines'

We failed to mention a file without any content change but whose
permission bit was modified, or (worse yet) a new file without any
content in the "git diff --stat" output.

* lt/diff-stat-show-0-lines:
  Fix "git diff --stat" for interesting - but empty - file changes

8 years agoMerge branch 'sg/complete-help-undup'
Junio C Hamano [Mon, 26 Nov 2012 02:43:54 +0000 (18:43 -0800)]
Merge branch 'sg/complete-help-undup'

* sg/complete-help-undup:
  completion: remove 'help' duplicate from porcelain commands

8 years agoSync with 1.8.0.1
Junio C Hamano [Mon, 26 Nov 2012 02:40:55 +0000 (18:40 -0800)]
Sync with 1.8.0.1

8 years agoGit 1.8.0.1 v1.8.0.1
Junio C Hamano [Mon, 26 Nov 2012 02:40:34 +0000 (18:40 -0800)]
Git 1.8.0.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/checkout-out-of-unborn' into maint
Junio C Hamano [Mon, 26 Nov 2012 02:35:50 +0000 (18:35 -0800)]
Merge branch 'jk/checkout-out-of-unborn' into maint

* jk/checkout-out-of-unborn:
  checkout: print a message when switching unborn branches

8 years agoMerge branch 'cn/config-missing-path' into maint
Junio C Hamano [Mon, 26 Nov 2012 02:35:46 +0000 (18:35 -0800)]
Merge branch 'cn/config-missing-path' into maint

* cn/config-missing-path:
  config: don't segfault when given --path with a missing value

8 years agoMerge branch 'jk/maint-gitweb-xss' into maint
Junio C Hamano [Mon, 26 Nov 2012 02:35:41 +0000 (18:35 -0800)]
Merge branch 'jk/maint-gitweb-xss' into maint

Fixes an XSS vulnerability in gitweb.

* jk/maint-gitweb-xss:
  gitweb: escape html in rss title

8 years agoCompletion must sort before using uniq
Marc Khouzam [Fri, 23 Nov 2012 14:02:22 +0000 (09:02 -0500)]
Completion must sort before using uniq

The user can be presented with invalid completion results
when trying to complete a 'git checkout' command.  This can happen
when using a branch name prefix that matches multiple remote branches.

For example, if available branches are:
  master
  remotes/GitHub/maint
  remotes/GitHub/master
  remotes/origin/maint
  remotes/origin/master

When performing completion on 'git checkout ma' the user will be
given the choices:
  maint
  master

However, 'git checkout maint' will fail in this case, although
completion previously said 'maint' was valid.  Furthermore, when
performing completion on 'git checkout mai', no choices will be
suggested.  So, the user is first told that the branch name
'maint' is valid, but when trying to complete 'mai' into 'maint',
that completion is no longer valid.

The completion results should never propose 'maint' as a valid
branch name, since 'git checkout' will refuse it.

The reason for this bug is that the uniq program only
works with sorted input.  The man page states
"uniq prints the unique lines in a sorted file".

When __git_refs uses the guess heuristic employed by checkout for
tracking branches it wants to consider remote branches but only if
the branch name is unique.  To do that, it calls 'uniq -u'.  However
the input given to 'uniq -u' is not sorted.

Therefore, in the above example, when dealing with 'git checkout ma',
"__git_refs '' 1" will find the following list:
  master
  maint
  master
  maint
  master

which, when passed to 'uniq -u' will remain the same.  Therefore
'maint' will be wrongly suggested as a valid option.

When dealing with 'git checkout mai', the list will be:
  maint
  maint

which happens to be sorted and will be emptied by 'uniq -u',
properly ignoring 'maint'.

A solution for preventing the completion script from suggesting
such invalid branch names is to first call 'sort' and then 'uniq -u'.

Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUpdate draft release notes for 1.8.1
Junio C Hamano [Wed, 21 Nov 2012 21:23:18 +0000 (13:23 -0800)]
Update draft release notes for 1.8.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'esr/maint-doc-fast-import'
Junio C Hamano [Wed, 21 Nov 2012 21:32:48 +0000 (13:32 -0800)]
Merge branch 'esr/maint-doc-fast-import'

* esr/maint-doc-fast-import:
  doc/fast-import: clarify how content states are built

8 years agoMerge branch 'wtk/submodule-doc-fixup'
Junio C Hamano [Wed, 21 Nov 2012 21:25:42 +0000 (13:25 -0800)]
Merge branch 'wtk/submodule-doc-fixup'

* wtk/submodule-doc-fixup:
  git-submodule: wrap branch option with "<>" in usage strings.

8 years agoMerge branch 'so/prompt-command'
Junio C Hamano [Wed, 21 Nov 2012 21:17:01 +0000 (13:17 -0800)]
Merge branch 'so/prompt-command'

Updates __git_ps1 so that it can be used as $PROMPT_COMMAND,
instead of being used for command substitution in $PS1, to embed
color escape sequences in its output.

* so/prompt-command:
  coloured git-prompt: paint detached HEAD marker in red
  Fix up colored git-prompt
  show color hints based on state of the git tree
  Allow __git_ps1 to be used in PROMPT_COMMAND

8 years agoMerge branch 'jk/config-ignore-duplicates'
Junio C Hamano [Wed, 21 Nov 2012 21:16:44 +0000 (13:16 -0800)]
Merge branch 'jk/config-ignore-duplicates'

Drop duplicate detection from "git-config --get"; this lets it
better match the internal config callbacks, which clears up some
corner cases with includes.

* jk/config-ignore-duplicates:
  builtin/config.c: Fix a sparse warning
  git-config: use git_config_with_options
  git-config: do not complain about duplicate entries
  git-config: collect values instead of immediately printing
  git-config: fix regexp memory leaks on error conditions
  git-config: remove memory leak of key regexp
  t1300: test "git config --get-all" more thoroughly
  t1300: remove redundant test
  t1300: style updates

8 years agoMerge branch 'jk/maint-http-half-auth-fetch'
Junio C Hamano [Wed, 21 Nov 2012 19:59:29 +0000 (11:59 -0800)]
Merge branch 'jk/maint-http-half-auth-fetch'

Finishing touches to squelch a compiler warning.

* jk/maint-http-half-auth-fetch:
  remote-curl.c: Fix a compiler warning

8 years agoremote-curl.c: Fix a compiler warning
Ramsay Jones [Wed, 21 Nov 2012 19:08:51 +0000 (19:08 +0000)]
remote-curl.c: Fix a compiler warning

In particular, gcc issues an "'gzip_size' might be used uninitialized"
warning (-Wuninitialized). However, this warning is a false positive,
since the 'gzip_size' variable would not, in fact, be used uninitialized.
In order to suppress the warning, we simply initialise the variable to
zero in it's declaration.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agocompat/fnmatch: fix off-by-one character class's length check
Nguyễn Thái Ngọc Duy [Sun, 11 Nov 2012 10:13:57 +0000 (17:13 +0700)]
compat/fnmatch: fix off-by-one character class's length check

Character class "xdigit" is the only one that hits 6 character limit
defined by CHAR_CLASS_MAX_LENGTH. All other character classes are 5
character long and therefore never caught by this.

This should make xdigit tests in t3070 pass on Windows.

Reported-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoSixth batch for 1.8.1
Junio C Hamano [Tue, 20 Nov 2012 18:46:29 +0000 (10:46 -0800)]
Sixth batch for 1.8.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'ml/cygwin-mingw-headers'
Junio C Hamano [Tue, 20 Nov 2012 18:44:29 +0000 (10:44 -0800)]
Merge branch 'ml/cygwin-mingw-headers'

Make git compile on cygwin with newer header files.

* ml/cygwin-mingw-headers:
  USE CGYWIN_V15_WIN32API as macro to select api for cygwin
  Update cygwin.c for new mingw-64 win32 api headers

8 years agoMerge branch 'jk/checkout-out-of-unborn'
Junio C Hamano [Tue, 20 Nov 2012 18:43:18 +0000 (10:43 -0800)]
Merge branch 'jk/checkout-out-of-unborn'

* jk/checkout-out-of-unborn:
  checkout: print a message when switching unborn branches

8 years agoMerge branch 'cn/config-missing-path'
Junio C Hamano [Tue, 20 Nov 2012 18:40:46 +0000 (10:40 -0800)]
Merge branch 'cn/config-missing-path'

"git config --path $key" segfaulted on "[section] key" (a boolean
"true" spelled without "=", not "[section] key = true").

* cn/config-missing-path:
  config: don't segfault when given --path with a missing value

8 years agoMerge branch 'jl/submodule-rm'
Junio C Hamano [Tue, 20 Nov 2012 18:40:31 +0000 (10:40 -0800)]
Merge branch 'jl/submodule-rm'

* jl/submodule-rm:
  docs: move submodule section

8 years agoMerge branch 'mg/replace-resolve-delete'
Junio C Hamano [Tue, 20 Nov 2012 18:38:32 +0000 (10:38 -0800)]
Merge branch 'mg/replace-resolve-delete'

Be more user friendly to people using "git replace -d".

* mg/replace-resolve-delete:
  replace: parse revision argument for -d

8 years agoMerge branch 'jk/maint-gitweb-xss'
Junio C Hamano [Tue, 20 Nov 2012 18:37:27 +0000 (10:37 -0800)]
Merge branch 'jk/maint-gitweb-xss'

Fixes an XSS vulnerability in gitweb.

* jk/maint-gitweb-xss:
  gitweb: escape html in rss title

8 years agoMerge branch 'rh/maint-gitweb-highlight-ext'
Junio C Hamano [Tue, 20 Nov 2012 18:35:53 +0000 (10:35 -0800)]
Merge branch 'rh/maint-gitweb-highlight-ext'

Fixes a clever misuse of perl's list interpretation.

* rh/maint-gitweb-highlight-ext:
  gitweb.perl: fix %highlight_ext mappings

8 years agoMerge branch 'pw/maint-p4-rcs-expansion-newline'
Junio C Hamano [Tue, 20 Nov 2012 18:34:15 +0000 (10:34 -0800)]
Merge branch 'pw/maint-p4-rcs-expansion-newline'

I do not have p4 to play with, but looks obviously correct to me.

* pw/maint-p4-rcs-expansion-newline:
  git p4: RCS expansion should not span newlines

8 years agoMerge branch 'mh/alt-odb-string-list-cleanup'
Junio C Hamano [Tue, 20 Nov 2012 18:34:08 +0000 (10:34 -0800)]
Merge branch 'mh/alt-odb-string-list-cleanup'

Cleanups in the alternates code. Fixes a potential bug and makes the
code much cleaner.

* mh/alt-odb-string-list-cleanup:
  link_alt_odb_entries(): take (char *, len) rather than two pointers
  link_alt_odb_entries(): use string_list_split_in_place()

8 years agoMerge branch 'ta/doc-cleanup'
Junio C Hamano [Tue, 20 Nov 2012 18:32:58 +0000 (10:32 -0800)]
Merge branch 'ta/doc-cleanup'

* ta/doc-cleanup:
  Documentation: build html for all files in technical and howto
  Documentation/howto: convert plain text files to asciidoc
  Documentation/technical: convert plain text files to asciidoc
  Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
  Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
  Split over-long synopsis in git-fetch-pack.txt into several lines

8 years agoMerge branch 'kb/preload-index-more'
Junio C Hamano [Tue, 20 Nov 2012 18:32:10 +0000 (10:32 -0800)]
Merge branch 'kb/preload-index-more'

Use preloadindex in more places, which has a nice speedup on systems
with slow stat calls (and even on Linux).

* kb/preload-index-more:
  update-index/diff-index: use core.preloadindex to improve performance

8 years agoMerge branch 'jk/maint-http-half-auth-fetch'
Junio C Hamano [Tue, 20 Nov 2012 18:30:17 +0000 (10:30 -0800)]
Merge branch 'jk/maint-http-half-auth-fetch'

Fixes fetch from servers that ask for auth only during the actual
packing phase. This is not really a recommended configuration, but it
cleans up the code at the same time.

* jk/maint-http-half-auth-fetch:
  remote-curl: retry failed requests for auth even with gzip
  remote-curl: hoist gzip buffer size to top of post_rpc

8 years agoSync with maint
Junio C Hamano [Tue, 20 Nov 2012 18:16:34 +0000 (10:16 -0800)]
Sync with maint

* maint:
  Further preparation for 1.8.0.1

8 years agoFurther preparation for 1.8.0.1
Junio C Hamano [Tue, 20 Nov 2012 18:16:14 +0000 (10:16 -0800)]
Further preparation for 1.8.0.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'mg/maint-pull-suggest-upstream-to' into maint
Junio C Hamano [Tue, 20 Nov 2012 18:15:09 +0000 (10:15 -0800)]
Merge branch 'mg/maint-pull-suggest-upstream-to' into maint

* mg/maint-pull-suggest-upstream-to:
  push/pull: adjust missing upstream help text to changed interface

8 years agoMerge branch 'mm/maint-doc-commit-edit' into maint
Junio C Hamano [Tue, 20 Nov 2012 18:14:55 +0000 (10:14 -0800)]
Merge branch 'mm/maint-doc-commit-edit' into maint

* mm/maint-doc-commit-edit:
  Document 'git commit --no-edit' explicitly

8 years agoMerge branch 'as/maint-doc-fix-no-post-rewrite' into maint
Junio C Hamano [Tue, 20 Nov 2012 18:14:46 +0000 (10:14 -0800)]
Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint

* as/maint-doc-fix-no-post-rewrite:
  commit: fixup misplacement of --no-post-rewrite description

8 years agoMerge branch 'rs/lock-correct-ref-during-delete' into maint
Junio C Hamano [Tue, 20 Nov 2012 18:14:41 +0000 (10:14 -0800)]
Merge branch 'rs/lock-correct-ref-during-delete' into maint

* rs/lock-correct-ref-during-delete:
  refs: lock symref that is to be deleted, not its target

8 years agoMerge branch 'rf/maint-mailmap-off-by-one' into maint
Junio C Hamano [Tue, 20 Nov 2012 18:14:28 +0000 (10:14 -0800)]
Merge branch 'rf/maint-mailmap-off-by-one' into maint

* rf/maint-mailmap-off-by-one:
  mailmap: avoid out-of-bounds memory access

8 years agoMerge branch 'jk/maint-diff-grep-textconv' into maint
Junio C Hamano [Tue, 20 Nov 2012 18:03:12 +0000 (10:03 -0800)]
Merge branch 'jk/maint-diff-grep-textconv' into maint

"git diff -G<pattern>" did not honor textconv filter when looking
for changes.

* jk/maint-diff-grep-textconv:
  diff_grep: use textconv buffers for add/deleted files

8 years agoMerge branch 'js/format-2047' into maint
Junio C Hamano [Tue, 20 Nov 2012 17:57:44 +0000 (09:57 -0800)]
Merge branch 'js/format-2047' into maint

Various rfc2047 quoting issues around a non-ASCII name on the From:
line in the output from format-patch have been corrected.

* js/format-2047:
  format-patch tests: check quoting/encoding in To: and Cc: headers
  format-patch: fix rfc2047 address encoding with respect to rfc822 specials
  format-patch: make rfc2047 encoding more strict
  format-patch: introduce helper function last_line_length()
  format-patch: do not wrap rfc2047 encoded headers too late
  format-patch: do not wrap non-rfc2047 headers too early
  utf8: fix off-by-one wrapping of text

8 years agoUSE CGYWIN_V15_WIN32API as macro to select api for cygwin
Mark Levedahl [Sun, 18 Nov 2012 21:16:52 +0000 (16:16 -0500)]
USE CGYWIN_V15_WIN32API as macro to select api for cygwin

The previous macro was confusing to some, and did not include "cygwin" in
its name. The updated name more clearly expresses a choice of the
win32api implementation that shipped with version 1.5 of cygwin.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoSync with maint
Junio C Hamano [Mon, 19 Nov 2012 03:48:31 +0000 (19:48 -0800)]
Sync with maint

8 years agoStart preparing for 1.8.0.1
Junio C Hamano [Mon, 19 Nov 2012 03:47:19 +0000 (19:47 -0800)]
Start preparing for 1.8.0.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'sz/maint-curl-multi-timeout' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:44:36 +0000 (19:44 -0800)]
Merge branch 'sz/maint-curl-multi-timeout' into maint

Sometimes curl_multi_timeout() function suggested a wrong timeout
value when there is no file descriptors to wait on and the http
transport ended up sleeping for minutes in select(2) system call.  A
workaround has been added for this.

* sz/maint-curl-multi-timeout:
  Fix potential hang in https handshake

8 years agoMerge branch 'po/maint-refs-replace-docs' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:34:09 +0000 (19:34 -0800)]
Merge branch 'po/maint-refs-replace-docs' into maint

The refs/replace hierarchy was not mentioned in the
repository-layout docs.

* po/maint-refs-replace-docs:
  Doc repository-layout: Show refs/replace

8 years agoMerge branch 'ph/pull-rebase-detached' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:33:45 +0000 (19:33 -0800)]
Merge branch 'ph/pull-rebase-detached' into maint

"git pull --rebase" run while the HEAD is detached tried to find
the upstream branch of the detached HEAD (which by definition
does not exist) and emitted unnecessary error messages.

* ph/pull-rebase-detached:
  git-pull: Avoid merge-base on detached head

8 years agoMerge branch 'mm/maint-doc-remote-tracking' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:33:20 +0000 (19:33 -0800)]
Merge branch 'mm/maint-doc-remote-tracking' into maint

Update "remote tracking branch" in the documentation to
"remote-tracking branch".

* mm/maint-doc-remote-tracking:
  Documentation: remote tracking branch -> remote-tracking branch

8 years agoMerge branch 'rs/branch-del-symref' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:32:58 +0000 (19:32 -0800)]
Merge branch 'rs/branch-del-symref' into maint

A symbolic ref refs/heads/SYM was not correctly removed with "git
branch -d SYM"; the command removed the ref pointed by SYM instead.

* rs/branch-del-symref:
  branch: show targets of deleted symrefs, not sha1s
  branch: skip commit checks when deleting symref branches
  branch: delete symref branch, not its target
  branch: factor out delete_branch_config()
  branch: factor out check_branch_commit()

8 years agoMerge branch 'nd/grep-true-path' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:32:30 +0000 (19:32 -0800)]
Merge branch 'nd/grep-true-path' into maint

"git grep -e pattern <tree>" asked the attribute system to read
"<tree>:.gitattributes" file in the working tree, which was
nonsense.

* nd/grep-true-path:
  grep: stop looking at random places for .gitattributes

8 years agoMerge branch 'jc/grep-pcre-loose-ends' (early part) into maint
Junio C Hamano [Mon, 19 Nov 2012 03:32:11 +0000 (19:32 -0800)]
Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint

"git log -F -E --grep='<ere>'" failed to use the given <ere>
pattern as extended regular expression, and instead looked for the
string literally.

* 'jc/grep-pcre-loose-ends' (early part):
  log --grep: use the same helper to set -E/-F options as "git grep"
  revisions: initialize revs->grep_filter using grep_init()
  grep: move pattern-type bits support to top-level grep.[ch]
  grep: move the configuration parsing logic to grep.[ch]
  builtin/grep.c: make configuration callback more reusable

8 years agoMerge branch 'da/mergetools-p4' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:31:40 +0000 (19:31 -0800)]
Merge branch 'da/mergetools-p4' into maint

"git mergetool" feeds /dev/null as a common ancestor when dealing
with an add/add conflict, but p4merge backend cannot handle it. Work
it around by passing a temporary empty file.

* da/mergetools-p4:
  mergetools/p4merge: Handle "/dev/null"

8 years agoMerge branch 'jc/test-say-color-avoid-echo-escape' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:31:13 +0000 (19:31 -0800)]
Merge branch 'jc/test-say-color-avoid-echo-escape' into maint

The "say" function in the test scaffolding incorrectly allowed
"echo" to interpret "\a" as if it were a C-string asking for a BEL
output.

* jc/test-say-color-avoid-echo-escape:
  test-lib: Fix say_color () not to interpret \a\b\c in the message

8 years agoMerge branch 'bw/config-lift-variable-name-length-limit' into maint
Junio C Hamano [Mon, 19 Nov 2012 03:29:44 +0000 (19:29 -0800)]
Merge branch 'bw/config-lift-variable-name-length-limit' into maint

The configuration parser had an unnecessary hardcoded limit on
variable names that was not checked consistently.

* bw/config-lift-variable-name-length-limit:
  Remove the hard coded length limit on variable names in config files

8 years agosubmodule: display summary header in bold
Ramkumar Ramachandra [Tue, 13 Nov 2012 15:42:47 +0000 (21:12 +0530)]
submodule: display summary header in bold

Currently, 'git diff --submodule' displays output with a bold diff
header for non-submodules.  So this part is in bold:

    diff --git a/file1 b/file1
    index 30b2f6c..2638038 100644
    --- a/file1
    +++ b/file1

For submodules, the header looks like this:

    Submodule submodule1 012b072..248d0fd:

Unfortunately, it's easy to miss in the output because it's not bold.
Change this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agodiff: rename "set" variable
Jeff King [Tue, 13 Nov 2012 15:42:46 +0000 (21:12 +0530)]
diff: rename "set" variable

Once upon a time the builtin_diff function used one color, and the color
variables were called "set" and "reset". Nowadays it is a much longer
function and we use several colors (e.g., "add", "del"). Rename "set" to
"meta" to show that it is the color for showing diff meta-info (it still
does not indicate that it is a "color", but at least it matches the
scheme of the other color variables).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agodiff: introduce diff.submodule configuration variable
Ramkumar Ramachandra [Tue, 13 Nov 2012 15:42:45 +0000 (21:12 +0530)]
diff: introduce diff.submodule configuration variable

Introduce a diff.submodule configuration variable corresponding to the
'--submodule' command-line option of 'git diff'.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoDocumentation: move diff.wordRegex from config.txt to diff-config.txt
Ramkumar Ramachandra [Tue, 13 Nov 2012 15:42:44 +0000 (21:12 +0530)]
Documentation: move diff.wordRegex from config.txt to diff-config.txt

19299a8 (Documentation: Move diff.<driver>.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt.  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agotcsh-completion re-using git-completion.bash
Marc Khouzam [Fri, 16 Nov 2012 18:43:45 +0000 (13:43 -0500)]
tcsh-completion re-using git-completion.bash

The current tcsh-completion support for Git, as can be found on the
Internet, takes the approach of defining the possible completions
explicitly.  This has the obvious draw-back to require constant
updating as the Git code base evolves.

The approach taken by this commit is to to re-use the advanced bash
completion script and use its result for tcsh completion.  This is
achieved by sourcing the bash script and outputting the completion
result for tcsh consumption.

Three solutions were looked at to implement this approach with (C)
being retained:

  A) Modifications:
          git-completion.bash and new git-completion.tcsh

     Modify the existing git-completion.bash script to support
     being sourced using bash (as now), but also executed using bash.
     When being executed, the script will output the result of the
     computed completion to be re-used elsewhere (e.g., in tcsh).

     The modification to git-completion.bash is made not to be
     tcsh-specific, but to allow future users to also re-use its
     output.  Therefore, to be general, git-completion.bash accepts a
     second optional parameter, which is not used by tcsh, but could
     prove useful for other users.

     Pros:
       1- allows the git-completion.bash script to easily be re-used
       2- tcsh support is mostly isolated in git-completion.tcsh
     Cons (for tcsh users only):
       1- requires the user to copy both git-completion.tcsh and
          git-completion.bash to ${HOME}
       2- requires bash script to have a fixed name and location:
          ${HOME}/.git-completion.bash

  B) Modifications:
          git-completion.bash

     Modify the existing git-completion.bash script to support
     being sourced using bash (as now), but also executed using bash,
     and sourced using tcsh.

     Pros:
       1- only requires the user to deal with a single file
       2- maintenance more obvious for tcsh since it is entirely part
          of the same git-completion.bash script.
     Cons:
       1- tcsh support could affect bash support as they share the
          same script
       2- small tcsh section must use syntax suitable for both tcsh
          and bash and must be at the beginning of the script
       3- requires script to have a fixed name and location:
          ${HOME}/.git-completion.sh (for tcsh users only)

  C) Modifications:
          New git-completion.tcsh

     Provide a short tcsh script that generates another script
     which extends git-completion.bash.  This new script can be
     used by tcsh to perform completion.

     Pros:
       1- tcsh support is entirely isolated in git-completion.tcsh
       2- new tcsh script can be as complex as needed
     Cons (for tcsh users only):
       1- requires the user to copy both git-completion.tcsh and
          git-completion.bash to ${HOME}
       2- requires bash script to have a fixed name and location:
          ${HOME}/.git-completion.bash
       3- sourcing the new script will generate a third script

Approach (C) was selected avoid any modification to git-completion.bash.

Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoconfig: don't segfault when given --path with a missing value
Carlos Martín Nieto [Thu, 15 Nov 2012 18:10:01 +0000 (10:10 -0800)]
config: don't segfault when given --path with a missing value

When given a variable without a value, such as '[section] var' and
asking git-config to treat it as a path, git_config_pathname returns
an error and doesn't modify its output parameter. show_config assumes
that the call is always successful and sets a variable to indicate
that vptr should be freed. In case of an error however, trying to do
this will cause the program to be killed, as it's pointing to memory
in the stack.

Detect the error and return immediately to avoid freeing or accessing
the uninitialed memory in the stack.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agousage.c: detect recursion in die routines and bail out immediately
Brandon Casey [Thu, 15 Nov 2012 01:45:52 +0000 (17:45 -0800)]
usage.c: detect recursion in die routines and bail out immediately

It is theoretically possible for a die handler to get into a state of
infinite recursion.  For example, if a die handler called another function
which itself called die().  Let's at least detect this situation, inform the
user, and call exit.

Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agocheckout: print a message when switching unborn branches
Jeff King [Thu, 15 Nov 2012 17:12:33 +0000 (09:12 -0800)]
checkout: print a message when switching unborn branches

When we switch to a new branch using checkout, we usually output a
message indicating what happened. However, when we switch from an unborn
branch to a new branch, we do not print anything, which may leave the
user wondering what happened.

The reason is that the unborn branch is a special case (see abe1998),
and does not follow the usual switch_branches code path. Let's add a
similar informational message to the special case to match the usual
code path.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoStart 1.8.1 cycle
Junio C Hamano [Thu, 15 Nov 2012 19:21:47 +0000 (11:21 -0800)]
Start 1.8.1 cycle

Prepare the release notes for the upcoming release, and describe
changes up to the 5th batch we just merged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jc/prettier-pretty-note'
Junio C Hamano [Thu, 15 Nov 2012 18:25:05 +0000 (10:25 -0800)]
Merge branch 'jc/prettier-pretty-note'

Emit the notes attached to the commit in "format-patch --notes"
output after three-dashes.

* jc/prettier-pretty-note:
  format-patch: add a blank line between notes and diffstat
  Doc User-Manual: Patch cover letter, three dashes, and --notes
  Doc format-patch: clarify --notes use case
  Doc notes: Include the format-patch --notes option
  Doc SubmittingPatches: Mention --notes option after "cover letter"
  Documentation: decribe format-patch --notes
  format-patch --notes: show notes after three-dashes
  format-patch: append --signature after notes
  pretty_print_commit(): do not append notes message
  pretty: prepare notes message at a centralized place
  format_note(): simplify API
  pretty: remove reencode_commit_message()

8 years agoMerge branch 'mg/maint-pull-suggest-upstream-to'
Junio C Hamano [Thu, 15 Nov 2012 18:24:59 +0000 (10:24 -0800)]
Merge branch 'mg/maint-pull-suggest-upstream-to'

Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
suggesting the deprecated "--set-upstream".

* mg/maint-pull-suggest-upstream-to:
  push/pull: adjust missing upstream help text to changed interface

8 years agoMerge branch 'mh/notes-string-list'
Junio C Hamano [Thu, 15 Nov 2012 18:24:53 +0000 (10:24 -0800)]
Merge branch 'mh/notes-string-list'

Improve the asymptotic performance of the cat_sort_uniq notes merge
strategy.

* mh/notes-string-list:
  string_list_add_refs_from_colon_sep(): use string_list_split()
  notes: fix handling of colon-separated values
  combine_notes_cat_sort_uniq(): sort and dedup lines all at once
  Initialize sort_uniq_list using named constant
  string_list: add a function string_list_remove_empty_items()

8 years agoMerge branch 'mh/strbuf-split'
Junio C Hamano [Thu, 15 Nov 2012 18:24:49 +0000 (10:24 -0800)]
Merge branch 'mh/strbuf-split'

Cleanups and documentation for strbuf_split.

* mh/strbuf-split:
  strbuf_split*(): document functions
  strbuf_split*(): rename "delim" parameter to "terminator"
  strbuf_split_buf(): simplify iteration
  strbuf_split_buf(): use ALLOC_GROW()

8 years agoMerge branch 'mm/maint-doc-commit-edit'
Junio C Hamano [Thu, 15 Nov 2012 18:24:44 +0000 (10:24 -0800)]
Merge branch 'mm/maint-doc-commit-edit'

* mm/maint-doc-commit-edit:
  Document 'git commit --no-edit' explicitly

8 years agoMerge branch 'as/maint-doc-fix-no-post-rewrite'
Junio C Hamano [Thu, 15 Nov 2012 18:24:29 +0000 (10:24 -0800)]
Merge branch 'as/maint-doc-fix-no-post-rewrite'

* as/maint-doc-fix-no-post-rewrite:
  commit: fixup misplacement of --no-post-rewrite description

8 years agoMerge branch 'js/hp-nonstop'
Junio C Hamano [Thu, 15 Nov 2012 18:24:13 +0000 (10:24 -0800)]
Merge branch 'js/hp-nonstop'

Finishing touches to port to HP NonStop continues.

* js/hp-nonstop:
  fix 'make test' for HP NonStop

8 years agoMerge branch 'cr/cvsimport-local-zone'
Junio C Hamano [Thu, 15 Nov 2012 18:24:09 +0000 (10:24 -0800)]
Merge branch 'cr/cvsimport-local-zone'

Allows "cvsimport" to read per-author timezone from the author info
file.

* cr/cvsimport-local-zone:
  cvsimport: work around perl tzset issue
  git-cvsimport: allow author-specific timezones

8 years agoMerge branch 'jc/same-encoding'
Junio C Hamano [Thu, 15 Nov 2012 18:24:05 +0000 (10:24 -0800)]
Merge branch 'jc/same-encoding'

Various codepaths checked if two encoding names are the same using
ad-hoc code and some of them ended up asking iconv() to convert
between "utf8" and "UTF-8".  The former is not a valid way to spell
the encoding name, but often people use it by mistake, and we
equated them in some but not all codepaths. Introduce a new helper
function to make these codepaths consistent.

* jc/same-encoding:
  reencode_string(): introduce and use same_encoding()

Conflicts:
builtin/mailinfo.c

8 years agoMerge branch 'ph/submodule-sync-recursive'
Junio C Hamano [Thu, 15 Nov 2012 18:24:01 +0000 (10:24 -0800)]
Merge branch 'ph/submodule-sync-recursive'

Adds "--recursive" option to submodule sync.

* ph/submodule-sync-recursive:
  Add tests for submodule sync --recursive
  Teach --recursive to submodule sync

8 years agoMerge branch 'jk/maint-diff-grep-textconv'
Junio C Hamano [Thu, 15 Nov 2012 18:23:57 +0000 (10:23 -0800)]
Merge branch 'jk/maint-diff-grep-textconv'

Fixes inconsistent use of textconv with "git log -G".

* jk/maint-diff-grep-textconv:
  diff_grep: use textconv buffers for add/deleted files

8 years agoMerge branch 'jh/symbolic-ref-d'
Junio C Hamano [Thu, 15 Nov 2012 18:23:51 +0000 (10:23 -0800)]
Merge branch 'jh/symbolic-ref-d'

Add "symbolic-ref -d SYM" to delete a symbolic ref SYM.

It is already possible to remove a symbolic ref with "update-ref -d
--no-deref", but it may be a good addition for completeness.

* jh/symbolic-ref-d:
  git symbolic-ref --delete $symref

8 years agoMerge branch 'jc/maint-fetch-tighten-refname-check'
Junio C Hamano [Thu, 15 Nov 2012 18:22:54 +0000 (10:22 -0800)]
Merge branch 'jc/maint-fetch-tighten-refname-check'

For a fetch refspec (or the result of applying wildcard on one), we
always want the RHS to map to something inside "refs/" hierarchy.

This was split out from discarded jc/maint-push-refs-all topic.

* jc/maint-fetch-tighten-refname-check:
  get_fetch_map(): tighten checks on dest refs

8 years agodocs: move submodule section
Matt Kraai [Wed, 14 Nov 2012 18:49:04 +0000 (10:49 -0800)]
docs: move submodule section

293ab15e ("submodule: teach rm to remove submodules unless they
contain a git directory", 2012-09-26) inserted the "Submodules"
section between a sentence describing a command and the command.  Move
the "Submodules" section further down.

Noticed-by: Horst H. von Brand
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agocompletion: remove 'help' duplicate from porcelain commands
SZEDER Gábor [Wed, 14 Nov 2012 00:49:30 +0000 (01:49 +0100)]
completion: remove 'help' duplicate from porcelain commands

The list of all git commands is computed from the output of 'git help
-a', which already includes 'help', so there is no need to explicitly
add it once more when computing the list of porcelain commands.

Note that 'help' wasn't actually offered twice because of this,
because Bash filters duplicates from possible completion words.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoformat-patch: add a blank line between notes and diffstat
Junio C Hamano [Tue, 13 Nov 2012 18:09:07 +0000 (10:09 -0800)]
format-patch: add a blank line between notes and diffstat

The last line of the note text comes immediately before the diffstat
block, making the latter unnecessarily harder to view.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoreplace: parse revision argument for -d
Michael J Gruber [Tue, 13 Nov 2012 10:34:11 +0000 (11:34 +0100)]
replace: parse revision argument for -d

'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.

Make it parse the argument to 'replace -d' in the same way.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Jeff King <peff@peff.net>
8 years agogitweb: escape html in rss title
Jeff King [Mon, 12 Nov 2012 21:34:28 +0000 (16:34 -0500)]
gitweb: escape html in rss title

The title of an RSS feed is generated from many components,
including the filename provided as a query parameter, but we
failed to quote it.  Besides showing the wrong output, this
is a vector for XSS attacks.

Signed-off-by: Jeff King <peff@peff.net>
8 years agoUpdate cygwin.c for new mingw-64 win32 api headers
Mark Levedahl [Mon, 12 Nov 2012 00:17:20 +0000 (19:17 -0500)]
Update cygwin.c for new mingw-64 win32 api headers

The cygwin project recently switched to a new implementation of the
windows api, now using header files from the mingw-64 project. These
new header files are incompatible with the way cygwin.c included the
old headers: cygwin.c can be compiled using the new or the older (mingw)
headers, but different files must be included in different order for each
to work. The new headers are in use only for the current release series
(based upon the v1.7.x dll version). The previous release series using
the v1.5 dll is kept available but unmaintained for use on older versions
of Windows. So, patch cygwin.c to use the new include ordering only if
the dll version is 1.7 or higher.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
8 years agoMerge branch 'ph/maint-submodule-status-fix'
Jeff King [Fri, 9 Nov 2012 17:51:15 +0000 (12:51 -0500)]
Merge branch 'ph/maint-submodule-status-fix'

Cleans up some leftover bits from an earlier submodule change.

* ph/maint-submodule-status-fix:
  submodule status: remove unused orig_* variables
  t7407: Fix recursive submodule test

8 years agoMerge branch 'nd/builtin-to-libgit'
Jeff King [Fri, 9 Nov 2012 17:51:06 +0000 (12:51 -0500)]
Merge branch 'nd/builtin-to-libgit'

Code cleanups so that libgit.a does not depend on anything in the
builtin/ directory.

* nd/builtin-to-libgit:
  fetch-pack: move core code to libgit.a
  fetch-pack: remove global (static) configuration variable "args"
  send-pack: move core code to libgit.a
  Move setup_diff_pager to libgit.a
  Move print_commit_list to libgit.a
  Move estimate_bisect_steps to libgit.a
  Move try_merge_command and checkout_fast_forward to libgit.a

8 years agoMerge branch 'nd/tree-walk-enum-cleanup'
Jeff King [Fri, 9 Nov 2012 17:51:02 +0000 (12:51 -0500)]
Merge branch 'nd/tree-walk-enum-cleanup'

* nd/tree-walk-enum-cleanup:
  tree-walk: use enum interesting instead of integer

8 years agoMerge branch 'sz/maint-curl-multi-timeout'
Jeff King [Fri, 9 Nov 2012 17:50:56 +0000 (12:50 -0500)]
Merge branch 'sz/maint-curl-multi-timeout'

Sometimes curl_multi_timeout() function suggested a wrong timeout
value when there is no file descriptors to wait on and the http
transport ended up sleeping for minutes in select(2) system call.
Detect this and reduce the wait timeout in such a case.

* sz/maint-curl-multi-timeout:
  Fix potential hang in https handshake