git/git.git
7 years agoMakefile: Fix compilation of Windows resource file
Johannes Sixt [Thu, 23 Jan 2014 07:28:58 +0000 (08:28 +0100)]
Makefile: Fix compilation of Windows resource file

If the git version number consists of less than three period
separated numbers, then the Windows resource file compilation
issues a syntax error:

  $ touch git.rc
  $ make V=1 git.res
  GIT_VERSION = 1.9.rc0
  windres -O coff \
            -DMAJOR=1 -DMINOR=9 -DPATCH=rc0 \
            -DGIT_VERSION="\\\"1.9.rc0\\\"" git.rc -o git.res
  C:\msysgit\msysgit\mingw\bin\windres.exe: git.rc:2: syntax error
  make: *** [git.res] Error 1
  $

Note that -DPATCH=rc0.

The values passed via -DMAJOR=, -DMINOR=, and -DPATCH= are used in
FILEVERSION and PRODUCTVERSION statements, which expect up to four numeric
values. These version numbers are intended for machine consumption. They
are typically inspected by installers to decide whether a file to be
installed is newer than one that exists on the system, but are not used
for much else.

We can be pretty certain that there are no tools that look at these
version numbers, not even the installer of Git for Windows does.
Therefore, to fix the syntax error, fill in only the first two numbers,
which we are guaranteed to find in Git version numbers.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge git://git.bogomips.org/git-svn
Junio C Hamano [Thu, 23 Jan 2014 16:51:14 +0000 (08:51 -0800)]
Merge git://git.bogomips.org/git-svn

* 'master' of git://git.bogomips.org/git-svn:
  git-svn: memoize _rev_list and rebuild

7 years agoMerge git://ozlabs.org/~paulus/gitk
Junio C Hamano [Thu, 23 Jan 2014 16:50:50 +0000 (08:50 -0800)]
Merge git://ozlabs.org/~paulus/gitk

* 'master' of git://ozlabs.org/~paulus/gitk:
  gitk: Indent word-wrapped lines in commit display header
  gitk: Comply with XDG base directory specification
  gitk: Replace "next" and "prev" buttons with down and up arrows
  gitk: chmod +x po2msg.sh
  gitk: Update copyright dates
  gitk: Add Bulgarian translation (304t)
  gitk: Fix mistype

7 years agogitk: Indent word-wrapped lines in commit display header
Paul Mackerras [Thu, 23 Jan 2014 11:06:22 +0000 (22:06 +1100)]
gitk: Indent word-wrapped lines in commit display header

In the cases where the lines starting with Precedes:, Follows: and
Branches: in the commit display are long enough to be word-wrapped,
this adds a 1cm margin on the left of the wrapped lines, to make
the display more readable.  Suggested by Stephen Rothwell.

Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agogit-svn: memoize _rev_list and rebuild
lin zuojian [Thu, 23 Jan 2014 02:15:19 +0000 (10:15 +0800)]
git-svn: memoize _rev_list and rebuild

According to profile data, _rev_list and rebuild consume a large
portion of time.  Memoize the results of _rev_list and memoize
rebuild internals to avoid subprocess invocation.

When importing 15152 revisions on a LAN, time improved from 10
hours to 3-4 hours.

Signed-off-by: lin zuojian <manjian2006@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
7 years agoAdd cross-references between docs for for-each-ref and show-ref
Michael Haggerty [Wed, 22 Jan 2014 11:23:20 +0000 (12:23 +0100)]
Add cross-references between docs for for-each-ref and show-ref

Add cross-references between the manpages for git-for-each-ref(1) and
git-show-ref(1).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogitk: Comply with XDG base directory specification
Astril Hayato [Tue, 21 Jan 2014 19:10:16 +0000 (19:10 +0000)]
gitk: Comply with XDG base directory specification

Write the gitk config data to $XDG_CONFIG_HOME/git/gitk ($HOME/.config/git/gitk
by default) in line with the XDG specification. This makes it consistent with
git which also follows the spec.

If $HOME/.gitk already exists use that for backward compatibility, so only new
installations are affected.

Signed-off-by: Astril Hayato <astrilhayato@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agoMerge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui
Junio C Hamano [Tue, 21 Jan 2014 21:16:17 +0000 (13:16 -0800)]
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui

git-gui 0.19.0

* tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui:
  git-gui 0.19
  git-gui: chmod +x po2msg, windows/git-gui.sh
  git-gui: fallback right pane to packed widgets with Tk 8.4
  git-gui i18n: Added Bulgarian translation
  git-gui l10n: Add 29 more terms to glossary
  git-gui i18n: Initial glossary in Bulgarian

7 years agogitk: Replace "next" and "prev" buttons with down and up arrows
Marc Branchaud [Wed, 18 Dec 2013 16:04:13 +0000 (11:04 -0500)]
gitk: Replace "next" and "prev" buttons with down and up arrows

Users often find that "next" and "prev" do the opposite of what they
expect.  For example, "next" moves to the next match down the list, but
that is almost always backwards in time.  Replacing the text with arrows
makes it clear where the buttons will take the user.

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agogitk: chmod +x po2msg.sh
Jonathan Nieder [Mon, 25 Nov 2013 21:00:10 +0000 (13:00 -0800)]
gitk: chmod +x po2msg.sh

The Makefile only runs it using tclsh, but because the fallback po2msg
script has the usual tcl preamble starting with #!/bin/sh it can also
be run directly.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agogitk: Update copyright dates
Paul Mackerras [Tue, 21 Jan 2014 11:02:27 +0000 (22:02 +1100)]
gitk: Update copyright dates

Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agogitk: Add Bulgarian translation (304t)
Alexander Shopov [Wed, 15 Jan 2014 11:27:29 +0000 (13:27 +0200)]
gitk: Add Bulgarian translation (304t)

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agogitk: Fix mistype
Max Kirillov [Sat, 18 Jan 2014 12:58:51 +0000 (14:58 +0200)]
gitk: Fix mistype

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
7 years agogit-gui 0.19 gitgui-0.19.0
Pat Thoyts [Sat, 18 Jan 2014 17:29:34 +0000 (17:29 +0000)]
git-gui 0.19

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
7 years agogit-gui: chmod +x po2msg, windows/git-gui.sh
Jonathan Nieder [Mon, 25 Nov 2013 21:01:05 +0000 (13:01 -0800)]
git-gui: chmod +x po2msg, windows/git-gui.sh

The Makefile only runs po/po2msg.sh using tclsh, but because the
script has the usual tcl preamble starting with #!/bin/sh it can also
be run directly.

The Windows git-gui wrapper is usable in-place for the same reason.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
7 years agogit-gui: fallback right pane to packed widgets with Tk 8.4
Max Kirillov [Tue, 14 Jan 2014 23:58:09 +0000 (01:58 +0200)]
git-gui: fallback right pane to packed widgets with Tk 8.4

Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that
tk < 8.5 does not support -stretch option for panedwindow.

Without the option it's not possible to properly expand the right half -
the commit area is expanded, while desired behavior is to expand the diff
area. So the whole feature should be disabled with Tk
version less than 8.5.

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
7 years agogit-gui i18n: Added Bulgarian translation
Alexander Shopov [Wed, 15 Jan 2014 11:07:56 +0000 (13:07 +0200)]
git-gui i18n: Added Bulgarian translation

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
7 years agogit-gui l10n: Add 29 more terms to glossary
Alexander Shopov [Wed, 15 Jan 2014 11:07:57 +0000 (13:07 +0200)]
git-gui l10n: Add 29 more terms to glossary

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
7 years agogit-gui i18n: Initial glossary in Bulgarian
Alexander Shopov [Wed, 15 Jan 2014 11:07:55 +0000 (13:07 +0200)]
git-gui i18n: Initial glossary in Bulgarian

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
7 years agoGit 1.9-rc0 v1.9-rc0
Junio C Hamano [Fri, 17 Jan 2014 20:30:14 +0000 (12:30 -0800)]
Git 1.9-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'maint'
Junio C Hamano [Fri, 17 Jan 2014 20:21:39 +0000 (12:21 -0800)]
Merge branch 'maint'

* maint:
  git-svn: workaround for a bug in svn serf backend

7 years agoMerge branch 'fp/submodule-checkout-mode'
Junio C Hamano [Fri, 17 Jan 2014 20:21:20 +0000 (12:21 -0800)]
Merge branch 'fp/submodule-checkout-mode'

"submodule.*.update=checkout", when propagated from .gitmodules to
.git/config, turned into a "submodule.*.update=none", which did not
make much sense.

* fp/submodule-checkout-mode:
  git-submodule.sh: 'checkout' is a valid update mode

7 years agoMerge branch 'nd/shallow-clone'
Junio C Hamano [Fri, 17 Jan 2014 20:21:14 +0000 (12:21 -0800)]
Merge branch 'nd/shallow-clone'

Fetching from a shallow-cloned repository used to be forbidden,
primarily because the codepaths involved were not carefully vetted
and we did not bother supporting such usage. This attempts to allow
object transfer out of a shallow-cloned repository in a controlled
way (i.e. the receiver become a shallow repository with truncated
history).

* nd/shallow-clone: (31 commits)
  t5537: fix incorrect expectation in test case 10
  shallow: remove unused code
  send-pack.c: mark a file-local function static
  git-clone.txt: remove shallow clone limitations
  prune: clean .git/shallow after pruning objects
  clone: use git protocol for cloning shallow repo locally
  send-pack: support pushing from a shallow clone via http
  receive-pack: support pushing to a shallow clone via http
  smart-http: support shallow fetch/clone
  remote-curl: pass ref SHA-1 to fetch-pack as well
  send-pack: support pushing to a shallow clone
  receive-pack: allow pushes that update .git/shallow
  connected.c: add new variant that runs with --shallow-file
  add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses
  receive/send-pack: support pushing from a shallow clone
  receive-pack: reorder some code in unpack()
  fetch: add --update-shallow to accept refs that update .git/shallow
  upload-pack: make sure deepening preserves shallow roots
  fetch: support fetching from a shallow repository
  clone: support remote shallow repository
  ...

7 years agoMerge branch 'jk/pull-rebase-using-fork-point'
Junio C Hamano [Fri, 17 Jan 2014 20:04:29 +0000 (12:04 -0800)]
Merge branch 'jk/pull-rebase-using-fork-point'

Finishing touches so that an expected error message will not leak to
the UI.

* jk/pull-rebase-using-fork-point:
  pull: suppress error when no remoteref is found

7 years agopull: suppress error when no remoteref is found
John Keeping [Fri, 17 Jan 2014 20:00:20 +0000 (20:00 +0000)]
pull: suppress error when no remoteref is found

Commit 48059e4 (pull: use merge-base --fork-point when appropriate,
2013-12-08) incorrectly assumes that get_remote_merge_branch will either
yield a non-empty string or return an error, but there are circumstances
where it will yield an empty string.

The previous code then invoked git-rev-list with no arguments, which
results in an error suppressed by redirecting stderr to /dev/null.  Now
we invoke git-merge-base with an empty branch name, which also results
in an error.  Suppress this in the same way.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogit-svn: workaround for a bug in svn serf backend
Roman Kagan [Fri, 27 Dec 2013 08:05:15 +0000 (12:05 +0400)]
git-svn: workaround for a bug in svn serf backend

Subversion serf backend in versions 1.8.5 and below has a bug(*) that the
function creating the descriptor of a file change -- add_file() --
doesn't make a copy of its third argument when storing it on the
returned descriptor.  As a result, by the time this field is used (in
transactions of file copying or renaming) it may well be released, and
the memory reused.

One of its possible manifestations is the svn assertion triggering on an
invalid path, with a message

svn_fspath__skip_ancestor: Assertion
`svn_fspath__is_canonical(child_fspath)' failed.

This patch works around this bug, by storing the value to be passed as
the third argument to add_file() in a local variable with the same scope
as the file change descriptor, making sure their lifetime is the same.

* [ew: fixed in Subversion r1553376 as noted by Jonathan Nieder]

Cc: Benjamin Pabst <benjamin.pabst85@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Roman Kagan <rkagan@mail.ru>
7 years agoSync with 1.8.5.3
Junio C Hamano [Mon, 13 Jan 2014 19:39:38 +0000 (11:39 -0800)]
Sync with 1.8.5.3

* maint:
  Git 1.8.5.3
  pack-heuristics.txt: mark up the file header properly

7 years agoUpdate draft release notes to 1.9
Junio C Hamano [Mon, 13 Jan 2014 19:39:09 +0000 (11:39 -0800)]
Update draft release notes to 1.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'jk/t5531-prepare-to-default-to-non-matching'
Junio C Hamano [Mon, 13 Jan 2014 19:35:10 +0000 (11:35 -0800)]
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'

* jk/t5531-prepare-to-default-to-non-matching:
  t5531: further "matching" fixups

7 years agoMerge branch 'sb/diff-orderfile-config'
Junio C Hamano [Mon, 13 Jan 2014 19:34:11 +0000 (11:34 -0800)]
Merge branch 'sb/diff-orderfile-config'

Finishing touches to avoid casting unnecessary detail in stone.

* sb/diff-orderfile-config:
  diff test: reading a directory as a file need not error out

7 years agoMerge branch 'mh/shorten-unambigous-ref'
Junio C Hamano [Mon, 13 Jan 2014 19:34:08 +0000 (11:34 -0800)]
Merge branch 'mh/shorten-unambigous-ref'

* mh/shorten-unambigous-ref:
  shorten_unambiguous_ref(): tighten up pointer arithmetic
  gen_scanf_fmt(): delete function and use snprintf() instead
  shorten_unambiguous_ref(): introduce a new local variable

7 years agoMerge branch 'mm/mv-file-to-no-such-dir-with-slash'
Junio C Hamano [Mon, 13 Jan 2014 19:33:51 +0000 (11:33 -0800)]
Merge branch 'mm/mv-file-to-no-such-dir-with-slash'

Finishing touches to do the same on windows.

* mm/mv-file-to-no-such-dir-with-slash:
  mv: let 'git mv file no-such-dir/' error out on Windows, too

7 years agoMerge branch 'jl/submodule-mv-checkout-caveat'
Junio C Hamano [Mon, 13 Jan 2014 19:33:47 +0000 (11:33 -0800)]
Merge branch 'jl/submodule-mv-checkout-caveat'

With a submodule that was initialized in an old fashioned way
without gitlinks, switching branches in the superproject between
the one with and without the submodule may leave the submodule
working tree with its embedded repository behind, as there may be
unexpendable state there. Document and warn users about this.

* jl/submodule-mv-checkout-caveat:
  rm: better document side effects when removing a submodule
  mv: better document side effects when moving a submodule

7 years agoMerge branch 'jk/pull-rebase-using-fork-point'
Junio C Hamano [Mon, 13 Jan 2014 19:33:39 +0000 (11:33 -0800)]
Merge branch 'jk/pull-rebase-using-fork-point'

Finishing touches.

* jk/pull-rebase-using-fork-point:
  rebase: fix fork-point with zero arguments

7 years agoMerge branch 'rr/completion-format-coverletter'
Junio C Hamano [Mon, 13 Jan 2014 19:33:38 +0000 (11:33 -0800)]
Merge branch 'rr/completion-format-coverletter'

The bash/zsh completion code did not know about format.coverLetter
among many format.* configuration variables.

* rr/completion-format-coverletter:
  completion: complete format.coverLetter

7 years agoMerge branch 'ow/stash-with-ifs'
Junio C Hamano [Mon, 13 Jan 2014 19:33:36 +0000 (11:33 -0800)]
Merge branch 'ow/stash-with-ifs'

The implementation of 'git stash $cmd "stash@{...}"' did not quote
the stash argument properly and left it split at IFS whitespace.

* ow/stash-with-ifs:
  stash: handle specifying stashes with $IFS

7 years agoMerge branch 'jn/pager-lv-default-env'
Junio C Hamano [Mon, 13 Jan 2014 19:33:34 +0000 (11:33 -0800)]
Merge branch 'jn/pager-lv-default-env'

Just like we give a reasonable default for "less" via the LESS
environment variable, specify a reasonable default for "lv" via the
"LV" environment variable when spawning the pager.

* jn/pager-lv-default-env:
  pager: set LV=-c alongside LESS=FRSX

7 years agoMerge branch 'br/sha1-name-40-hex-no-disambiguation'
Junio C Hamano [Mon, 13 Jan 2014 19:33:29 +0000 (11:33 -0800)]
Merge branch 'br/sha1-name-40-hex-no-disambiguation'

When parsing a 40-hex string into the object name, the string is
checked to see if it can be interpreted as a ref so that a warning
can be given for ambiguity. The code kicked in even when the
core.warnambiguousrefs is set to false to squelch this warning, in
which case the cycles spent to look at the ref namespace were an
expensive no-op, as the result was discarded without being used.

* br/sha1-name-40-hex-no-disambiguation:
  sha1_name: don't resolve refs when core.warnambiguousrefs is false

7 years agoGit 1.8.5.3 v1.8.5.3
Junio C Hamano [Mon, 13 Jan 2014 19:28:26 +0000 (11:28 -0800)]
Git 1.8.5.3

7 years agoMerge branch 'nd/daemon-informative-errors-typofix' into maint
Junio C Hamano [Mon, 13 Jan 2014 19:23:07 +0000 (11:23 -0800)]
Merge branch 'nd/daemon-informative-errors-typofix' into maint

The "--[no-]informative-errors" options to "git daemon" were parsed
a bit too loosely, allowing any other string after these option
names.

* nd/daemon-informative-errors-typofix:
  daemon: be strict at parsing parameters --[no-]informative-errors

7 years agoMerge branch 'km/gc-eperm' into maint
Junio C Hamano [Mon, 13 Jan 2014 19:23:04 +0000 (11:23 -0800)]
Merge branch 'km/gc-eperm' into maint

A "gc" process running as a different user should be able to stop a
new "gc" process from starting.

* km/gc-eperm:
  gc: notice gc processes run by other users

7 years agoMerge branch 'jk/credential-plug-leak' into maint
Junio C Hamano [Mon, 13 Jan 2014 19:23:01 +0000 (11:23 -0800)]
Merge branch 'jk/credential-plug-leak' into maint

An earlier "clean-up" introduced an unnecessary memory leak.

* jk/credential-plug-leak:
  Revert "prompt: clean up strbuf usage"

7 years agoMerge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint
Junio C Hamano [Mon, 13 Jan 2014 19:22:48 +0000 (11:22 -0800)]
Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint

"git mv A B/", when B does not exist as a directory, should error
out, but it didn't.

* mm/mv-file-to-no-such-dir-with-slash:
  mv: let 'git mv file no-such-dir/' error out on Windows, too
  mv: let 'git mv file no-such-dir/' error out

7 years agoMerge branch 'jk/rev-parse-double-dashes' into maint
Junio C Hamano [Mon, 13 Jan 2014 19:22:38 +0000 (11:22 -0800)]
Merge branch 'jk/rev-parse-double-dashes' into maint

"git rev-parse <revs> -- <paths>" did not implement the usual
disambiguation rules the commands in the "git log" family used in
the same way.

* jk/rev-parse-double-dashes:
  rev-parse: be more careful with munging arguments
  rev-parse: correctly diagnose revision errors before "--"

7 years agoMerge branch 'jk/cat-file-regression-fix' into maint
Junio C Hamano [Mon, 13 Jan 2014 19:22:21 +0000 (11:22 -0800)]
Merge branch 'jk/cat-file-regression-fix' into maint

"git cat-file --batch=", an admittedly useless command, did not
behave very well.

* jk/cat-file-regression-fix:
  cat-file: handle --batch format with missing type/size
  cat-file: pass expand_data to print_object_or_die

7 years agopack-heuristics.txt: mark up the file header properly
Thomas Ackermann [Sat, 11 Jan 2014 16:28:25 +0000 (17:28 +0100)]
pack-heuristics.txt: mark up the file header properly

AsciiDoc wants these header-lines left-aligned.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agot5531: further "matching" fixups
Jeff King [Wed, 8 Jan 2014 10:47:56 +0000 (05:47 -0500)]
t5531: further "matching" fixups

Commit 43eb920 switched one of the sub-repository in this
test to matching to prepare for a world where the default
becomes "simple". However, the main repository needs a
similar change.

We did not notice any test failure when merged with b2ed944
(push: switch default from "matching" to "simple", 2013-01-04)
because t5531.6 is trying to provoke a failure of "git push"
due to a submodule check. When combined with b2ed944 the
push still fails, but for the wrong reason (because our
upstream setup does not exist, not because of the submodule).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff test: reading a directory as a file need not error out
Jonathan Nieder [Fri, 10 Jan 2014 20:10:31 +0000 (12:10 -0800)]
diff test: reading a directory as a file need not error out

There is no guarantee that strbuf_read_file must error out for
directories.  On some operating systems (e.g., Debian GNU/kFreeBSD
wheezy), reading a directory gives its raw content:

$ head -c5 < / | cat -A
^AM-|^_^@^L$

As a result, 'git diff -O/' succeeds instead of erroring out on
these systems, causing t4056.5 "orderfile is a directory" to fail.

On some weird OS it might even make sense to pass a directory to the
-O option and this is not a common user mistake that needs catching.
Remove the test.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agomv: let 'git mv file no-such-dir/' error out on Windows, too
Johannes Sixt [Wed, 8 Jan 2014 16:33:44 +0000 (17:33 +0100)]
mv: let 'git mv file no-such-dir/' error out on Windows, too

The previous commit c57f628 (mv: let 'git mv file no-such-dir/' error out)
relies on that rename("file", "no-such-dir/") fails if the directory does not
exist (note the trailing slash).  This does not work as expected on Windows:
This rename() call does not fail, but renames "file" to "no-such-dir" (not to
"no-such-dir/file"). Insert an explicit check for this case to force an error.

This changes the error message from

   $ git mv file no-such-dir/
   fatal: renaming 'file' failed: Not a directory

to

   $ git mv file no-such-dir/
   fatal: destination directory does not exist, source=file, destination=no-such-dir/

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoUpdate draft release notes to 1.9
Junio C Hamano [Fri, 10 Jan 2014 19:25:01 +0000 (11:25 -0800)]
Update draft release notes to 1.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'ss/builtin-cleanup'
Junio C Hamano [Fri, 10 Jan 2014 18:33:47 +0000 (10:33 -0800)]
Merge branch 'ss/builtin-cleanup'

"git help $cmd" unnecessarily enumerated potential command names
from the filesystem, even when $cmd is known to be a built-in.

Ideas for further optimization, primarily by killing the use of
is_in_cmdlist(), were suggested in the discussion, but they can
come as follow-ups on top of this series.

* ss/builtin-cleanup:
  builtin/help.c: speed up is_git_command() by checking for builtin commands first
  builtin/help.c: call load_command_list() only when it is needed
  git.c: consistently use the term "builtin" instead of "internal command"

7 years agoMerge branch 'vm/octopus-merge-bases-simplify'
Junio C Hamano [Fri, 10 Jan 2014 18:33:45 +0000 (10:33 -0800)]
Merge branch 'vm/octopus-merge-bases-simplify'

* vm/octopus-merge-bases-simplify:
  get_octopus_merge_bases(): cleanup redundant variable

7 years agoMerge branch 'ta/format-user-manual-as-an-article'
Junio C Hamano [Fri, 10 Jan 2014 18:33:43 +0000 (10:33 -0800)]
Merge branch 'ta/format-user-manual-as-an-article'

Update the way the user-manual is formatted via AsciiDoc to save
trees.

* ta/format-user-manual-as-an-article:
  user-manual: improve html and pdf formatting

7 years agoMerge branch 'rr/completion-branch-config'
Junio C Hamano [Fri, 10 Jan 2014 18:33:39 +0000 (10:33 -0800)]
Merge branch 'rr/completion-branch-config'

Two-level configuration variable names in "branch.*" and "remote.*"
hierarchies whose variables are predominantly three-level where not
completed by hitting a <TAB> in bash and zsh completions.

* rr/completion-branch-config:
  completion: fix remote.pushdefault
  completion: fix branch.autosetup(merge|rebase)
  completion: introduce __gitcomp_nl_append ()
  zsh completion: find matching custom bash completion

7 years agoMerge branch 'js/lift-parent-count-limit'
Junio C Hamano [Fri, 10 Jan 2014 18:33:36 +0000 (10:33 -0800)]
Merge branch 'js/lift-parent-count-limit'

There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism.

* js/lift-parent-count-limit:
  Remove the line length limit for graft files

7 years agoMerge branch 'jk/test-framework-updates'
Junio C Hamano [Fri, 10 Jan 2014 18:33:34 +0000 (10:33 -0800)]
Merge branch 'jk/test-framework-updates'

The basic test used to leave unnecessary trash directories in the
t/ directory.

* jk/test-framework-updates:
  t0000: drop "known breakage" test
  t0000: simplify HARNESS_ACTIVE hack
  t0000: set TEST_OUTPUT_DIRECTORY for sub-tests

7 years agoMerge branch 'bm/merge-base-octopus-dedup'
Junio C Hamano [Fri, 10 Jan 2014 18:33:32 +0000 (10:33 -0800)]
Merge branch 'bm/merge-base-octopus-dedup'

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
  merge-base --octopus: reduce the result from get_octopus_merge_bases()
  merge-base: separate "--independent" codepath into its own helper

7 years agoMerge branch 'km/gc-eperm'
Junio C Hamano [Fri, 10 Jan 2014 18:33:30 +0000 (10:33 -0800)]
Merge branch 'km/gc-eperm'

A "gc" process running as a different user should be able to stop a
new "gc" process from starting.

* km/gc-eperm:
  gc: notice gc processes run by other users

7 years agoMerge branch 'jk/http-auth-tests-robustify'
Junio C Hamano [Fri, 10 Jan 2014 18:33:18 +0000 (10:33 -0800)]
Merge branch 'jk/http-auth-tests-robustify'

Using the same username and password during the tests would not
catch a potential breakage of sending one when we should be sending
the other.

* jk/http-auth-tests-robustify:
  use distinct username/password for http auth tests

7 years agoMerge branch 'jk/credential-plug-leak'
Junio C Hamano [Fri, 10 Jan 2014 18:33:16 +0000 (10:33 -0800)]
Merge branch 'jk/credential-plug-leak'

An earlier "clean-up" introduced an unnecessary memory leak.

* jk/credential-plug-leak:
  Revert "prompt: clean up strbuf usage"

7 years agoMerge branch 'bs/mirbsd'
Junio C Hamano [Fri, 10 Jan 2014 18:33:14 +0000 (10:33 -0800)]
Merge branch 'bs/mirbsd'

* bs/mirbsd:
  Add MirBSD support to the build system.

7 years agoMerge branch 'nd/commit-tree-constness'
Junio C Hamano [Fri, 10 Jan 2014 18:33:13 +0000 (10:33 -0800)]
Merge branch 'nd/commit-tree-constness'

Code clean-up.

* nd/commit-tree-constness:
  commit.c: make "tree" a const pointer in commit_tree*()

7 years agoMerge branch 'jk/oi-delta-base'
Junio C Hamano [Fri, 10 Jan 2014 18:33:11 +0000 (10:33 -0800)]
Merge branch 'jk/oi-delta-base'

Teach "cat-file --batch" to show delta-base object name for a
packed object that is represented as a delta.

* jk/oi-delta-base:
  cat-file: provide %(deltabase) batch format
  sha1_object_info_extended: provide delta base sha1s

7 years agoMerge branch 'jk/sha1write-void'
Junio C Hamano [Fri, 10 Jan 2014 18:33:09 +0000 (10:33 -0800)]
Merge branch 'jk/sha1write-void'

Code clean-up.

* jk/sha1write-void:
  do not pretend sha1write returns errors

7 years agoMerge branch 'nd/add-empty-fix'
Junio C Hamano [Fri, 10 Jan 2014 18:33:03 +0000 (10:33 -0800)]
Merge branch 'nd/add-empty-fix'

"git add -A" (no other arguments) in a totally empty working tree
used to emit an error.

* nd/add-empty-fix:
  add: don't complain when adding empty project root

7 years agoMerge branch 'nd/daemon-informative-errors-typofix'
Junio C Hamano [Fri, 10 Jan 2014 18:32:59 +0000 (10:32 -0800)]
Merge branch 'nd/daemon-informative-errors-typofix'

* nd/daemon-informative-errors-typofix:
  daemon: be strict at parsing parameters --[no-]informative-errors

7 years agoMerge branch 'tm/fetch-prune'
Junio C Hamano [Fri, 10 Jan 2014 18:32:50 +0000 (10:32 -0800)]
Merge branch 'tm/fetch-prune'

Fetching 'frotz' branch with "git fetch", while having
'frotz/nitfol' remote-tracking branch from an earlier fetch, would
error out, primarily because the command has not been told to
remove anything on our side. In such a case, "git fetch --prune"
can be used to remove 'frotz/nitfol' to make room to fetch and
store 'frotz' remote-tracking branch.

* tm/fetch-prune:
  fetch --prune: Run prune before fetching
  fetch --prune: always print header url

7 years agoMerge branch 'sb/diff-orderfile-config'
Junio C Hamano [Fri, 10 Jan 2014 18:32:42 +0000 (10:32 -0800)]
Merge branch 'sb/diff-orderfile-config'

Allow "git diff -O<file>" to be configured with a new configuration
variable.

* sb/diff-orderfile-config:
  diff: add diff.orderfile configuration variable
  diff: let "git diff -O" read orderfile from any file and fail properly
  t4056: add new tests for "git diff -O"

7 years agoMerge branch 'bc/log-decoration'
Junio C Hamano [Fri, 10 Jan 2014 18:32:39 +0000 (10:32 -0800)]
Merge branch 'bc/log-decoration'

"git log --decorate" did not handle a tag pointed by another tag
nicely.

* bc/log-decoration:
  log: properly handle decorations with chained tags

7 years agoMerge branch 'jh/rlimit-nofile-fallback'
Junio C Hamano [Fri, 10 Jan 2014 18:32:28 +0000 (10:32 -0800)]
Merge branch 'jh/rlimit-nofile-fallback'

When we figure out how many file descriptors to allocate for
keeping packfiles open, a system with non-working getrlimit() could
cause us to die(), but because we make this call only to get a
rough estimate of how many is available and we do not even attempt
to use up all file descriptors available ourselves, it is nicer to
fall back to a reasonable low value rather than dying.

* jh/rlimit-nofile-fallback:
  get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure

7 years agoMerge branch 'rt/bfg-ad-in-filter-branch-doc'
Junio C Hamano [Fri, 10 Jan 2014 18:32:25 +0000 (10:32 -0800)]
Merge branch 'rt/bfg-ad-in-filter-branch-doc'

* rt/bfg-ad-in-filter-branch-doc:
  docs: add filter-branch notes on The BFG

7 years agoMerge branch 'mh/path-max'
Junio C Hamano [Fri, 10 Jan 2014 18:32:21 +0000 (10:32 -0800)]
Merge branch 'mh/path-max'

A few places where we relied on a fixed length buffer to hold
pathnames in these two programs have been converted to use strbuf.

* mh/path-max:
  builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX
  prune-packed: use strbuf to avoid having to worry about PATH_MAX

7 years agoMerge branch 'ap/path-max'
Junio C Hamano [Fri, 10 Jan 2014 18:32:18 +0000 (10:32 -0800)]
Merge branch 'ap/path-max'

* ap/path-max:
  Prevent buffer overflows when path is too long

7 years agoMerge branch 'cc/replace-object-info'
Junio C Hamano [Fri, 10 Jan 2014 18:32:10 +0000 (10:32 -0800)]
Merge branch 'cc/replace-object-info'

read_sha1_file() that is the workhorse to read the contents given
an object name honoured object replacements, but there is no
corresponding mechanism to sha1_object_info() that is used to
obtain the metainfo (e.g. type & size) about the object, leading
callers to weird inconsistencies.

* cc/replace-object-info:
  replace info: rename 'full' to 'long' and clarify in-code symbols
  Documentation/git-replace: describe --format option
  builtin/replace: unset read_replace_refs
  t6050: add tests for listing with --format
  builtin/replace: teach listing using short, medium or full formats
  sha1_file: perform object replacement in sha1_object_info_extended()
  t6050: show that git cat-file --batch fails with replace objects
  sha1_object_info_extended(): add an "unsigned flags" parameter
  sha1_file.c: add lookup_replace_object_extended() to pass flags
  replace_object: don't check read_replace_refs twice
  rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT

7 years agoMerge branch 'nd/negative-pathspec'
Junio C Hamano [Fri, 10 Jan 2014 18:31:48 +0000 (10:31 -0800)]
Merge branch 'nd/negative-pathspec'

Introduce "negative pathspec" magic, to allow "git log -- . ':!dir'" to
tell us "I am interested in everything but 'dir' directory".

* nd/negative-pathspec:
  pathspec.c: support adding prefix magic to a pathspec with mnemonic magic
  Support pathspec magic :(exclude) and its short form :!
  glossary-content.txt: rephrase magic signature part

7 years agorebase: fix fork-point with zero arguments
John Keeping [Thu, 9 Jan 2014 19:47:34 +0000 (19:47 +0000)]
rebase: fix fork-point with zero arguments

When no arguments are specified, $switch_to is empty so we end up
passing the empty string to "git merge-base --fork-point", which causes
an error.  git-rebase carries on at this point, but in fact we have
failed to apply the fork-point operation.

It turns out that the test in t3400 that was meant to test this didn't
actually need the fork-point behaviour, so enhance it to make sure that
the fork-point is applied correctly.  The modified test fails without
the change to git-rebase.sh in this patch.

Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoshorten_unambiguous_ref(): tighten up pointer arithmetic
Michael Haggerty [Wed, 8 Jan 2014 14:43:40 +0000 (15:43 +0100)]
shorten_unambiguous_ref(): tighten up pointer arithmetic

As long as we're being pathologically stingy with mallocs, we might as
well do the math right and save 6 (!) bytes.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogen_scanf_fmt(): delete function and use snprintf() instead
Michael Haggerty [Wed, 8 Jan 2014 14:43:39 +0000 (15:43 +0100)]
gen_scanf_fmt(): delete function and use snprintf() instead

To replace "%.*s" with "%s", all we have to do is use snprintf()
to interpolate "%s" into the pattern.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoshorten_unambiguous_ref(): introduce a new local variable
Michael Haggerty [Wed, 8 Jan 2014 14:43:38 +0000 (15:43 +0100)]
shorten_unambiguous_ref(): introduce a new local variable

When filling the scanf_fmts array, use a separate variable to keep
track of the offset to avoid clobbering total_len (which we will need
in the next commit).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agot5537: fix incorrect expectation in test case 10
Nguyễn Thái Ngọc Duy [Wed, 8 Jan 2014 12:13:19 +0000 (19:13 +0700)]
t5537: fix incorrect expectation in test case 10

Commit 48d25ca adds a new commit "7" to the repo that the next test case
in commit 1609488 clones from. But the next test case does not expect
this commit. For these tests, it's the bottom that's important, not
the top. Fix the expected commit list.

While at it, fix the default http port number to 5537. Otherwise when
t5536 learns to test httpd, running test in parallel may fail.

References:

48d25ca fetch: add --update-shallow to accept... - 2013-12-05
1609488 smart-http: support shallow fetch/clone - 2013-12-05

Noticed-by: Jeff King <peff@peff.net>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorm: better document side effects when removing a submodule
Jens Lehmann [Tue, 7 Jan 2014 21:32:37 +0000 (22:32 +0100)]
rm: better document side effects when removing a submodule

The "Submodules" section of the "git rm" documentation mentions what will
happen when a submodule with a gitfile gets removed with newer git. But it
doesn't talk about what happens when the user changes between commits
before and after the removal, which does not remove the submodule from the
work tree like using the rm command did the first time.

Explain what happens and what the user has to do manually to fix that in
the new BUGS section. Also document this behavior in a new test.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agomv: better document side effects when moving a submodule
Jens Lehmann [Tue, 7 Jan 2014 21:31:32 +0000 (22:31 +0100)]
mv: better document side effects when moving a submodule

The "Submodules" section of the "git mv" documentation mentions what will
happen when a submodule with a gitfile gets moved with newer git. But it
doesn't talk about what happens when the user changes between commits
before and after the move, which does not update the work tree like using
the mv command did the first time.

Explain what happens and what the user has to do manually to fix that in
the new BUGS section. Also document this behavior in a new test.

Reported-by: George Papanikolaou <g3orge.app@gmail.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agostash: handle specifying stashes with $IFS
Øystein Walle [Tue, 7 Jan 2014 08:22:15 +0000 (09:22 +0100)]
stash: handle specifying stashes with $IFS

When trying to pop/apply a stash specified with an argument
containing IFS whitespace, git-stash will throw an error:

    $ git stash pop 'stash@{two hours ago}'
    Too many revisions specified: stash@{two hours ago}

This happens because word splitting is used to count non-option
arguments. Make use of rev-parse's --sq option to quote the arguments
for us to ensure a correct count. Add quotes where necessary.

Also add a test that verifies correct behaviour.

Helped-by: Thomas Rast <tr@thomasrast.ch>
Signed-off-by: Øystein Walle <oystwa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocompletion: complete format.coverLetter
Ramkumar Ramachandra [Mon, 6 Jan 2014 17:18:51 +0000 (22:48 +0530)]
completion: complete format.coverLetter

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosha1_name: don't resolve refs when core.warnambiguousrefs is false
Brodie Rao [Tue, 7 Jan 2014 03:32:01 +0000 (19:32 -0800)]
sha1_name: don't resolve refs when core.warnambiguousrefs is false

When seeing a full 40-hex object name, get_sha1_basic()
unconditionally checks if the string can also be interpreted as a
refname, but the result will not be used unless warn_ambiguous_refs
is in effect.

Omitting this unnecessary ref resolution provides a substantial
performance improvement, especially when passing many hashes to a
command (like "git rev-list --stdin") and core.warnambiguousrefs is
set to false.  The check incurs 6 stat()s for every hash supplied,
which can be costly over NFS.

Signed-off-by: Brodie Rao <brodie@sf.io>
Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agopager: set LV=-c alongside LESS=FRSX
Jonathan Nieder [Tue, 7 Jan 2014 02:14:05 +0000 (18:14 -0800)]
pager: set LV=-c alongside LESS=FRSX

On systems with lv configured as the preferred pager (i.e.,
DEFAULT_PAGER=lv at build time, or PAGER=lv exported in the
environment) git commands that use color show control codes instead of
color in the pager:

$ git diff
^[[1mdiff --git a/.mailfilter b/.mailfilter^[[m
^[[1mindex aa4f0b2..17e113e 100644^[[m
^[[1m--- a/.mailfilter^[[m
^[[1m+++ b/.mailfilter^[[m
^[[36m@@ -1,11 +1,58 @@^[[m

"less" avoids this problem because git uses the LESS environment
variable to pass the -R option ('output ANSI color escapes in raw
form') by default.  Use the LV environment variable to pass 'lv' the
-c option ('allow ANSI escape sequences for text decoration / color')
to fix it for lv, too.

Noticed when the default value for color.ui flipped to 'auto' in
v1.8.4-rc0~36^2~1 (2013-06-10).

Reported-by: Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogit-submodule.sh: 'checkout' is a valid update mode
Francesco Pretto [Sun, 5 Jan 2014 02:50:48 +0000 (03:50 +0100)]
git-submodule.sh: 'checkout' is a valid update mode

'checkout' is documented as one of the valid values for the
'submodule.<name>.update' variable, and in a repository with the
variable set to 'checkout', "git submodule update" command does
update using the 'checkout' mode.

However, it has been an accident that the implementation works this
way; any unknown value would trigger the same codepath and update
using the 'checkout' mode.

Explicitly list 'checkout' as one of the known update modes, and
error out when an unknown update mode is used.

Teach the codepath that initializes the configuration variable from
an in-tree .gitmodules that 'checkout' is one of the valid values.
The code since ac1fbbda (submodule: do not copy unknown update mode
from .gitmodules, 2013-12-02) used to treat the value 'checkout' as
unknown and mapped it to 'none', which made little sense.  With this
change, 'checkout' specified in .gitmodules will stay to be 'checkout'.

Signed-off-by: Francesco Pretto <ceztko@gmail.com>
Signed-off-by: Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agouser-manual: improve html and pdf formatting
Thomas Ackermann [Sat, 4 Jan 2014 09:07:51 +0000 (10:07 +0100)]
user-manual: improve html and pdf formatting

Use asciidoc style 'article' instead of 'book' and change asciidoc
title level.  This removes blank first page and superfluous "Part I"
page (there is no "Part II") in pdf output. Also pdf size is
decreased by this from 77 to 67 pages.  In html output this removes
unnecessary sub-tocs and chapter numbering.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agobuiltin/help.c: speed up is_git_command() by checking for builtin commands first
Sebastian Schuberth [Thu, 2 Jan 2014 16:17:11 +0000 (17:17 +0100)]
builtin/help.c: speed up is_git_command() by checking for builtin commands first

Since 2dce956 is_git_command() is a bit slow as it does file I/O in
the call to list_commands_in_dir(). Avoid the file I/O by adding an
early check for the builtin commands.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agobuiltin/help.c: call load_command_list() only when it is needed
Sebastian Schuberth [Thu, 2 Jan 2014 16:16:30 +0000 (17:16 +0100)]
builtin/help.c: call load_command_list() only when it is needed

This avoids list_commands_in_dir() being called when not needed which is
quite slow due to file I/O in order to list matching files in a directory.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogit.c: consistently use the term "builtin" instead of "internal command"
Sebastian Schuberth [Thu, 2 Jan 2014 16:15:44 +0000 (17:15 +0100)]
git.c: consistently use the term "builtin" instead of "internal command"

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'maint'
Junio C Hamano [Mon, 6 Jan 2014 18:39:07 +0000 (10:39 -0800)]
Merge branch 'maint'

* maint:
  Documentation/gitmodules: Only 'update' and 'url' are required
  l10n: de.po: fix translation of 'prefix'

7 years agocompletion: fix remote.pushdefault
Ramkumar Ramachandra [Sun, 5 Jan 2014 10:18:05 +0000 (15:48 +0530)]
completion: fix remote.pushdefault

When attempting to complete

  $ git config remote.push<TAB>

'pushdefault' doesn't come up. This is because "$cur" is matched with
"remote.*" and a list of remotes are completed. Add 'pushdefault' as a
candidate for completion too, using __gitcomp_nl_append ().

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocompletion: fix branch.autosetup(merge|rebase)
Ramkumar Ramachandra [Sun, 5 Jan 2014 10:18:04 +0000 (15:48 +0530)]
completion: fix branch.autosetup(merge|rebase)

When attempting to complete

  $ git config branch.auto<TAB>

'autosetupmerge' and 'autosetuprebase' don't come up. This is because
"$cur" is matched with "branch.*" and a list of branches are
completed. Add 'autosetupmerge', 'autosetuprebase' as candidates for
completion too, using __gitcomp_nl_append ().

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocompletion: introduce __gitcomp_nl_append ()
Ramkumar Ramachandra [Sun, 5 Jan 2014 10:18:03 +0000 (15:48 +0530)]
completion: introduce __gitcomp_nl_append ()

There are situations where multiple classes of completions possible. For
example

  branch.<TAB>

should try to complete

  branch.master.
  branch.autosetupmerge
  branch.autosetuprebase

The first candidate has the suffix ".", and the second/ third candidates
have the suffix " ". To facilitate completions of this kind, create a
variation of __gitcomp_nl () that appends to the existing list of
completion candidates, COMPREPLY.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agozsh completion: find matching custom bash completion
Ramkumar Ramachandra [Sun, 5 Jan 2014 10:18:02 +0000 (15:48 +0530)]
zsh completion: find matching custom bash completion

If zsh completion is being read from a location that is different from
system-wide default, it is likely that the user is trying to use a
custom version, perhaps closer to the bleeding edge, installed in her
own directory. We will more likely to find the matching bash completion
script in the same directory than in those system default places.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'maint' of git://github.com/git-l10n/git-po into maint
Junio C Hamano [Mon, 6 Jan 2014 17:10:09 +0000 (09:10 -0800)]
Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

* 'maint' of git://github.com/git-l10n/git-po:
  l10n: de.po: fix translation of 'prefix'

7 years agoDocumentation/gitmodules: Only 'update' and 'url' are required
W. Trevor King [Fri, 3 Jan 2014 18:31:22 +0000 (10:31 -0800)]
Documentation/gitmodules: Only 'update' and 'url' are required

Descriptions for all the settings fell under the initial "Each
submodule section also contains the following required keys:".  The
example shows sections with just 'path' and 'url' entries, which are
indeed required, but we should still make the required/optional
distinction explicit to clarify that the rest of them are optional.

Signed-off-by: W. Trevor King <wking@tremily.us>
Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoshallow: remove unused code
Ramsay Jones [Mon, 6 Jan 2014 00:00:58 +0000 (00:00 +0000)]
shallow: remove unused code

Commit 58babfff ("shallow.c: the 8 steps to select new commits for
.git/shallow", 05-12-2013) added a function to implement step 5 of
the quoted eight steps, namely 'remove_nonexistent_ours_in_pack()'.
This function implements an optional optimization step in the new
shallow commit selection algorithm. However, this function has no
callers. (The commented out call sites would need to change, in
order to provide information required by the function.)

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosend-pack.c: mark a file-local function static
Ramsay Jones [Sun, 5 Jan 2014 23:55:01 +0000 (23:55 +0000)]
send-pack.c: mark a file-local function static

Commit f2c681cf ("send-pack: support pushing from a shallow clone
via http", 05-12-2013) adds the 'advertise_shallow_grafts_buf'
function as an external symbol.

Noticed by sparse. ("'advertise_shallow_grafts_buf' was not declared.
Should it be static?")

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>