delta/git.git/contrib, branch rs/run-command-env-array

Merge branch 'jc/completion-no-chdir'

2014-10-16T21:16:49+00:00

* jc/completion-no-chdir:
  completion: use "git -C $there" instead of (cd $there && git ...)

completion: use "git -C $there" instead of (cd $there && git ...)

2014-10-09T22:06:08+00:00

We have had "git -C $there" to first go to a different directory
and run a Git command without changing the arguments for quite some
time.  Use it instead of (cd $there && git ...) in the completion
script.

This allows us to lose the work-around for misfeatures of modern
interactive-minded shells that make "cd" unusable in scripts (e.g.
end users' $CDPATH taking us to unexpected places in any POSIX
shell, and chpwd functions spewing unwanted output in zsh).

Based on Øystein Walle's idea, which was raised during the
discussion on the solution by Brandon Turner for a problem zsh users
had with RVM which mucks with chpwd_functions in users' environments
(https://github.com/wayneeseguin/rvm/issues/3076).

As $root variable, which is used to direct where to chdir to, is set
to "." based on if $2 to __git_index_files is set (not if it is empty),
the only caller of the function is fixed not to pass the optional $2
when it does not want us to switch to a different directory.  Otherwise
we would end up doing "git -C '' command...", which would not work.

Maybe we would want "git -C '' command..." to mean "do not chdir
anywhere", but that is a spearate topic.

Signed-off-by: Junio C Hamano

completion: add --show-signature for log and show

2014-10-07T19:00:48+00:00

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

Merge branch 'tb/complete-diff-ignore-blank-lines'

2014-09-19T18:38:38+00:00

* tb/complete-diff-ignore-blank-lines:
  completion: Add --ignore-blank-lines for diff

Merge branch 'mb/build-contrib-svn-fe'

2014-09-19T18:38:32+00:00

* mb/build-contrib-svn-fe:
  contrib/svn-fe: fix Makefile

Merge branch 'jk/contrib-subtree-make-all'

2014-09-11T17:33:27+00:00

* jk/contrib-subtree-make-all:
  subtree: make "all" default target of Makefile

Merge branch 'jk/prompt-stash-could-be-packed'

2014-09-09T19:54:08+00:00

The prompt script checked $GIT_DIR/ref/stash file to see if there
is a stash, which was a no-no.

* jk/prompt-stash-could-be-packed:
  git-prompt: do not look for refs/stash in $GIT_DIR

completion: Add --ignore-blank-lines for diff

2014-09-03T19:23:10+00:00

Signed-off-by: Thomas Braun 
Signed-off-by: Junio C Hamano

contrib/svn-fe: fix Makefile

2014-08-28T22:41:28+00:00

Fixes several problems:
  * include config.mak.uname, config.mak.autogen and config.mak
    in order to use settings for prefix and other such things;
  * link xdiff/lib.a as it is a requirement for libgit.a;
  * fix CFLAGS, LDFLAGS and EXTLIBS for Linux and Mac OS X.

Signed-off-by: Maxim Bublis 
Signed-off-by: Junio C Hamano

git-prompt: do not look for refs/stash in $GIT_DIR

2014-08-25T19:21:17+00:00

Since dd0b72c (bash prompt: use bash builtins to check stash
state, 2011-04-01), git-prompt checks whether we have a
stash by looking for $GIT_DIR/refs/stash. Generally external
programs should never do this, because they would miss
packed-refs.

That commit claims that packed-refs does not pack
refs/stash, but that is not quite true. It does pack the
ref, but due to a bug, fails to prune the ref. When we fix
that bug, we would want to be doing the right thing here.

Signed-off-by: Jeff King 
Reviewed-by: Michael Haggerty 
Reviewed-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano