git
11 years agoMerge branch 'cb/log-follow-with-combined'
Junio C Hamano [Tue, 11 Jun 2013 20:30:36 +0000 (13:30 -0700)] 
Merge branch 'cb/log-follow-with-combined'

* cb/log-follow-with-combined:
  fix segfault with git log -c --follow

11 years agoMerge branch 'xq/credential-osxkeychain'
Junio C Hamano [Tue, 11 Jun 2013 20:30:31 +0000 (13:30 -0700)] 
Merge branch 'xq/credential-osxkeychain'

* xq/credential-osxkeychain:
  credential-osxkeychain: support more protocols

11 years agoMerge branch 'fc/do-not-use-the-index-in-add-to-index'
Junio C Hamano [Tue, 11 Jun 2013 20:30:28 +0000 (13:30 -0700)] 
Merge branch 'fc/do-not-use-the-index-in-add-to-index'

* fc/do-not-use-the-index-in-add-to-index:
  read-cache: trivial style cleanups
  read-cache: fix wrong 'the_index' usage

11 years agoMerge branch 'fc/remote-bzr'
Junio C Hamano [Tue, 11 Jun 2013 20:30:26 +0000 (13:30 -0700)] 
Merge branch 'fc/remote-bzr'

* fc/remote-bzr:
  remote-bzr: add fallback check for a partial clone
  remote-bzr: reorganize the way 'wanted' works
  remote-bzr: trivial cleanups
  remote-bzr: change global repo
  remote-bzr: delay cloning/pulling
  remote-bzr: simplify get_remote_branch()
  remote-bzr: fix for files with spaces
  remote-bzr: recover from failed clones

11 years agoMerge branch 'fc/remote-hg'
Junio C Hamano [Tue, 11 Jun 2013 20:30:24 +0000 (13:30 -0700)] 
Merge branch 'fc/remote-hg'

* fc/remote-hg: (50 commits)
  remote-hg: add support for --force
  remote-hg: add support for --dry-run
  remote-hg: check if a fetch is needed
  remote-hg: trivial cleanup
  remote-helpers: improve marks usage
  remote-hg: add check_push() helper
  remote-hg: add setup_big_push() helper
  remote-hg: remove files before modifications
  remote-hg: improve lightweight tag author
  remote-hg: use remote 'default' not local one
  remote-hg: improve branch listing
  remote-hg: simplify branch_tip()
  remote-hg: check diverged bookmarks
  remote-hg: pass around revision refs
  remote-hg: implement custom checkheads()
  remote-hg: implement custom push()
  remote-hg: only update necessary revisions
  remote-hg: force remote bookmark push selectively
  remote-hg: reorganize bookmark handling
  remote-hg: add test for failed double push
  ...

11 years agoMerge branch 'rj/mingw-cygwin'
Junio C Hamano [Tue, 11 Jun 2013 20:30:20 +0000 (13:30 -0700)] 
Merge branch 'rj/mingw-cygwin'

Update build for Cygwin 1.[57].  Torsten Bögershausen reports that
this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
ahead.

* rj/mingw-cygwin:
  cygwin: Remove the CYGWIN_V15_WIN32API build variable
  mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

11 years agoMerge branch 'fc/completion-less-ls-remote'
Junio C Hamano [Tue, 11 Jun 2013 20:30:16 +0000 (13:30 -0700)] 
Merge branch 'fc/completion-less-ls-remote'

* fc/completion-less-ls-remote:
  completion: avoid ls-remote in certain scenarios

11 years agoMerge branch 'tr/test-commit-only-on-orphan'
Junio C Hamano [Tue, 11 Jun 2013 20:30:12 +0000 (13:30 -0700)] 
Merge branch 'tr/test-commit-only-on-orphan'

* tr/test-commit-only-on-orphan:
  Test 'commit --only' after 'checkout --orphan'

11 years agoMerge branch 'rs/unpack-trees-plug-leak'
Junio C Hamano [Tue, 11 Jun 2013 20:30:05 +0000 (13:30 -0700)] 
Merge branch 'rs/unpack-trees-plug-leak'

* rs/unpack-trees-plug-leak:
  unpack-trees: free cache_entry array members for merges
  diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
  diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
  unpack-trees: create working copy of merge entry in merged_entry
  unpack-trees: factor out dup_entry
  read-cache: mark cache_entry pointers const
  cache: mark cache_entry pointers const

11 years agoMerge branch 'rr/die-on-missing-upstream'
Junio C Hamano [Tue, 11 Jun 2013 20:29:58 +0000 (13:29 -0700)] 
Merge branch 'rr/die-on-missing-upstream'

When a reflog notation is used for implicit "current branch", we
did not say which branch and worse said "branch ''".

* rr/die-on-missing-upstream:
  sha1_name: fix error message for @{<N>}, @{<date>}
  sha1_name: fix error message for @{u}

11 years agoSync with 1.8.3.1
Junio C Hamano [Mon, 10 Jun 2013 19:35:32 +0000 (12:35 -0700)] 
Sync with 1.8.3.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoGit 1.8.3.1 v1.8.3.1
Junio C Hamano [Mon, 10 Jun 2013 00:16:20 +0000 (17:16 -0700)] 
Git 1.8.3.1

Primarily to push out two regression issues that seem to affect many
people, namely, the ".gitignore !directory" bug and "daemon cannot
read from $HOME owned by root" bug.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agomingw: make mingw_signal return the correct handler
Erik Faye-Lund [Mon, 10 Jun 2013 05:48:17 +0000 (07:48 +0200)] 
mingw: make mingw_signal return the correct handler

Returning the SIGALRM handler for SIGINT is not very useful.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge branch 'jn/config-ignore-inaccessible' into maint
Junio C Hamano [Mon, 10 Jun 2013 00:06:55 +0000 (17:06 -0700)] 
Merge branch 'jn/config-ignore-inaccessible' into maint

A git daemon that starts as "root" and then drops privilege often
leaves $HOME set to that of the root user, which is unreadable by
the daemon process, which was diagnosed as a configuration error.

Make per-user configuration files that are inaccessible due to
EACCES as though these files do not exist to avoid this issue, as
the tightening which was originally meant as an additional security
has annoyed enough sysadmins.

* jn/config-ignore-inaccessible:
  config: allow inaccessible configuration under $HOME

11 years agoMerge branch 'kb/status-ignored-optim-2' into maint
Junio C Hamano [Mon, 10 Jun 2013 00:05:15 +0000 (17:05 -0700)] 
Merge branch 'kb/status-ignored-optim-2' into maint

Fix recent regression of .gitignore files that list !directory to
mark it not-ignored.

* kb/status-ignored-optim-2:
  dir.c: fix ignore processing within not-ignored directories

11 years agosubmodule: remove redundant check for the_index.initialized
René Scharfe [Sun, 9 Jun 2013 16:33:45 +0000 (18:33 +0200)] 
submodule: remove redundant check for the_index.initialized

read_cache already performs the same check and returns immediately if
the cache has already been loaded.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoDocument .git/modules
Fredrik Gustafsson [Sun, 9 Jun 2013 11:11:36 +0000 (13:11 +0200)] 
Document .git/modules

A note in the beginning of this document describes the behavior already.
This patch just adds where to find the repositories.

Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge tag 'post183-for-junio' of http://github.com/msysgit/git
Junio C Hamano [Fri, 7 Jun 2013 14:38:37 +0000 (07:38 -0700)] 
Merge tag 'post183-for-junio' of github.com/msysgit/git

Collected msysgit build patches for upstream

This set of patches collects a number of build fixes that have been
used on the msysgit port for a while and merging upstream should
simplify future maintenance.

* tag 'post183-for-junio' of http://github.com/msysgit/git:
  Set the default help format to html for msys builds.
  Ensure the resource file is rebuilt when the version changes.
  Windows resource: handle dashes in the Git version gracefully
  Provide a Windows version resource for the git executables.
  msysgit: Add the --large-address-aware linker directive to the makefile.
  Define NO_GETTEXT for Git for Windows
  Makefile: Do not use OLD_ICONV on MINGW anymore

11 years agoUpdate draft release notes to 1.8.4
Junio C Hamano [Thu, 6 Jun 2013 21:42:56 +0000 (14:42 -0700)] 
Update draft release notes to 1.8.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge branch 'rj/mingw-compat-st-mode-bits'
Junio C Hamano [Thu, 6 Jun 2013 19:19:06 +0000 (12:19 -0700)] 
Merge branch 'rj/mingw-compat-st-mode-bits'

* rj/mingw-compat-st-mode-bits:
  path: Fix a sparse warning

11 years agoMerge branch 'sb/archive-zip-double-assignment-fix'
Junio C Hamano [Thu, 6 Jun 2013 19:19:04 +0000 (12:19 -0700)] 
Merge branch 'sb/archive-zip-double-assignment-fix'

* sb/archive-zip-double-assignment-fix:
  archive-zip:write_zip_entry: Remove second reset of size variable to zero.

11 years agoMerge branch 'rr/push-head'
Junio C Hamano [Thu, 6 Jun 2013 19:19:00 +0000 (12:19 -0700)] 
Merge branch 'rr/push-head'

"git push $there HEAD:branch" did not resolve HEAD early enough, so
it was easy to flip it around while push is still going on and push
out a branch that the user did not originally intended when the
command was started.

* rr/push-head:
  push: make push.default = current use resolved HEAD
  push: fail early with detached HEAD and current
  push: factor out the detached HEAD error message

11 years agoMerge branch 'ks/difftool-dir-diff-copy-fix'
Junio C Hamano [Thu, 6 Jun 2013 19:18:47 +0000 (12:18 -0700)] 
Merge branch 'ks/difftool-dir-diff-copy-fix'

"difftool --dir-diff" did not copy back changes made by the
end-user in the diff tool backend to the working tree in some
cases.

* ks/difftool-dir-diff-copy-fix:
  difftool --dir-diff: allow changing any clean working tree file

11 years agoMerge branch 'fc/show-branch-in-rebase-am'
Junio C Hamano [Thu, 6 Jun 2013 19:18:41 +0000 (12:18 -0700)] 
Merge branch 'fc/show-branch-in-rebase-am'

The bash prompt code (in contrib/) displayed the name of the branch
being rebased when "rebase -i/-m/-p" modes are in use, but not the
plain vanilla "rebase".

* fc/show-branch-in-rebase-am:
  prompt: fix for simple rebase

11 years agoMerge branch 'nd/clone-connectivity-shortcut'
Junio C Hamano [Thu, 6 Jun 2013 19:17:55 +0000 (12:17 -0700)] 
Merge branch 'nd/clone-connectivity-shortcut'

Special case "git clone" and use lighter-weight implementation to
check the completeness of the history behind refs.

* nd/clone-connectivity-shortcut:
  clone: open a shortcut for connectivity check
  index-pack: remove dead code (it should never happen)
  fetch-pack: prepare updated shallow file before fetching the pack
  clone: let the user know when check_everything_connected is run

11 years agoMerge branch 'nd/prune-packed-dryrun-verbose'
Junio C Hamano [Thu, 6 Jun 2013 19:17:52 +0000 (12:17 -0700)] 
Merge branch 'nd/prune-packed-dryrun-verbose'

* nd/prune-packed-dryrun-verbose:
  prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

11 years agoMerge branch 'fc/transport-helper-no-refspec'
Junio C Hamano [Thu, 6 Jun 2013 19:17:22 +0000 (12:17 -0700)] 
Merge branch 'fc/transport-helper-no-refspec'

With "export" remote-helper protocol,

 (1) a push that tries to update a remote ref whose name is
     different from the pushing side does not work yet, and

 (2) the helper may not know how to do --dry-run

Detect such problematic cases and disable them for now.

* fc/transport-helper-no-refspec:
  transport-helper: check if the dry-run is supported
  transport-helper: barf when user tries old:new

11 years agoUpdate draft release notes to 1.8.4
Junio C Hamano [Wed, 5 Jun 2013 22:14:02 +0000 (15:14 -0700)] 
Update draft release notes to 1.8.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge branch 'rs/commit-m-no-edit'
Junio C Hamano [Wed, 5 Jun 2013 21:59:53 +0000 (14:59 -0700)] 
Merge branch 'rs/commit-m-no-edit'

"git commit --allow-empty-message -m ''" should not start an
editor.

* rs/commit-m-no-edit:
  commit: don't start editor if empty message is given with -m

11 years agoMerge branch 'fc/send-email-chainreplyto-warning'
Junio C Hamano [Wed, 5 Jun 2013 21:59:34 +0000 (14:59 -0700)] 
Merge branch 'fc/send-email-chainreplyto-warning'

An overdue removal of "behaviour changed at 1.7.0; if you were
living in a cave, here is what you can adjust to it" message.

* fc/send-email-chainreplyto-warning:
  send-email: remove warning about unset chainreplyto

11 years agoMerge branch 'fc/cleanups'
Junio C Hamano [Wed, 5 Jun 2013 21:59:31 +0000 (14:59 -0700)] 
Merge branch 'fc/cleanups'

* fc/cleanups:
  test: rebase: fix --interactive test
  test: trivial cleanups
  remote: trivial style cleanup

11 years agoMerge branch 'fc/makefile'
Junio C Hamano [Wed, 5 Jun 2013 21:56:56 +0000 (14:56 -0700)] 
Merge branch 'fc/makefile'

Update Makefile to use handy automatic variables where appropriate,
and stop installing a script that is only used for testing.

* fc/makefile:
  build: do not install git-remote-testpy
  build: add NO_INSTALL variable
  build: cleanup using $<
  build: cleanup using $^
  build: trivial simplification

11 years agoMerge branch 'nd/urls-doc-no-file-hyperlink-fix'
Junio C Hamano [Wed, 5 Jun 2013 21:56:51 +0000 (14:56 -0700)] 
Merge branch 'nd/urls-doc-no-file-hyperlink-fix'

* nd/urls-doc-no-file-hyperlink-fix:
  urls.txt: avoid auto converting to hyperlink

11 years agoMerge branch 'tr/push-no-verify-doc'
Junio C Hamano [Wed, 5 Jun 2013 21:56:48 +0000 (14:56 -0700)] 
Merge branch 'tr/push-no-verify-doc'

"git push --[no-]verify" was not documented.

* tr/push-no-verify-doc:
  Document push --no-verify

11 years agoMerge branch 'tg/maint-zsh-svn-remote-prompt'
Junio C Hamano [Wed, 5 Jun 2013 21:56:41 +0000 (14:56 -0700)] 
Merge branch 'tg/maint-zsh-svn-remote-prompt'

zsh prompt script that borrowed from bash prompt script did not
work due to slight differences in array variable notation between
these two shells.

* tg/maint-zsh-svn-remote-prompt:
  prompt: fix show upstream with svn and zsh

11 years agoMerge branch 'th/bisect-skip-report-range-fix'
Junio C Hamano [Wed, 5 Jun 2013 21:56:38 +0000 (14:56 -0700)] 
Merge branch 'th/bisect-skip-report-range-fix'

Fix for an additional bisect log comments.

* th/bisect-skip-report-range-fix:
  bisect: Fix log output for multi-parent skip ranges

11 years agoMerge branch 'dm/unbash-subtree'
Junio C Hamano [Wed, 5 Jun 2013 21:56:24 +0000 (14:56 -0700)] 
Merge branch 'dm/unbash-subtree'

It turns out that git-subtree script does not have to be run with
bash.

* dm/unbash-subtree:
  contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash

11 years agoMerge branch 'rr/zsh-color-prompt'
Junio C Hamano [Wed, 5 Jun 2013 21:55:10 +0000 (14:55 -0700)] 
Merge branch 'rr/zsh-color-prompt'

Prompt support (in contrib/) for zsh is updated to use colors.

* rr/zsh-color-prompt:
  prompt: colorize ZSH prompt
  prompt: factor out gitstring coloring logic
  prompt: introduce GIT_PS1_STATESEPARATOR

11 years agoMerge branch 'jc/core-checkstat'
Junio C Hamano [Wed, 5 Jun 2013 21:53:07 +0000 (14:53 -0700)] 
Merge branch 'jc/core-checkstat'

The configuration variable core.checkstat was advertised in the
documentation but the code expected core.statinfo instead.

For now, we accept both core.checkstat and core.statinfo, but the
latter will be removed in the longer term.

* jc/core-checkstat:
  deprecate core.statinfo at Git 2.0 boundary

11 years agoMerge branch 'maint'
Junio C Hamano [Tue, 4 Jun 2013 22:25:34 +0000 (15:25 -0700)] 
Merge branch 'maint'

* maint:
  t/README: test_must_fail is for testing Git

11 years agot/README: test_must_fail is for testing Git
Junio C Hamano [Tue, 4 Jun 2013 16:50:12 +0000 (09:50 -0700)] 
t/README: test_must_fail is for testing Git

When a test wants to make sure there is no <string> in an output
file, we should just say "! grep string output".

"test_must_fail" is there only to test Git command and catch unusual
deaths we know about (e.g. segv) as an error, not as an expected
failure.  "test_must_fail grep string output" is unnecessary, as
we are not making sure the system binaries do not dump core or
anything like that.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoSet the default help format to html for msys builds.
Pat Thoyts [Thu, 21 Jun 2012 11:24:14 +0000 (12:24 +0100)] 
Set the default help format to html for msys builds.

This resolves issue #19 by setting the compiled default to html in msys
builds following the changes introduced by commit
1cc8af0 "help: use HTML as the default help format on Windows"

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
11 years agoEnsure the resource file is rebuilt when the version changes.
Pat Thoyts [Fri, 1 Jun 2012 22:29:33 +0000 (23:29 +0100)] 
Ensure the resource file is rebuilt when the version changes.

Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
11 years agoWindows resource: handle dashes in the Git version gracefully
Johannes Schindelin [Thu, 31 May 2012 17:53:45 +0000 (12:53 -0500)] 
Windows resource: handle dashes in the Git version gracefully

Reported by postiffm as issue #14.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
11 years agoProvide a Windows version resource for the git executables.
Pat Thoyts [Wed, 23 May 2012 23:56:24 +0000 (00:56 +0100)] 
Provide a Windows version resource for the git executables.

Embeds the git version and description into the git executable thus
implementing the request in issue #5.

Acked-by: Heiko Voigt <hvoigt@hvoigt.net>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
11 years agomsysgit: Add the --large-address-aware linker directive to the makefile.
Pierre le Riche [Mon, 28 May 2012 07:46:54 +0000 (09:46 +0200)] 
msysgit: Add the --large-address-aware linker directive to the makefile.

This has the effect of increasing the address space from 2GB to 4GB under
64-bit Windows, reducing the likelihood of an "out of memory" error when
e.g.  repacking a large repository.  The test suite passes with this
patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc
calls.  While this is no guarantee that there are no issues with large
memory support (it could break Git on other setups than mine, for
example), it at least increases the chance that nothing obvious goes wrong
(such as errors introduced by faulty sign extension, say, with ssize_t).

[PT: Resolves github issue #12]

Signed-off-by: Pierre le Riche <github@pleasedontspam.me>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
11 years agoDefine NO_GETTEXT for Git for Windows
Johannes Schindelin [Thu, 5 Jan 2012 22:41:41 +0000 (16:41 -0600)] 
Define NO_GETTEXT for Git for Windows

The dreaded "your vnsprintf is broken (returned -1)" error is back. At
least with the libintl version we have. So for the moment, just work
around the issue by _not_ using gettext.

Ah, I wish that my attempt at implementing a custom strbuf_vaddf() would
not have been brushed aside so rashly. Oh well. Time saved on maintaining
that thing, I guess (although more time went into working around coping
with existing implementations).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
11 years agoMakefile: Do not use OLD_ICONV on MINGW anymore
Sebastian Schuberth [Wed, 23 Nov 2011 09:41:01 +0000 (10:41 +0100)] 
Makefile: Do not use OLD_ICONV on MINGW anymore

We are building libiconv now the same way as upstream MinGW does, so we do
not need OLD_ICONV anymore when compiling Git either in msysGit or
mingwGitDevEnv.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
11 years agoSync with maint
Junio C Hamano [Mon, 3 Jun 2013 20:00:03 +0000 (13:00 -0700)] 
Sync with maint

11 years agoMerge branch 'kb/status-ignored-optim-2'
Junio C Hamano [Mon, 3 Jun 2013 19:58:56 +0000 (12:58 -0700)] 
Merge branch 'kb/status-ignored-optim-2'

Fix 1.8.3 regressions in the .gitignore path exclusion logic.

* kb/status-ignored-optim-2:
  dir.c: fix ignore processing within not-ignored directories

11 years agosha1_file: trivial style cleanup
Felipe Contreras [Thu, 30 May 2013 13:56:21 +0000 (08:56 -0500)] 
sha1_file: trivial style cleanup

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoread-cache: trivial style cleanups
Felipe Contreras [Thu, 30 May 2013 13:56:19 +0000 (08:56 -0500)] 
read-cache: trivial style cleanups

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoread-cache: fix wrong 'the_index' usage
Felipe Contreras [Thu, 30 May 2013 13:56:18 +0000 (08:56 -0500)] 
read-cache: fix wrong 'the_index' usage

We are dealing with the 'istate' index, not 'the_index'.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agotest: fix post rewrite hook report
Felipe Contreras [Thu, 30 May 2013 13:46:35 +0000 (08:46 -0500)] 
test: fix post rewrite hook report

First expected, then actual.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agocompletion: avoid ls-remote in certain scenarios
Felipe Contreras [Wed, 29 May 2013 03:20:48 +0000 (22:20 -0500)] 
completion: avoid ls-remote in certain scenarios

It's _very_ slow in many cases, and there's really no point in fetching
*everything* from the remote just for completion. In many cases it might
be faster for the user to type the whole thing.

If the user manually specifies 'refs/*', then the full ls-remote
completion is triggered.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoUpdate draft release notes to 1.8.4
Junio C Hamano [Sun, 2 Jun 2013 23:02:21 +0000 (16:02 -0700)] 
Update draft release notes to 1.8.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge branch 'tr/line-log'
Junio C Hamano [Sun, 2 Jun 2013 23:00:44 +0000 (16:00 -0700)] 
Merge branch 'tr/line-log'

* tr/line-log:
  git-log(1): remove --full-line-diff description
  line-log: fix documentation formatting
  log -L: improve comments in process_all_files()
  log -L: store the path instead of a diff_filespec
  log -L: test merge of parallel modify/rename
  t4211: pass -M to 'git log -M -L...' test
  log -L: fix overlapping input ranges
  log -L: check range set invariants when we look it up
  Speed up log -L... -M
  log -L: :pattern:file syntax to find by funcname
  Implement line-history search (git log -L)
  Export rewrite_parents() for 'log -L'
  Refactor parse_loc

11 years agoMerge branch 'mc/describe-first-parent'
Junio C Hamano [Sun, 2 Jun 2013 22:59:49 +0000 (15:59 -0700)] 
Merge branch 'mc/describe-first-parent'

* mc/describe-first-parent:
  describe: Add --first-parent option

11 years agoMerge branch 'rs/tar-tests'
Junio C Hamano [Sun, 2 Jun 2013 22:59:46 +0000 (15:59 -0700)] 
Merge branch 'rs/tar-tests'

* rs/tar-tests:
  t5000: test long filenames
  t5000: simplify tar-tree tests
  t5000: use check_tar for prefix test
  t5000: factor out check_tar
  t5000, t5003: create directories for extracted files lazily
  t5000: integrate export-subst tests into regular tests

11 years agoMerge branch 'jc/strbuf-branchname-fix'
Junio C Hamano [Sun, 2 Jun 2013 22:58:53 +0000 (15:58 -0700)] 
Merge branch 'jc/strbuf-branchname-fix'

"git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
incorrectly when your previous branch was "frotz" (it should be
rewritten to "git merge frotz~22" instead).

* jc/strbuf-branchname-fix:
  strbuf_branchname(): do not double-expand @{-1}~22

11 years agoMerge branch 'jk/fetch-always-update-tracking'
Junio C Hamano [Sun, 2 Jun 2013 22:57:26 +0000 (15:57 -0700)] 
Merge branch 'jk/fetch-always-update-tracking'

"git fetch origin master" unlike "git fetch origin" or "git fetch"
did not update "refs/remotes/origin/master"; this was an early
design decision to keep the update of remote tracking branches
predictable, but in practice it turns out that people find it more
convenient to opportunisticly update them whenever we have a chance,
and we have been updating them when we run "git push" which already
breaks the original "predictability" anyway.

Now such a fetch does update refs/remotes/origin/master.

* jk/fetch-always-update-tracking:
  fetch: don't try to update unfetched tracking refs
  fetch: opportunistically update tracking refs
  refactor "ref->merge" flag
  fetch/pull doc: untangle meaning of bare <ref>
  t5510: start tracking-ref tests from a known state

11 years agoMerge branch 'tr/coverage'
Junio C Hamano [Sun, 2 Jun 2013 22:57:18 +0000 (15:57 -0700)] 
Merge branch 'tr/coverage'

Update the test coverage support that was left to bitrot for some
time.

* tr/coverage:
  coverage: build coverage-untested-functions by default
  coverage: set DEFAULT_TEST_TARGET to avoid using prove
  coverage: do not delete .gcno files before building
  coverage: split build target into compile and test

11 years agoMerge branch 'mk/combine-diff-context-horizon-fix'
Junio C Hamano [Sun, 2 Jun 2013 22:56:46 +0000 (15:56 -0700)] 
Merge branch 'mk/combine-diff-context-horizon-fix'

"git diff -c -p" was not showing a deleted line from a hunk when
another hunk immediately begins where the earlier one ends.

* mk/combine-diff-context-horizon-fix:
  combine-diff.c: Fix output when changes are exactly 3 lines apart

11 years agoMerge branch 'kb/ancestry-path-threedots'
Junio C Hamano [Sun, 2 Jun 2013 22:56:11 +0000 (15:56 -0700)] 
Merge branch 'kb/ancestry-path-threedots'

"git log --ancestry-path A...B" did not work as expected, as it did
not pay attention to the fact that the merge base between A and B
was the bottom of the range being specified.

* kb/ancestry-path-threedots:
  revision.c: treat A...B merge bases as if manually specified
  t6019: demonstrate --ancestry-path A...B breakage

11 years agoMerge branch 'jc/t5551-posix-sed-bre'
Junio C Hamano [Sun, 2 Jun 2013 22:56:08 +0000 (15:56 -0700)] 
Merge branch 'jc/t5551-posix-sed-bre'

POSIX fix for a test script.

* jc/t5551-posix-sed-bre:
  t5551: do not use unportable sed '\+'

11 years agoMerge branch 'da/darwin'
Junio C Hamano [Sun, 2 Jun 2013 22:55:48 +0000 (15:55 -0700)] 
Merge branch 'da/darwin'

Newer MacOS X encourages the programs to compile and link with
their CommonCrypto, not with OpenSSL.

* da/darwin:
  imap-send: eliminate HMAC deprecation warnings on Mac OS X
  cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
  Makefile: add support for Apple CommonCrypto facility
  Makefile: fix default regex settings on Darwin

11 years agoMerge branch 'fc/macos-x-clipped-write'
Junio C Hamano [Sun, 2 Jun 2013 22:54:54 +0000 (15:54 -0700)] 
Merge branch 'fc/macos-x-clipped-write'

Mac OS X does not like to write(2) more than INT_MAX number of
bytes.

* fc/macos-x-clipped-write:
  compate/clipped-write.c: large write(2) fails on Mac OS X/XNU

11 years agoMerge branch 'vv/help-unknown-ref'
Junio C Hamano [Sun, 2 Jun 2013 22:54:06 +0000 (15:54 -0700)] 
Merge branch 'vv/help-unknown-ref'

Detect "git merge foo" that might have meant "git merge origin/foo"
and give an error message that is more specific than "foo is not
something we can merge".

* vv/help-unknown-ref:
  merge: use help_unknown_ref()
  help: add help_unknown_ref()

11 years agoMerge branch 'nd/clone-local-with-colon'
Junio C Hamano [Sun, 2 Jun 2013 22:52:22 +0000 (15:52 -0700)] 
Merge branch 'nd/clone-local-with-colon'

"git clone foo/bar:baz" cannot be a request to clone from a remote
over git-over-ssh specified in the scp style.  Detect this case and
clone from a local repository at "foo/bar:baz".

* nd/clone-local-with-colon:
  clone: allow cloning local paths with colons in them

11 years agoMerge branch 'fc/fast-export-persistent-marks'
Junio C Hamano [Sun, 2 Jun 2013 22:48:28 +0000 (15:48 -0700)] 
Merge branch 'fc/fast-export-persistent-marks'

Optimization for fast-export by avoiding unnecessarily resolving
arbitrary object name and parsing object when only presence and
type information is necessary, etc.

* fc/fast-export-persistent-marks:
  fast-{import,export}: use get_sha1_hex() to read from marks file
  fast-export: don't parse commits while reading marks file
  fast-export: do not parse non-commit objects while reading marks file

11 years agoMerge branch 'rs/empty-archive'
Junio C Hamano [Sun, 2 Jun 2013 22:48:24 +0000 (15:48 -0700)] 
Merge branch 'rs/empty-archive'

Fixes tests added in 1.8.2 era that are broken on BSDs.

* rs/empty-archive:
  t5004: resurrect original empty tar archive test
  t5004: avoid using tar for checking emptiness of archive

11 years agoMerge branch 'rh/merge-options-doc-fix'
Junio C Hamano [Sun, 2 Jun 2013 22:48:22 +0000 (15:48 -0700)] 
Merge branch 'rh/merge-options-doc-fix'

* rh/merge-options-doc-fix:
  Documentation/merge-options.txt: restore `-e` option

11 years agoMerge branch 'an/diff-index-doc'
Junio C Hamano [Sun, 2 Jun 2013 22:48:17 +0000 (15:48 -0700)] 
Merge branch 'an/diff-index-doc'

* an/diff-index-doc:
  Documentation/diff-index: mention two modes of operation

11 years agoMerge branch 'fc/completion'
Junio C Hamano [Sun, 2 Jun 2013 22:48:12 +0000 (15:48 -0700)] 
Merge branch 'fc/completion'

* fc/completion:
  completion: remove __git_index_file_list_filter()
  completion: add space after completed filename
  completion: add hack to enable file mode in bash < 4
  completion: refactor __git_complete_index_file()
  completion: refactor diff_index wrappers
  completion: use __gitcompadd for __gitcomp_file
  completion; remove unuseful comments
  completion: document tilde expansion failure in tests
  completion: add file completion tests

11 years agoMerge branch 'fc/zsh-leftover-bits'
Junio C Hamano [Sun, 2 Jun 2013 22:47:33 +0000 (15:47 -0700)] 
Merge branch 'fc/zsh-leftover-bits'

* fc/zsh-leftover-bits:
  completion: zsh: improve bash script loading
  completion: synchronize zsh wrapper
  completion: cleanup zsh wrapper

11 years agounpack-trees: free cache_entry array members for merges
René Scharfe [Sun, 2 Jun 2013 15:46:57 +0000 (17:46 +0200)] 
unpack-trees: free cache_entry array members for merges

The merge functions duplicate entries as needed and they don't free
them.  Release them in unpack_nondirectories, the same function
where they were allocated, after we're done.

As suggested by Felipe, use the same loop style (zero-based for loop)
for freeing as for allocating.

Improved-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agodiff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
René Scharfe [Sun, 2 Jun 2013 15:46:56 +0000 (17:46 +0200)] 
diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const

Change the type merge_fn_t to accept the array of cache_entry pointers
as const pointers to const pointers.  This documents the fact that the
merge functions don't modify the cache_entry contents or replace any of
the pointers in the array.

Only a single cast is necessary in unpack_nondirectories because adding
two const modifiers at once is not allowed in C.  The cast is safe in
that it doesn't mask any modfication; call_unpack_fn only needs the
array for reading.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agodiff-lib, read-tree, unpack-trees: mark cache_entry pointers const
René Scharfe [Sun, 2 Jun 2013 15:46:55 +0000 (17:46 +0200)] 
diff-lib, read-tree, unpack-trees: mark cache_entry pointers const

Add const to struct cache_entry pointers throughout the tree which are
only used for reading.  This allows callers to pass in const pointers.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agounpack-trees: create working copy of merge entry in merged_entry
René Scharfe [Sun, 2 Jun 2013 15:46:54 +0000 (17:46 +0200)] 
unpack-trees: create working copy of merge entry in merged_entry

Duplicate the merge entry right away and work with that instead of
modifying the entry we got and duplicating it only at the end of
the function.  Then mark that pointer const to document that we
don't modify the referenced cache_entry.

This change is safe because all existing merge functions call
merged_entry just before returning (or not at all), i.e. they don't
care about changes to the referenced cache_entry after the call.
unpack_nondirectories and unpack_index_entry, which call the merge
functions through call_unpack_fn, aren't interested in such changes
neither.

The change complicates merged_entry a bit because we have to free the
copy if we error out, but allows callers to pass a const pointer.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agounpack-trees: factor out dup_entry
René Scharfe [Sun, 2 Jun 2013 15:46:53 +0000 (17:46 +0200)] 
unpack-trees: factor out dup_entry

While we're add it, mark the struct cache_entry pointer of add_entry
const because we only read from it and this allows callers to pass in
const pointers.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoread-cache: mark cache_entry pointers const
René Scharfe [Sun, 2 Jun 2013 15:46:52 +0000 (17:46 +0200)] 
read-cache: mark cache_entry pointers const

ie_match_stat and ie_modified only derefence their struct cache_entry
pointers for reading.  Add const to the parameter declaration here and
do the same for the static helper function used by them, as it's the
same there as well.  This allows callers to pass in const pointers.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agocache: mark cache_entry pointers const
René Scharfe [Sun, 2 Jun 2013 15:46:51 +0000 (17:46 +0200)] 
cache: mark cache_entry pointers const

Add const for pointers that are only dereferenced for reading by the
inline functions copy_cache_entry and ce_mode_from_stat.  This allows
callers to pass in const pointers.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agodir.c: fix ignore processing within not-ignored directories
Karsten Blees [Wed, 29 May 2013 20:32:36 +0000 (22:32 +0200)] 
dir.c: fix ignore processing within not-ignored directories

As of 95c6f271 "dir.c: unify is_excluded and is_path_excluded APIs", the
is_excluded API no longer recurses into directories that match an ignore
pattern, and returns the directory's ignored state for all contained paths.

This is OK for normal ignore patterns, i.e. ignoring a directory affects
the entire contents recursively.

Unfortunately, this also "works" for negated ignore patterns ('!dir'), i.e.
the entire contents is "not-ignored" recursively, regardless of ignore
patterns that match the contents directly.

In prep_exclude, skip recursing into a directory only if it is really
ignored (i.e. the ignore pattern is not negated).

Signed-off-by: Karsten Blees <blees@dcon.de>
Tested-by: Øystein Walle <oystwa@gmail.com>
Reviewed-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoTest 'commit --only' after 'checkout --orphan'
Thomas Rast [Sat, 1 Jun 2013 11:02:00 +0000 (13:02 +0200)] 
Test 'commit --only' after 'checkout --orphan'

There are some index handling subtleties in 'commit --only' that are
best tested when we have an existing index, but an unborn or empty
HEAD.  These circumstances are easily produced by 'checkout --orphan',
but we did not previously have a test for it.

The main expected failure mode would be: erroneously loading the
existing index contents when building the temporary index that is used
for --only.  Cf.

  http://article.gmane.org/gmane.comp.version-control.git/225969

and subsequent discussion.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agosha1_name: fix error message for @{<N>}, @{<date>}
Ramkumar Ramachandra [Wed, 22 May 2013 10:39:55 +0000 (16:09 +0530)] 
sha1_name: fix error message for @{<N>}, @{<date>}

Currently, when we try to resolve @{<N>} or @{<date>} when the reflog
doesn't go back far enough, we get errors like:

  # on branch master
  $ git show @{10000}
  fatal: Log for '' only has 7 entries.

  $ git show @{10000.days.ago}
  warning: Log for '' only goes back to Tue, 21 May 2013 14:14:45 +0530.
  ...

  # detached HEAD case
  $ git show @{10000}
  fatal: Log for '' only has 2005 entries.

  $ git show master@{10000}
  fatal: Log for 'master' only has 7 entries.

The empty string '' is confusing and does not convey information
about whose logs we are inspecting.  Change this so that we get:

  # on branch master
  $ git show @{10000}
  fatal: Log for 'master' only has 7 entries.

  $ git show @{10000.days.ago}
  warning: Log for 'master' only goes back to Tue, 21 May 2013 14:14:45 +0530.
  ...

  # detached HEAD case
  $ git show @{10000}
  fatal: Log for 'HEAD' only has 2005 entries.

  $ git show master@{10000}
  fatal: Log for 'master' only has 7 entries.

Also one of the message strings given to die() now points into
real_ref that was not used in that fashion, so stop freeing the
underlying storage for it.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Bug-spotted-and-fixed-by: Thomas Rast
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agopath: Fix a sparse warning
Ramsay Jones [Wed, 29 May 2013 23:53:28 +0000 (00:53 +0100)] 
path: Fix a sparse warning

On MinGW, sparse issues an "'get_st_mode_bits' not declared. Should
it be static?" warning. The MinGW and MSVC builds do not see the
declaration of this function, within git-compat-util.h, due to its
placement within an preprocessor conditional.

In order to suppress the warning, we simply move the declaration to
the top level of the header.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agopush: make push.default = current use resolved HEAD
Ramkumar Ramachandra [Wed, 29 May 2013 19:21:51 +0000 (00:51 +0530)] 
push: make push.default = current use resolved HEAD

With this change, the output of the push (with push.default set to
current) changes subtly from:

  $ git push
  ...
   * [new branch]      HEAD -> push-current-head

to:

  $ git push
  ...
   * [new branch]      push-current-head -> push-current-head

This patch was written with a different motivation. There is a problem
unique to push.default = current:

  # on branch push-current-head
  $ git push
  # on another terminal
  $ git checkout master
  # return to the first terminal
  # the push tried to push master!

This happens because the 'git checkout' on the second terminal races
with the 'git push' on the first terminal.  Although this patch does not
solve the core problem (there is still no guarantee that 'git push' on
the first terminal will resolve HEAD before 'git checkout' changes HEAD
on the second), it works in practice.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agopush: fail early with detached HEAD and current
Ramkumar Ramachandra [Wed, 29 May 2013 19:21:50 +0000 (00:51 +0530)] 
push: fail early with detached HEAD and current

Setting push.default to current adds the refspec "HEAD" for the
transport layer to handle.  If "HEAD" doesn't resolve to a branch (and
since no refspec rhs is specified), the push fails after some time with
a cryptic error message:

  $ git push
  error: unable to push to unqualified destination: HEAD
  The destination refspec neither matches an existing ref on the remote nor
  begins with refs/, and we are unable to guess a prefix based on the source ref.
  error: failed to push some refs to 'git@github.com:artagnon/git'

Fail early with a nicer error message:

  $ git push
  fatal: You are not currently on a branch.
  To push the history leading to the current (detached HEAD)
  state now, use

    git push ram HEAD:<name-of-remote-branch>

Just like in the upstream and simple cases.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoSync with maint
Junio C Hamano [Wed, 29 May 2013 22:21:47 +0000 (15:21 -0700)] 
Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoStart 1.8.3.1 maintenance track
Junio C Hamano [Wed, 29 May 2013 22:21:15 +0000 (15:21 -0700)] 
Start 1.8.3.1 maintenance track

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge branch 'maint-1.8.2' into maint
Junio C Hamano [Wed, 29 May 2013 22:20:36 +0000 (15:20 -0700)] 
Merge branch 'maint-1.8.2' into maint

* maint-1.8.2:
  trivial: Add missing period in documentation

11 years agoStart 1.8.4 cycle
Junio C Hamano [Wed, 29 May 2013 22:19:12 +0000 (15:19 -0700)] 
Start 1.8.4 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
11 years agoMerge branch 'jn/config-ignore-inaccessible'
Junio C Hamano [Wed, 29 May 2013 21:30:10 +0000 (14:30 -0700)] 
Merge branch 'jn/config-ignore-inaccessible'

When $HOME is misconfigured to point at an unreadable directory, we
used to complain and die. This loosens the check.

* jn/config-ignore-inaccessible:
  config: allow inaccessible configuration under $HOME

11 years agoMerge branch 'jk/lookup-object-prefer-latest'
Junio C Hamano [Wed, 29 May 2013 21:29:58 +0000 (14:29 -0700)] 
Merge branch 'jk/lookup-object-prefer-latest'

Optimizes object lookup when the object hashtable starts to become
crowded.

* jk/lookup-object-prefer-latest:
  lookup_object: prioritize recently found objects

11 years agoMerge branch 'jk/subtree-do-not-push-if-split-fails'
Junio C Hamano [Wed, 29 May 2013 21:29:53 +0000 (14:29 -0700)] 
Merge branch 'jk/subtree-do-not-push-if-split-fails'

"git subtree" (in contrib/) had one codepath with loose error
checks to lose data at the remote side.

* jk/subtree-do-not-push-if-split-fails:
  contrib/subtree: don't delete remote branches if split fails

11 years agoMerge branch 'jk/test-output'
Junio C Hamano [Wed, 29 May 2013 21:29:11 +0000 (14:29 -0700)] 
Merge branch 'jk/test-output'

When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
inconsistently between the test framework and t/Makefile, and logic
to summarize the results looked at a wrong place.

* jk/test-output:
  t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
  test output: respect $TEST_OUTPUT_DIRECTORY
  t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY

11 years agoMerge branch 'rj/sparse'
Junio C Hamano [Wed, 29 May 2013 21:24:02 +0000 (14:24 -0700)] 
Merge branch 'rj/sparse'

* rj/sparse:
  sparse: Fix mingw_main() argument number/type errors
  compat/mingw.c: Fix some sparse warnings
  compat/win32mmap.c: Fix some sparse warnings
  compat/poll/poll.c: Fix a sparse warning
  compat/win32/pthread.c: Fix a sparse warning
  compat/unsetenv.c: Fix a sparse warning
  compat/nedmalloc: Fix compiler warnings on linux
  compat/nedmalloc: Fix some sparse warnings
  compat/fnmatch/fnmatch.c: Fix a sparse error
  compat/regex/regexec.c: Fix some sparse warnings

11 years agoMerge branch 'mh/packed-refs-various'
Junio C Hamano [Wed, 29 May 2013 21:23:49 +0000 (14:23 -0700)] 
Merge branch 'mh/packed-refs-various'

Update reading and updating packed-refs file, correcting corner case
bugs.

* mh/packed-refs-various: (33 commits)
  refs: handle the main ref_cache specially
  refs: change do_for_each_*() functions to take ref_cache arguments
  pack_one_ref(): do some cheap tests before a more expensive one
  pack_one_ref(): use write_packed_entry() to do the writing
  pack_one_ref(): use function peel_entry()
  refs: inline function do_not_prune()
  pack_refs(): change to use do_for_each_entry()
  refs: use same lock_file object for both ref-packing functions
  pack_one_ref(): rename "path" parameter to "refname"
  pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
  pack-refs: rename handle_one_ref() to pack_one_ref()
  refs: extract a function write_packed_entry()
  repack_without_ref(): write peeled refs in the rewritten file
  t3211: demonstrate loss of peeled refs if a packed ref is deleted
  refs: change how packed refs are deleted
  search_ref_dir(): return an index rather than a pointer
  repack_without_ref(): silence errors for dangling packed refs
  t3210: test for spurious error messages for dangling packed refs
  refs: change the internal reference-iteration API
  refs: extract a function peel_entry()
  ...

11 years agoMerge branch 'as/check-ignore'
Junio C Hamano [Wed, 29 May 2013 21:23:39 +0000 (14:23 -0700)] 
Merge branch 'as/check-ignore'

Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
over bidi-pipes.

* as/check-ignore:
  t0008: use named pipe (FIFO) to test check-ignore streaming
  Documentation: add caveats about I/O buffering for check-{attr,ignore}
  check-ignore: allow incremental streaming of queries via --stdin
  check-ignore: move setup into cmd_check_ignore()
  check-ignore: add -n / --non-matching option
  t0008: remove duplicated test fixture data

11 years agoMerge branch 'jh/checkout-auto-tracking'
Junio C Hamano [Wed, 29 May 2013 21:23:10 +0000 (14:23 -0700)] 
Merge branch 'jh/checkout-auto-tracking'

Update "git checkout foo" that DWIMs the intended "upstream" and
turns it into "git checkout -t -b foo remotes/origin/foo" to
correctly take existing remote definitions into account.

The remote "origin" may be what uniquely map its own branch to
remotes/some/where/foo but that some/where may not be "origin".

* jh/checkout-auto-tracking:
  glossary: Update and rephrase the definition of a remote-tracking branch
  branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
  t9114.2: Don't use --track option against "svn-remote"-tracking branches
  t7201.24: Add refspec to keep --track working
  t3200.39: tracking setup should fail if there is no matching refspec.
  checkout: Use remote refspecs when DWIMming tracking branches
  t2024: Show failure to use refspec when DWIMming remote branch names
  t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'