git
10 years agoMerge branch 'bc/doc-merge-no-op-revert'
Junio C Hamano [Tue, 17 Dec 2013 19:47:00 +0000 (11:47 -0800)] 
Merge branch 'bc/doc-merge-no-op-revert'

* bc/doc-merge-no-op-revert:
  Documentation: document pitfalls with 3-way merge

10 years agoMerge branch 'fc/trivial'
Junio C Hamano [Tue, 17 Dec 2013 19:46:32 +0000 (11:46 -0800)] 
Merge branch 'fc/trivial'

* fc/trivial:
  remote: fix status with branch...rebase=preserve
  fetch: add missing documentation
  t: trivial whitespace cleanups
  abspath: trivial style fix

10 years agoMerge branch 'jk/t5000-gzip-simplify'
Junio C Hamano [Tue, 17 Dec 2013 19:46:29 +0000 (11:46 -0800)] 
Merge branch 'jk/t5000-gzip-simplify'

Test fix.

* jk/t5000-gzip-simplify:
  t5000: simplify gzip prerequisite checks

10 years agoMerge branch 'kb/doc-exclude-directory-semantics'
Junio C Hamano [Tue, 17 Dec 2013 19:44:18 +0000 (11:44 -0800)] 
Merge branch 'kb/doc-exclude-directory-semantics'

* kb/doc-exclude-directory-semantics:
  gitignore.txt: clarify recursive nature of excluded directories

10 years agoUpdate draft release notes to 1.9
Junio C Hamano [Thu, 12 Dec 2013 22:24:39 +0000 (14:24 -0800)] 
Update draft release notes to 1.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'jn/scripts-updates'
Junio C Hamano [Thu, 12 Dec 2013 22:22:59 +0000 (14:22 -0800)] 
Merge branch 'jn/scripts-updates'

* jn/scripts-updates:
  remove #!interpreter line from shell libraries
  test: replace shebangs with descriptions in shell libraries
  test: make FILEMODE a lazy prereq
  contrib: remove git-p4import
  mark contributed hooks executable
  mark perl test scripts executable
  mark Windows build scripts executable

10 years agoMerge branch 'cn/thin-push-capability'
Junio C Hamano [Thu, 12 Dec 2013 22:20:32 +0000 (14:20 -0800)] 
Merge branch 'cn/thin-push-capability'

Allow receive-pack to insist on receiving a fat pack from "git
push" clients.

* cn/thin-push-capability:
  send-pack: don't send a thin pack to a server which doesn't support it

10 years agoMerge branch 'jk/remove-deprecated'
Junio C Hamano [Thu, 12 Dec 2013 22:18:33 +0000 (14:18 -0800)] 
Merge branch 'jk/remove-deprecated'

* jk/remove-deprecated:
  stop installing git-tar-tree link
  peek-remote: remove deprecated alias of ls-remote
  lost-found: remove deprecated command
  tar-tree: remove deprecated command
  repo-config: remove deprecated alias for "git config"

10 years agoMerge branch 'tr/commit-slab-cleanup'
Junio C Hamano [Thu, 12 Dec 2013 22:18:31 +0000 (14:18 -0800)] 
Merge branch 'tr/commit-slab-cleanup'

* tr/commit-slab-cleanup:
  commit-slab: sizeof() the right type in xrealloc
  commit-slab: declare functions "static inline"
  commit-slab: document clear_$slabname()

10 years agoMerge branch 'rs/doc-submitting-patches'
Junio C Hamano [Thu, 12 Dec 2013 22:18:29 +0000 (14:18 -0800)] 
Merge branch 'rs/doc-submitting-patches'

* rs/doc-submitting-patches:
  SubmittingPatches: document how to handle multiple patches

10 years agoMerge branch 'tr/doc-git-cherry'
Junio C Hamano [Thu, 12 Dec 2013 22:18:23 +0000 (14:18 -0800)] 
Merge branch 'tr/doc-git-cherry'

* tr/doc-git-cherry:
  Documentation: revamp git-cherry(1)

10 years agoMerge branch 'cl/p4-use-diff-tree'
Junio C Hamano [Thu, 12 Dec 2013 22:18:20 +0000 (14:18 -0800)] 
Merge branch 'cl/p4-use-diff-tree'

* cl/p4-use-diff-tree:
  git p4: Use git diff-tree instead of format-patch

10 years agoMerge branch 'tr/config-multivalue-lift-max'
Junio C Hamano [Thu, 12 Dec 2013 22:18:09 +0000 (14:18 -0800)] 
Merge branch 'tr/config-multivalue-lift-max'

* tr/config-multivalue-lift-max:
  config: arbitrary number of matches for --unset and --replace-all

10 years agoMerge branch 'mh/fetch-tags-in-addition-to-normal-refs'
Junio C Hamano [Thu, 12 Dec 2013 22:14:10 +0000 (14:14 -0800)] 
Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'

The "--tags" option to "git fetch" used to be literally a synonym to
a "refs/tags/*:refs/tags/*" refspec, which meant that (1) as an
explicit refspec given from the command line, it silenced the lazy
"git fetch" default that is configured, and (2) also as an explicit
refspec given from the command line, it interacted with "--prune"
to remove any tag that the remote we are fetching from does not
have.

This demotes it to an option; with it, we fetch all tags in
addition to what would be fetched without the option, and it does
not interact with the decision "--prune" makes to see what
remote-tracking refs the local has are missing the remote
counterpart.

* mh/fetch-tags-in-addition-to-normal-refs: (23 commits)
  fetch: improve the error messages emitted for conflicting refspecs
  handle_duplicate(): mark error message for translation
  ref_remote_duplicates(): extract a function handle_duplicate()
  ref_remove_duplicates(): simplify loop logic
  t5536: new test of refspec conflicts when fetching
  ref_remove_duplicates(): avoid redundant bisection
  git-fetch.txt: improve description of tag auto-following
  fetch-options.txt: simplify ifdef/ifndef/endif usage
  fetch, remote: properly convey --no-prune options to subprocesses
  builtin/remote.c:update(): use struct argv_array
  builtin/remote.c: reorder function definitions
  query_refspecs(): move some constants out of the loop
  fetch --prune: prune only based on explicit refspecs
  fetch --tags: fetch tags *in addition to* other stuff
  fetch: only opportunistically update references based on command line
  get_expanded_map(): avoid memory leak
  get_expanded_map(): add docstring
  builtin/fetch.c: reorder function definitions
  get_ref_map(): rename local variables
  api-remote.txt: correct section "struct refspec"
  ...

10 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Mon, 9 Dec 2013 22:57:00 +0000 (14:57 -0800)] 
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: correct spelling errors in comments
  git-gui: add menu item to launch a bash shell on Windows.
  git-gui: corrected setup of git worktree under cygwin.
  git-gui: right half window is paned
  git-gui: Add gui.displayuntracked option
  git-gui: show the maxrecentrepo config option in the preferences dialog
  git-gui: added gui.maxrecentrepo to extend the number of remembered repos
  git-gui: Improve font rendering on retina macbooks

10 years agoMerge git://ozlabs.org/~paulus/gitk
Junio C Hamano [Mon, 9 Dec 2013 22:55:41 +0000 (14:55 -0800)] 
Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Recognize -L option
  gitk: Support showing the gathered inline diffs
  gitk: Split out diff part in $commitinfo
  gitk: Refactor per-line part of getblobdiffline and its support
  gitk: Support -G option from the command line
  gitk: Tag display improvements

10 years agoremote: fix status with branch...rebase=preserve
Felipe Contreras [Sat, 7 Dec 2013 13:08:37 +0000 (07:08 -0600)] 
remote: fix status with branch...rebase=preserve

Commit 66713ef (pull: allow pull to preserve merges when rebasing)
didn't include an update so 'git remote status' parses branch.<name>.rebase=preserve
correctly, let's do that.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoDocumentation: document pitfalls with 3-way merge
brian m. carlson [Sun, 8 Dec 2013 20:40:27 +0000 (20:40 +0000)] 
Documentation: document pitfalls with 3-way merge

Oftentimes people will make the same change in two branches, revert the change
in one branch, and then be surprised when a merge reinstitutes that change when
the branches are merged.  Add an explanatory paragraph that explains that this
occurs and the reason why, so people are not surprised.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agofetch: add missing documentation
Felipe Contreras [Sun, 8 Dec 2013 05:56:58 +0000 (23:56 -0600)] 
fetch: add missing documentation

There's no mention of the 'origin' default, or the fact that the
upstream tracking branch remote is used.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agot: trivial whitespace cleanups
Felipe Contreras [Sun, 8 Dec 2013 05:56:57 +0000 (23:56 -0600)] 
t: trivial whitespace cleanups

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoabspath: trivial style fix
Felipe Contreras [Sun, 8 Dec 2013 05:56:56 +0000 (23:56 -0600)] 
abspath: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agogitignore.txt: clarify recursive nature of excluded directories
Karsten Blees [Thu, 7 Nov 2013 21:36:29 +0000 (22:36 +0100)] 
gitignore.txt: clarify recursive nature of excluded directories

Additionally, precedence of negated patterns is exactly as outlined in
the DESCRIPTION section, we don't need to repeat this.

Signed-off-by: Karsten Blees <blees@dcon.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoconfig: arbitrary number of matches for --unset and --replace-all
Thomas Rast [Wed, 13 Nov 2013 10:19:00 +0000 (11:19 +0100)] 
config: arbitrary number of matches for --unset and --replace-all

git-config used a static match array to hold the matches we want to
unset/replace when using --unset or --replace-all.  Use a
variable-sized array instead.

This in particular fixes the symptoms git-svn had when storing large
numbers of svn-remote.*.added-placeholder entries in the config file.

While the tests are rather more paranoid than just --unset and
--replace-all, the other operations already worked.  Indeed git-svn's
usage only breaks the first time *after* creating so many entries,
when it wants to unset and re-add them all.

Reported-by: Jess Hottenstein <jess.hottenstein@gmail.com>
Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoStart 1.9 cycle
Junio C Hamano [Fri, 6 Dec 2013 19:20:04 +0000 (11:20 -0800)] 
Start 1.9 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'jk/remove-experimental-loose-object-support'
Junio C Hamano [Fri, 6 Dec 2013 19:09:42 +0000 (11:09 -0800)] 
Merge branch 'jk/remove-experimental-loose-object-support'

* jk/remove-experimental-loose-object-support:
  drop support for "experimental" loose objects

10 years agoMerge branch 'nd/magic-pathspec'
Junio C Hamano [Fri, 6 Dec 2013 19:08:03 +0000 (11:08 -0800)] 
Merge branch 'nd/magic-pathspec'

"git diff -- ':(icase)makefile'" were rejected unnecessarily.
This needs to be merged to 'maint' later.

* nd/magic-pathspec:
  diff: restrict pathspec limitations to diff b/f case only

10 years agoMerge branch 'rr/for-each-ref-decoration'
Junio C Hamano [Fri, 6 Dec 2013 19:07:20 +0000 (11:07 -0800)] 
Merge branch 'rr/for-each-ref-decoration'

Add a few formatting directives to "git for-each-ref --format=...",
to paint them in color, etc.

* rr/for-each-ref-decoration:
  for-each-ref: avoid color leakage
  for-each-ref: introduce %(color:...) for color
  for-each-ref: introduce %(upstream:track[short])
  for-each-ref: introduce %(HEAD) asterisk marker
  t6300 (for-each-ref): don't hardcode SHA-1 hexes
  t6300 (for-each-ref): clearly demarcate setup

10 years agoMerge branch 'jc/bundle'
Junio C Hamano [Fri, 6 Dec 2013 19:07:14 +0000 (11:07 -0800)] 
Merge branch 'jc/bundle'

Code clean-up.

* jc/bundle:
  bundle: use argv-array

10 years agoMerge branch 'rh/remote-hg-bzr-updates'
Junio C Hamano [Fri, 6 Dec 2013 19:06:52 +0000 (11:06 -0800)] 
Merge branch 'rh/remote-hg-bzr-updates'

Updates to remote-bzr and remote-hg in contrib.

* rh/remote-hg-bzr-updates:
  remote-bzr, remote-hg: fix email address regular expression
  test-hg.sh: help user correlate verbose output with email test
  test-hg.sh: fix duplicate content strings in author tests
  test-hg.sh: avoid obsolete 'test' syntax
  test-hg.sh: eliminate 'local' bashism
  test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
  test-bzr.sh, test-hg.sh: allow running from any dir
  test-lib.sh: convert $TEST_DIRECTORY to an absolute path

10 years agoMerge branch 'jn/perl-lib-extra'
Junio C Hamano [Fri, 6 Dec 2013 19:05:38 +0000 (11:05 -0800)] 
Merge branch 'jn/perl-lib-extra'

Allow customizing the paths to Perl modules with the new
PERLLIB_EXTRA makefile variable.

* jn/perl-lib-extra:
  Makefile: add PERLLIB_EXTRA variable that adds to default perl path
  Makefile: rebuild perl scripts when perl paths change

10 years agoSync with 1.8.5
Junio C Hamano [Thu, 5 Dec 2013 22:11:11 +0000 (14:11 -0800)] 
Sync with 1.8.5

10 years agoMerge branch 'gj/push-more-verbose-advice' (early part)
Junio C Hamano [Thu, 5 Dec 2013 22:03:32 +0000 (14:03 -0800)] 
Merge branch 'gj/push-more-verbose-advice' (early part)

* 'gj/push-more-verbose-advice' (early part):
  push: enhance unspecified push default warning

10 years agoMerge branch 'jn/mediawiki-makefile-updates'
Junio C Hamano [Thu, 5 Dec 2013 21:00:23 +0000 (13:00 -0800)] 
Merge branch 'jn/mediawiki-makefile-updates'

Build and installation procedure clean-up.

* jn/mediawiki-makefile-updates:
  git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace
  git-remote-mediawiki build: make 'install' command configurable
  git-remote-mediawiki: honor DESTDIR in "make install"
  git-remote-mediawiki: do not remove installed files in "clean" target

10 years agoMerge branch 'jl/submodule-update-retire-orig-flags'
Junio C Hamano [Thu, 5 Dec 2013 21:00:20 +0000 (13:00 -0800)] 
Merge branch 'jl/submodule-update-retire-orig-flags'

Code clean-up.

* jl/submodule-update-retire-orig-flags:
  submodule update: remove unnecessary orig_flags variable

10 years agoMerge branch 'nd/wt-status-align-i18n'
Junio C Hamano [Thu, 5 Dec 2013 21:00:16 +0000 (13:00 -0800)] 
Merge branch 'nd/wt-status-align-i18n'

An attempt to automatically align the names in the "git status"
output, taking the display width of (translated) section labels
into account.

* nd/wt-status-align-i18n:
  wt-status: take the alignment burden off translators

10 years agoMerge branch 'sb/sha1-loose-object-info-check-existence'
Junio C Hamano [Thu, 5 Dec 2013 21:00:11 +0000 (13:00 -0800)] 
Merge branch 'sb/sha1-loose-object-info-check-existence'

"git cat-file --batch-check=ok" did not check the existence of the
named object.

* sb/sha1-loose-object-info-check-existence:
  sha1_loose_object_info(): do not return success on missing object

10 years agoMerge branch 'jk/two-way-merge-corner-case-fix'
Junio C Hamano [Thu, 5 Dec 2013 20:59:25 +0000 (12:59 -0800)] 
Merge branch 'jk/two-way-merge-corner-case-fix'

Fix a rather longstanding corner-case bug in twoway "reset to
there" merge, which is most often seen in "git am --abort".

* jk/two-way-merge-corner-case-fix:
  t1005: add test for "read-tree --reset -u A B"
  t1005: reindent
  unpack-trees: fix "read-tree -u --reset A B" with conflicted index

10 years agoMerge branch 'jc/ref-excludes'
Junio C Hamano [Thu, 5 Dec 2013 20:59:09 +0000 (12:59 -0800)] 
Merge branch 'jc/ref-excludes'

People often wished a way to tell "git log --branches" (and "git
log --remotes --not --branches") to exclude some local branches
from the expansion of "--branches" (similarly for "--tags", "--all"
and "--glob=<pattern>").  Now they have one.

* jc/ref-excludes:
  rev-parse: introduce --exclude=<glob> to tame wildcards
  rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API
  rev-list --exclude: tests
  document --exclude option
  revision: introduce --exclude=<glob> to tame wildcards

10 years agoMerge branch 'nv/parseopt-opt-arg'
Junio C Hamano [Thu, 5 Dec 2013 20:59:03 +0000 (12:59 -0800)] 
Merge branch 'nv/parseopt-opt-arg'

Enhance "rev-parse --parseopt" mode to help parsing options with
an optional parameter.

* nv/parseopt-opt-arg:
  rev-parse --parseopt: add the --stuck-long mode
  Use the word 'stuck' instead of 'sticked'

10 years agoMerge branch 'bc/http-100-continue'
Junio C Hamano [Thu, 5 Dec 2013 20:58:58 +0000 (12:58 -0800)] 
Merge branch 'bc/http-100-continue'

Issue "100 Continue" responses to help use of GSS-Negotiate
authentication scheme over HTTP transport when needed.

* bc/http-100-continue:
  remote-curl: fix large pushes with GSSAPI
  remote-curl: pass curl slot_results back through run_slot
  http: return curl's AUTHAVAIL via slot_results

10 years agoMerge branch 'jc/merge-base-reflog'
Junio C Hamano [Thu, 5 Dec 2013 20:58:27 +0000 (12:58 -0800)] 
Merge branch 'jc/merge-base-reflog'

Code the logic in "pull --rebase" that figures out a fork point
from reflog entries in C.

* jc/merge-base-reflog:
  merge-base: teach "--fork-point" mode
  merge-base: use OPT_CMDMODE and clarify the command line parsing

10 years agoMerge branch 'jk/replace-perl-in-built-scripts'
Junio C Hamano [Thu, 5 Dec 2013 20:58:21 +0000 (12:58 -0800)] 
Merge branch 'jk/replace-perl-in-built-scripts'

* jk/replace-perl-in-built-scripts:
  use @@PERL@@ in built scripts

10 years agoMerge branch 'jh/loose-object-dirs-creation-race'
Junio C Hamano [Thu, 5 Dec 2013 20:54:14 +0000 (12:54 -0800)] 
Merge branch 'jh/loose-object-dirs-creation-race'

When two processes created one loose object file each, which fell
into the same fan-out bucket that previously did not have any
objects, they both tried to do an equivalent of

    mkdir .git/objects/$fanout &&
    chmod $shared_perm .git/objects/$fanout

before writing into their file .git/objects/$fanout/$remainder,
one of which could have failed unnecessarily when the second
invocation of mkdir found that the directory already has been
created by the first one.

* jh/loose-object-dirs-creation-race:
  sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

10 years agoMerge branch 'jk/robustify-parse-commit'
Junio C Hamano [Thu, 5 Dec 2013 20:54:01 +0000 (12:54 -0800)] 
Merge branch 'jk/robustify-parse-commit'

* jk/robustify-parse-commit:
  checkout: do not die when leaving broken detached HEAD
  use parse_commit_or_die instead of custom message
  use parse_commit_or_die instead of segfaulting
  assume parse_commit checks for NULL commit
  assume parse_commit checks commit->object.parsed
  log_tree_diff: die when we fail to parse a commit

10 years agoMerge branch 'ak/submodule-foreach-quoting'
Junio C Hamano [Thu, 5 Dec 2013 20:53:17 +0000 (12:53 -0800)] 
Merge branch 'ak/submodule-foreach-quoting'

A behavior change, but a worthwhile one: "git submodule foreach"
was treating its arguments as part of a single command to be
concatenated and passed to a shell, making writing buggy
scripts too easy.

This patch preserves the old "just pass it to the shell" behavior
when a single argument is passed to 'git submodule foreach' and
moves to a new "skip the shell and use the arguments passed
unmolested" behavior when more than one argument is passed.

The old behavior (always concatenating and passing to the shell)
was similar to the 'ssh' command, while the new behavior (switching
on the number of arguments) is what 'xterm -e' does.

May need more thought to make sure this change is advertised well
so that scripts that used multiple arguments but added their own
extra layer of quoting are not broken.

* ak/submodule-foreach-quoting:
  submodule foreach: skip eval for more than one argument

10 years agot5000: simplify gzip prerequisite checks
Jeff King [Tue, 3 Dec 2013 13:21:40 +0000 (08:21 -0500)] 
t5000: simplify gzip prerequisite checks

In t5000, we test the built-in ".tar.gz" config for
git-archive. To make our tests portable, we check that we
have a way to both gzip and gunzip, and we respected
environment variables to point to alternate commands for
doing these operations.

However, the $GZIP variable did not actually do anything, as
changing it would not affect the baked-in value in
archive-tar.c. Moreover, setting the variable $GZIP
influences gzip itself. From the gzip man page:

  The environment variable GZIP can hold a set of default
  options for gzip. These options are interpreted first and
  can be overwritten by explicit command line parameters.

We could rename this variable, and use it to set up custom
config (or even have a Makefile knob to affect the built
binary), but it is not worth the trouble; nobody has ever
reported a problem with the baked-in default, and they can
always change it via config if they need to. Let's just drop
the variable and use "gzip" in the test (keeping the
prerequisite, of course).

While we're at it, we can drop the GUNZIP variable and
prerequisite; it uses "gzip -d", so if we have GZIP, we
will have both.

We can also use test_lazy_prereq for the gzip prerequisite,
which is simpler and behaves more consistently with the rest
of git (e.g., by making output available when the test is
run with "-v").

Noticed-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agostop installing git-tar-tree link
Jonathan Nieder [Mon, 2 Dec 2013 23:37:10 +0000 (15:37 -0800)] 
stop installing git-tar-tree link

When the built-in "git tar-tree" command (a thin wrapper around "git
archive") was removed in 925ceccf (tar-tree: remove deprecated
command, 2013-11-10), the build continued to install a non-functioning
git-tar-tree command in gitexecdir by mistake:

$ PATH=$(git --exec-path):$PATH
$ git-tar-tree -h
fatal: cannot handle tar-tree internally

The list of links in gitexecdir is populated from BUILTIN_OBJS, which
includes builtin/tar-tree.o to implement "git get-tar-commit-id".
Rename the get-tar-commit-id source file to builtin/get-tar-commit-id.c
to reflect its purpose and fix 'make install'.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoSync with 1.8.5.1
Junio C Hamano [Tue, 3 Dec 2013 19:42:03 +0000 (11:42 -0800)] 
Sync with 1.8.5.1

* maint:
  Git 1.8.5.1
  ref-iteration doc: add_submodule_odb() returns 0 for success

10 years agoMerge branch 'nd/glossary-content-pathspec-markup'
Junio C Hamano [Tue, 3 Dec 2013 19:41:52 +0000 (11:41 -0800)] 
Merge branch 'nd/glossary-content-pathspec-markup'

* nd/glossary-content-pathspec-markup:
  glossary-content.txt: fix documentation of "**" patterns

10 years agoMerge branch 'jj/doc-markup-gitcli'
Junio C Hamano [Tue, 3 Dec 2013 19:41:46 +0000 (11:41 -0800)] 
Merge branch 'jj/doc-markup-gitcli'

* jj/doc-markup-gitcli:
  Documentation/gitcli.txt: fix double quotes

10 years agoMerge branch 'jj/doc-markup-hints-in-coding-guidelines'
Junio C Hamano [Tue, 3 Dec 2013 19:41:43 +0000 (11:41 -0800)] 
Merge branch 'jj/doc-markup-hints-in-coding-guidelines'

* jj/doc-markup-hints-in-coding-guidelines:
  State correct usage of literal examples in man pages in the coding standards

10 years agoMerge branch 'jj/log-doc'
Junio C Hamano [Tue, 3 Dec 2013 19:41:40 +0000 (11:41 -0800)] 
Merge branch 'jj/log-doc'

Mark-up fixes.

* jj/log-doc:
  Documentation/git-log.txt: mark-up fix and minor rephasing
  Documentation/git-log: update "--log-size" description

10 years agoMerge branch 'jj/rev-list-options-doc'
Junio C Hamano [Tue, 3 Dec 2013 19:41:37 +0000 (11:41 -0800)] 
Merge branch 'jj/rev-list-options-doc'

Mark-up and grammo fixes.

* jj/rev-list-options-doc:
  Documentation/rev-list-options.txt: fix some grammatical issues and typos
  Documentation/rev-list-options.txt: fix mark-up

10 years agoMerge branch 'mi/typofixes'
Junio C Hamano [Tue, 3 Dec 2013 19:41:33 +0000 (11:41 -0800)] 
Merge branch 'mi/typofixes'

* mi/typofixes:
  contrib: typofixes
  Documentation/technical/http-protocol.txt: typofixes
  typofixes: fix misspelt comments

10 years agoMerge branch 'tb/doc-fetch-pack-url'
Junio C Hamano [Tue, 3 Dec 2013 19:41:31 +0000 (11:41 -0800)] 
Merge branch 'tb/doc-fetch-pack-url'

* tb/doc-fetch-pack-url:
  git-fetch-pack uses URLs like git-fetch

10 years agoGit 1.8.5.1 v1.8.5.1
Junio C Hamano [Tue, 3 Dec 2013 19:16:56 +0000 (11:16 -0800)] 
Git 1.8.5.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoref-iteration doc: add_submodule_odb() returns 0 for success
Nick Townsend [Mon, 25 Nov 2013 23:31:09 +0000 (15:31 -0800)] 
ref-iteration doc: add_submodule_odb() returns 0 for success

The usage sample of add_submodule_odb() function in the Submodules
section expects non-zero return value for success, but the function
actually reports success with zero.

Helped-by: René Scharfe <l.s.r@web.de>
Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Nick Townsend <nick.townsend@mac.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoSync with 1.8.4.5
Junio C Hamano [Mon, 2 Dec 2013 23:34:44 +0000 (15:34 -0800)] 
Sync with 1.8.4.5

10 years agoGit 1.8.4.5 v1.8.4.5
Junio C Hamano [Mon, 2 Dec 2013 23:33:30 +0000 (15:33 -0800)] 
Git 1.8.4.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agosubmodule: do not copy unknown update mode from .gitmodules
Junio C Hamano [Mon, 2 Dec 2013 21:31:55 +0000 (13:31 -0800)] 
submodule: do not copy unknown update mode from .gitmodules

When submodule.$name.update is given as hint from the upstream in
the .gitmodules file, we used to blindly copy it to .git/config,
unless there already is a value defined for the submodule.

However, there is no reason to expect that the update mode hinted by
the upstream is available in the version of Git the user is using,
and a really custom "!cmd" prepared by an upstream person running on
Linux may not even be available to a user on Windows.  It is simply
irresponsible to copy the setting blindly and to attempt to use it
during a later "submodule update" without validating it first.

Just show the suggested value to the diagnostic output, and set the
value to 'none' in the configuration, if it is not one of the ones
that are known to be supported by this version of Git.

Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agocommit-slab: sizeof() the right type in xrealloc
Thomas Rast [Sun, 1 Dec 2013 20:41:55 +0000 (21:41 +0100)] 
commit-slab: sizeof() the right type in xrealloc

When allocating the slab, the code accidentally computed the array
size from s->slab (an elemtype**).  The slab is an array of elemtype*,
however, so we should take the size of *s->slab.

Noticed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agogitk: Recognize -L option
Thomas Rast [Sat, 16 Nov 2013 17:37:44 +0000 (18:37 +0100)] 
gitk: Recognize -L option

This gives line-log support to gitk, by exploiting the new support for
processing and showing "inline" diffs straight from the git-log
output.

Note that we 'set allknown 0', which is a bit counterintuitive since
this is a "known" option.  But that flag prevents gitk from thinking
it can optimize the view by running rev-list to see the topology; in
the -L case that doesn't work.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Support showing the gathered inline diffs
Thomas Rast [Sat, 16 Nov 2013 17:37:43 +0000 (18:37 +0100)] 
gitk: Support showing the gathered inline diffs

The previous commit split the diffs into a separate field.  Now we
actually want to show them.

To that end we use the stored diff, and

- process it once to build a fake "tree diff", i.e., a list of all
  changed files;

- feed it through parseblobdiffline to actually format it into the
  $ctext field, like the existing diff machinery would.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Split out diff part in $commitinfo
Thomas Rast [Sat, 16 Nov 2013 17:37:42 +0000 (18:37 +0100)] 
gitk: Split out diff part in $commitinfo

So far we just parsed everything after the headers into the "comment"
bit of $commitinfo, including notes and -- if you gave weird options
-- the diff.

Split out the diff, if any, into a separate field.  It's easy to
recognize, since it always starts with /^diff/ and is preceded by an
empty line.

We take care to snip away said empty line.  The display code already
properly spaces the end of the message from the first diff, and
leaving another empty line at the end looks ugly.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Refactor per-line part of getblobdiffline and its support
Thomas Rast [Sat, 16 Nov 2013 17:37:41 +0000 (18:37 +0100)] 
gitk: Refactor per-line part of getblobdiffline and its support

For later use with data sources other than a pipe, refactor the big
worker part of getblobdiffline to a separate function
parseblobdiffline.  Also refactor its initialization and wrap-up to
separate routines.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agogitk: Support -G option from the command line
Thomas Rast [Sat, 16 Nov 2013 17:37:40 +0000 (18:37 +0100)] 
gitk: Support -G option from the command line

The -G option's usage is exactly analogous to that of -S, so
supporting it is easy.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
10 years agoDocumentation: revamp git-cherry(1)
Thomas Rast [Fri, 22 Nov 2013 16:29:16 +0000 (17:29 +0100)] 
Documentation: revamp git-cherry(1)

git-cherry(1)'s "description" section has never really managed
to explain to me what the command does.  It contains too much
explanation of the algorithm instead of simply saying what
goals it achieves, and too much terminology that we otherwise
do not use (fork-point instead of merge-base).

Try a much more concise approach: state what it finds out, why
this is neat, and how the output is formatted, in a few short
paragraphs.  In return, provide much longer examples of how it
fits into a "format-patch | am" based workflow, and how it
compares to reading the same from git-log.

Also carefully avoid using "merge" in a context where it does
not mean something that comes from git-merge(1).  Instead, say
"apply" in an attempt to further link to patch workflow
concepts.

While there, also omit the language about _which_ upstream
branch we treat as the default.  I literally just learned that
we support having several, so let's not confuse new users
here, especially considering that git-config(1) does not
document this.

Prompted-by: a.huemer@commend.com on #git
Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.8.5 v1.8.5
Junio C Hamano [Wed, 27 Nov 2013 20:14:45 +0000 (12:14 -0800)] 
Git 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoSync with maint
Junio C Hamano [Wed, 27 Nov 2013 20:13:29 +0000 (12:13 -0800)] 
Sync with maint

* maint:
  remote-hg: don't decode UTF-8 paths into Unicode objects

10 years agoremote-hg: don't decode UTF-8 paths into Unicode objects
Richard Hansen [Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)] 
remote-hg: don't decode UTF-8 paths into Unicode objects

The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects.  With this change, the test-hg.sh unit tests
pass again.

Signed-off-by: Richard Hansen <rhansen@bbn.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoSubmittingPatches: document how to handle multiple patches
René Scharfe [Wed, 27 Nov 2013 00:28:39 +0000 (01:28 +0100)] 
SubmittingPatches: document how to handle multiple patches

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agocommit-slab: declare functions "static inline"
Thomas Rast [Mon, 25 Nov 2013 20:04:08 +0000 (21:04 +0100)] 
commit-slab: declare functions "static inline"

This shuts up compiler warnings about unused functions.  No such
warnings are currently triggered, but if someone were to actually
use init_NAME_with_stride() as documented, they would get a warning
about init_NAME() being unused.

While there, write a comment about why the last real declaration of
the variable is without a terminating semicolon, while another
forward declarations have one.

Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agocommit-slab: document clear_$slabname()
Thomas Rast [Mon, 25 Nov 2013 19:02:00 +0000 (20:02 +0100)] 
commit-slab: document clear_$slabname()

The clear_$slabname() function was only documented by source code so
far.  Write something about it.

Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoremove #!interpreter line from shell libraries
Jonathan Nieder [Mon, 25 Nov 2013 21:03:52 +0000 (13:03 -0800)] 
remove #!interpreter line from shell libraries

In a shell snippet meant to be sourced by other shell scripts, an
opening #! line does more harm than good.

The harm:

 - When the shell library is sourced, the interpreter and options from
   the #! line are not used.  Specifying a particular shell can
   confuse the reader into thinking it is safe for the shell library
   to rely on idiosyncrasies of that shell.

 - Using #! instead of a plain comment drops a helpful visual clue
   that this is a shell library and not a self-contained script.

 - Tools such as lintian can use a #! line to tell when an
   installation script has failed by forgetting to set a script
   executable.  This check does not work if shell libraries also start
   with a #! line.

The good:

 - Text editors notice the #! line and use it for syntax highlighting
   if you try to edit the installed scripts (without ".sh" suffix) in
   place.

The use of the #! for file type detection is not needed because Git's
shell libraries are meant to be edited in source form (with ".sh"
suffix).  Replace the opening #! lines with comments.

This involves tweaking the test harness's valgrind support to find
shell libraries by looking for "# " in the first line instead of "#!"
(see v1.7.6-rc3~7, 2011-06-17).

Suggested by Russ Allbery through lintian.  Thanks to Jeff King and
Clemens Buchacher for further analysis.

Tested by searching for non-executable scripts with #! line:

find . -name .git -prune -o -type f -not -executable |
while read file
do
read line <"$file"
case $line in
'#!'*)
echo "$file"
;;
esac
done

The only remaining scripts found are templates for shell scripts
(unimplemented.sh, wrap-for-bin.sh) and sample input used in tests
(t/t4034/perl/{pre,post}).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agotest: replace shebangs with descriptions in shell libraries
Jonathan Nieder [Mon, 25 Nov 2013 21:03:06 +0000 (13:03 -0800)] 
test: replace shebangs with descriptions in shell libraries

A #! line in these files is misleading, since these scriptlets are
meant to be sourced with '.' (using whatever shell sources them)
instead of run directly using the interpreter named on the #! line.

Removing the #! line shouldn't hurt syntax highlighting since
these files have filenames ending with '.sh'.  For documentation,
add a brief description of how the files are meant to be used in
place of the shebang line.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agotest: make FILEMODE a lazy prereq
Jonathan Nieder [Mon, 25 Nov 2013 21:02:16 +0000 (13:02 -0800)] 
test: make FILEMODE a lazy prereq

This way, test authors don't need to remember to source
lib-prereq-FILEMODE.sh before using the FILEMODE prereq to guard tests
that rely on the executable bit being honored when checking out files.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agocontrib: remove git-p4import
Jonathan Nieder [Mon, 25 Nov 2013 20:58:48 +0000 (12:58 -0800)] 
contrib: remove git-p4import

The git p4import documentation has suggested git p4 as a better
alternative for more than 6 years.  (According to the mailing list
discussion when it was moved to contrib/, git-p4import has serious
bugs --- e.g., its incremental mode just doesn't work.) Since then,
git p4 has been actively developed and was promoted to a standard git
command alongside git svn.

Searches on google.com/trends and stackoverflow suggest that no one is
looking for git-p4import any more.  Remove it.

Noticed while considering marking the contrib/p4import/git-p4import.py
script executable as part of a wider sweep.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agomark contributed hooks executable
Jonathan Nieder [Mon, 25 Nov 2013 20:55:30 +0000 (12:55 -0800)] 
mark contributed hooks executable

The docs in contrib/hooks/pre-auto-gc-battery suggest:

For example, if the hook is stored in
/usr/share/git-core/contrib/hooks/pre-auto-gc-battery:

chmod a+x pre-auto-gc-battery
cd /path/to/your/repository.git
ln -sf /usr/share/git-core/contrib/hooks/pre-auto-gc-battery \
     hooks/pre-auto-gc

Unfortunately on multi-user systems most users do not have write
access to /usr.  Better to mark the sample hooks executable in
the first place so users do not have to tweak their permissions to
use them by symlinking into .git/hooks/.

Reported-by: Olivier Berger <olivier.berger@it-sudparis.eu>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agomark perl test scripts executable
Jonathan Nieder [Mon, 25 Nov 2013 20:53:54 +0000 (12:53 -0800)] 
mark perl test scripts executable

These scripts are not run directly as part of a normal build, so no
one noticed that they did not have the +x bit.  Mark them executable
to make it more obvious that they can be run directly (when debugging,
for example).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agomark Windows build scripts executable
Jonathan Nieder [Mon, 25 Nov 2013 20:52:44 +0000 (12:52 -0800)] 
mark Windows build scripts executable

On Windows the convention is to rely on filename extensions to decide
whether a file is executable so Windows users are probably not relying
on the executable bit of these scripts, but on other platforms it can
be useful documentation.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agosend-pack: don't send a thin pack to a server which doesn't support it
Carlos Martín Nieto [Sat, 23 Nov 2013 16:07:55 +0000 (17:07 +0100)] 
send-pack: don't send a thin pack to a server which doesn't support it

Up to now git has assumed that all servers are able to fix thin
packs. This is however not always the case.

Document the 'no-thin' capability and prevent send-pack from generating
a thin pack if the server advertises it.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'rh/remote-hg-bzr-updates' (early part)
Junio C Hamano [Mon, 25 Nov 2013 16:20:02 +0000 (08:20 -0800)] 
Merge branch 'rh/remote-hg-bzr-updates' (early part)

Unbreaks a recent breakage due to use of unquote-c-style.

This may need to be cherry-picked down to 1.8.4.x series.

* 'rh/remote-hg-bzr-updates' (early part):
  remote-hg: don't decode UTF-8 paths into Unicode objects

10 years agogit p4: Use git diff-tree instead of format-patch
Crestez Dan Leonard [Thu, 21 Nov 2013 15:19:03 +0000 (17:19 +0200)] 
git p4: Use git diff-tree instead of format-patch

The output of git format-patch can vary with user preferences. In
particular setting diff.noprefix will break the "git apply" that
is done as part of "git p4 submit".

Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Crestez Dan Leonard <cdleonard@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agodrop support for "experimental" loose objects
Jeff King [Thu, 21 Nov 2013 11:48:37 +0000 (06:48 -0500)] 
drop support for "experimental" loose objects

In git v1.4.3, we introduced a new loose object format that
encoded some object information outside of the zlib stream.
Ultimately the format was dropped in v1.5.3, but we kept the
reading side around to help people migrate objects. Each
time we open a loose object, we use a heuristic to check
whether it is in the normal loose format, or the
experimental one.

This heuristic is robust in the face of valid data, but it
tends to treat corrupted or garbage data as an experimental
object. With the regular format, we would notice quickly
that zlib's crc does not check out and complain. With the
experimental object, we are likely to extract a nonsensical
object size and try to allocate a huge buffer, resulting in
xmalloc calling "die".

This latter behavior is much worse, for two reasons. One,
git reports an allocation error when the real error is
corruption. And two, the program dies unconditionally, so
you cannot even run fsck (which would otherwise ignore the
broken object and keep going).

We could try to improve the heuristic to err on the side of
normal objects in the face of corruption, but there is
really little point. The experimental format is long-dead,
and was never enabled by default to begin with. We can
instead simply remove it. The only affected repository would
be one that explicitly set core.legacyheaders in 2007, and
then never repacked in the intervening 6 years.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoglossary-content.txt: fix documentation of "**" patterns
Nguyễn Thái Ngọc Duy [Thu, 21 Nov 2013 06:44:20 +0000 (13:44 +0700)] 
glossary-content.txt: fix documentation of "**" patterns

"**" means bold in ASCIIDOC, so we need to escape it. This is similar
to 8447dc8 (gitignore.txt: fix documentation of "**" patterns -
2013-11-07)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoDocumentation/gitcli.txt: fix double quotes
Jason St. John [Wed, 20 Nov 2013 01:34:40 +0000 (20:34 -0500)] 
Documentation/gitcli.txt: fix double quotes

Replace double quotes around literal examples with backticks

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agodiff: restrict pathspec limitations to diff b/f case only
Nguyễn Thái Ngọc Duy [Wed, 20 Nov 2013 01:26:41 +0000 (08:26 +0700)] 
diff: restrict pathspec limitations to diff b/f case only

builtin_diff_b_f() needs a path, not pathspec. Other modes in diff
can deal with pathspec just fine. But because of the current
GUARD_PATHSPEC() location, other modes also reject :(glob) and
:(icase).

Move GUARD_PATHSPEC(), and the "path" assignment statement, which is
the reason of this GUARD_PATHSPEC(), inside builtin_diff_b_f().

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoGit 1.8.5-rc3 v1.8.5-rc3
Junio C Hamano [Wed, 20 Nov 2013 19:18:25 +0000 (11:18 -0800)] 
Git 1.8.5-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoSync with 1.8.4.4
Junio C Hamano [Wed, 20 Nov 2013 19:26:59 +0000 (11:26 -0800)] 
Sync with 1.8.4.4

10 years agoGit 1.8.4.4 v1.8.4.4
Junio C Hamano [Wed, 20 Nov 2013 19:26:08 +0000 (11:26 -0800)] 
Git 1.8.4.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'mb/relnotes-1.8.5-fix'
Junio C Hamano [Wed, 20 Nov 2013 19:15:25 +0000 (11:15 -0800)] 
Merge branch 'mb/relnotes-1.8.5-fix'

* mb/relnotes-1.8.5-fix:
  RelNotes: spelling & grammar fixes

10 years agofor-each-ref: avoid color leakage
Ramkumar Ramachandra [Mon, 18 Nov 2013 17:39:13 +0000 (23:09 +0530)] 
for-each-ref: avoid color leakage

To make sure that an invocation like the following doesn't leak color,

  $ git for-each-ref --format='%(subject)%(color:green)'

auto-reset at the end of the format string when the last color token
seen in the format string isn't a color-reset.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agofor-each-ref: introduce %(color:...) for color
Ramkumar Ramachandra [Mon, 18 Nov 2013 17:39:12 +0000 (23:09 +0530)] 
for-each-ref: introduce %(color:...) for color

Enhance 'git for-each-ref' with color formatting options.  You can now
use the following format in for-each-ref:

  %(color:green)%(refname:short)%(color:reset)

where color names are described in color.branch.*.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agofor-each-ref: introduce %(upstream:track[short])
Ramkumar Ramachandra [Mon, 18 Nov 2013 17:39:11 +0000 (23:09 +0530)] 
for-each-ref: introduce %(upstream:track[short])

Introduce %(upstream:track) to display "[ahead M, behind N]" and
%(upstream:trackshort) to display "=", ">", "<", or "<>"
appropriately (inspired by contrib/completion/git-prompt.sh).

Now you can use the following format in for-each-ref:

  %(refname:short)%(upstream:trackshort)

to display refs with terse tracking information.

Note that :track and :trackshort only work with "upstream", and error
out when used with anything else.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoRelNotes: spelling & grammar fixes
Marc Branchaud [Thu, 14 Nov 2013 17:01:13 +0000 (12:01 -0500)] 
RelNotes: spelling & grammar fixes

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMerge branch 'nd/literal-pathspecs'
Junio C Hamano [Mon, 18 Nov 2013 22:31:29 +0000 (14:31 -0800)] 
Merge branch 'nd/literal-pathspecs'

Fixes a regression on 'master' since v1.8.4.

* nd/literal-pathspecs:
  pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

10 years agoMakefile: add PERLLIB_EXTRA variable that adds to default perl path
Jonathan Nieder [Fri, 15 Nov 2013 21:10:28 +0000 (13:10 -0800)] 
Makefile: add PERLLIB_EXTRA variable that adds to default perl path

Some platforms ship Perl modules used by git scripts outside the
default perl path (e.g., on Mac OS X, Subversion's perl bindings live
in a separate xcode perl path).  Add an PERLLIB_EXTRA variable to hold
a colon-separated list of extra directories to add to the perl path in
git's scripts, as a convenience for packagers.

Requested-by: Dave Borowitz <dborowitz@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agoMakefile: rebuild perl scripts when perl paths change
Jonathan Nieder [Mon, 18 Nov 2013 22:23:11 +0000 (14:23 -0800)] 
Makefile: rebuild perl scripts when perl paths change

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agofor-each-ref: introduce %(HEAD) asterisk marker
Ramkumar Ramachandra [Mon, 18 Nov 2013 17:39:10 +0000 (23:09 +0530)] 
for-each-ref: introduce %(HEAD) asterisk marker

'git branch' shows which branch you are currently on with an '*', but
'git for-each-ref' misses this feature.  So, extend its format with
%(HEAD) for the same effect.

Now you can use the following format in for-each-ref:

  %(HEAD) %(refname:short)

to display an asterisk next to the current ref.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 years agot6300 (for-each-ref): don't hardcode SHA-1 hexes
Ramkumar Ramachandra [Mon, 18 Nov 2013 17:39:09 +0000 (23:09 +0530)] 
t6300 (for-each-ref): don't hardcode SHA-1 hexes

Use rev-parse in its place, making it easier for future patches to
modify the test script.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>