git/git.git
7 years agodiff: trivial style fix
Felipe Contreras [Thu, 31 Oct 2013 09:25:44 +0000 (03:25 -0600)]
diff: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorevision: trivial style fixes
Felipe Contreras [Thu, 31 Oct 2013 09:25:43 +0000 (03:25 -0600)]
revision: trivial style fixes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agopretty: trivial style fix
Felipe Contreras [Thu, 31 Oct 2013 09:25:42 +0000 (03:25 -0600)]
pretty: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodescribe: trivial style fixes
Felipe Contreras [Thu, 31 Oct 2013 09:25:41 +0000 (03:25 -0600)]
describe: trivial style fixes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agotransport-helper: trivial style fix
Felipe Contreras [Thu, 31 Oct 2013 09:25:40 +0000 (03:25 -0600)]
transport-helper: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosha1-name: trivial style cleanup
Felipe Contreras [Thu, 31 Oct 2013 09:25:39 +0000 (03:25 -0600)]
sha1-name: trivial style cleanup

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agobranch: trivial style fix
Felipe Contreras [Thu, 31 Oct 2013 09:25:38 +0000 (03:25 -0600)]
branch: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorevision: add missing include
Felipe Contreras [Thu, 31 Oct 2013 09:25:36 +0000 (03:25 -0600)]
revision: add missing include

Otherwise we might not have 'struct diff_options'.

[jc: needs a matching follow-up patch to remove inclusion of diff.h
from *.c files that do not themselves use anything from diff.h]

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodoc/pull: clarify the illustrations
Junio C Hamano [Thu, 31 Oct 2013 20:43:35 +0000 (13:43 -0700)]
doc/pull: clarify the illustrations

The second illustration that shows the history after "git pull"
spelled the remote-tracking branch with "remotes/" prefix, which
is not necessary.  Drop it.

To match the assumption that a remote-tracking branch is used to
keep track of the advancement of the master at the origin, update
the first illustration that shows the history before "git pull"
to show the distinction between the master currently at origin and
the stale origin/master remote-tracking branch.

Noticed-by: Felipe Contreras <felipe.contreras@gmail.com>
Helped-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agot: replace pulls with merges
Felipe Contreras [Thu, 31 Oct 2013 09:25:33 +0000 (03:25 -0600)]
t: replace pulls with merges

This is what the code intended.

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agomerge: simplify ff-only option
Felipe Contreras [Thu, 31 Oct 2013 09:25:32 +0000 (03:25 -0600)]
merge: simplify ff-only option

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoGit 1.8.5-rc0 v1.8.5-rc0
Junio C Hamano [Wed, 30 Oct 2013 19:17:47 +0000 (12:17 -0700)]
Git 1.8.5-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'maint'
Junio C Hamano [Wed, 30 Oct 2013 19:11:22 +0000 (12:11 -0700)]
Merge branch 'maint'

* maint:
  t5570: Update for clone-progress-to-stderr branch

7 years agoMerge branch 'jk/refs-c-squelch-gcc'
Junio C Hamano [Wed, 30 Oct 2013 19:11:03 +0000 (12:11 -0700)]
Merge branch 'jk/refs-c-squelch-gcc'

* jk/refs-c-squelch-gcc:
  silence gcc array-bounds warning

7 years agoMerge branch 'jk/date-c-double-semicolon'
Junio C Hamano [Wed, 30 Oct 2013 19:11:01 +0000 (12:11 -0700)]
Merge branch 'jk/date-c-double-semicolon'

* jk/date-c-double-semicolon:
  drop redundant semicolon in empty while

7 years agoMerge branch 'nd/lift-path-max'
Junio C Hamano [Wed, 30 Oct 2013 19:10:56 +0000 (12:10 -0700)]
Merge branch 'nd/lift-path-max'

* nd/lift-path-max:
  checkout_entry(): clarify the use of topath[] parameter
  entry.c: convert checkout_entry to use strbuf

7 years agoMerge branch 'tr/valgrind-test-fix'
Junio C Hamano [Wed, 30 Oct 2013 19:10:52 +0000 (12:10 -0700)]
Merge branch 'tr/valgrind-test-fix'

* tr/valgrind-test-fix:
  Revert "test-lib: allow prefixing a custom string before "ok N" etc."
  Revert "test-lib: support running tests under valgrind in parallel"

7 years agoMerge branch 'tr/gitk-doc-update'
Junio C Hamano [Wed, 30 Oct 2013 19:10:50 +0000 (12:10 -0700)]
Merge branch 'tr/gitk-doc-update'

* tr/gitk-doc-update:
  Documentation: revamp gitk(1)

7 years agoMerge branch 'jl/pack-transfer-avoid-double-close'
Junio C Hamano [Wed, 30 Oct 2013 19:10:45 +0000 (12:10 -0700)]
Merge branch 'jl/pack-transfer-avoid-double-close'

The codepath that send_pack() calls pack_objects() mistakenly
closed the same file descriptor twice, leading to potentially
closing a wrong file descriptor that was opened in the meantime.

* jl/pack-transfer-avoid-double-close:
  Clear fd after closing to avoid double-close error

7 years agoMerge branch 'sb/git-svn-docs-indent-with-ht'
Junio C Hamano [Wed, 30 Oct 2013 19:10:34 +0000 (12:10 -0700)]
Merge branch 'sb/git-svn-docs-indent-with-ht'

* sb/git-svn-docs-indent-with-ht:
  git-svn docs: Use tabs consistently within the ascii doc

7 years agoMerge branch 'nd/magic-pathspec'
Junio C Hamano [Wed, 30 Oct 2013 19:10:29 +0000 (12:10 -0700)]
Merge branch 'nd/magic-pathspec'

All callers to parse_pathspec() must choose between getting no
pathspec or one path that is limited to the current directory
when there is no paths given on the command line, but there were
two callers that violated this rule, triggering a BUG().

* nd/magic-pathspec:
  Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

7 years agoMerge branch 'nd/gc-lock-against-each-other'
Junio C Hamano [Wed, 30 Oct 2013 19:10:27 +0000 (12:10 -0700)]
Merge branch 'nd/gc-lock-against-each-other'

* nd/gc-lock-against-each-other:
  gc: remove gc.pid file at end of execution

7 years agoMerge branch 'hn/log-graph-color-octopus'
Junio C Hamano [Wed, 30 Oct 2013 19:10:21 +0000 (12:10 -0700)]
Merge branch 'hn/log-graph-color-octopus'

* hn/log-graph-color-octopus:
  graph: fix coloring around octopus merges

7 years agoMerge branch 'mm/checkout-auto-track-fix'
Junio C Hamano [Wed, 30 Oct 2013 19:10:16 +0000 (12:10 -0700)]
Merge branch 'mm/checkout-auto-track-fix'

"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".

* mm/checkout-auto-track-fix:
  checkout: proper error message on 'git checkout foo bar --'
  checkout: allow dwim for branch creation for "git checkout $branch --"

7 years agoMerge branch 'sg/t3600-nul-sha1-fix'
Junio C Hamano [Wed, 30 Oct 2013 19:10:09 +0000 (12:10 -0700)]
Merge branch 'sg/t3600-nul-sha1-fix'

* sg/t3600-nul-sha1-fix:
  t3600: fix broken "choking git rm" test

7 years agoMerge branch 'fc/styles'
Junio C Hamano [Wed, 30 Oct 2013 19:10:06 +0000 (12:10 -0700)]
Merge branch 'fc/styles'

C coding style fixes.

* fc/styles:
  block-sha1/sha1.c: have SP around arithmetic operators
  base85.c: have SP around arithmetic operators
  archive.c: have SP around arithmetic operators
  alloc.c: have SP around arithmetic operators
  abspath.c: have SP around arithmetic operators
  alias: have SP around arithmetic operators
  C: have space around && and || operators

7 years agoMerge branch 'jc/upload-pack-send-symref'
Junio C Hamano [Wed, 30 Oct 2013 19:10:00 +0000 (12:10 -0700)]
Merge branch 'jc/upload-pack-send-symref'

One long-standing flaw in the pack transfer protocol used by "git
clone" was that there was no way to tell the other end which branch
"HEAD" points at, and the receiving end needed to guess.  A new
capability has been defined in the pack protocol to convey this
information so that cloning from a repository with more than one
branches pointing at the same commit where the HEAD is at now
reliably sets the initial branch in the resulting repository.

* jc/upload-pack-send-symref:
  t5570: Update for clone-progress-to-stderr branch
  t5570: Update for symref capability
  clone: test the new HEAD detection logic
  connect: annotate refs with their symref information in get_remote_head()
  connect.c: make parse_feature_value() static
  upload-pack: send non-HEAD symbolic refs
  upload-pack: send symbolic ref information as capability
  upload-pack.c: do not pass confusing cb_data to mark_our_ref()
  t5505: fix "set-head --auto with ambiguous HEAD" test

7 years agoMerge branch 'jk/http-auth-redirects'
Junio C Hamano [Wed, 30 Oct 2013 19:09:53 +0000 (12:09 -0700)]
Merge branch 'jk/http-auth-redirects'

Handle the case where http transport gets redirected during the
authorization request better.

* jk/http-auth-redirects:
  http.c: Spell the null pointer as NULL
  remote-curl: rewrite base url from info/refs redirects
  remote-curl: store url as a strbuf
  remote-curl: make refs_url a strbuf
  http: update base URLs when we see redirects
  http: provide effective url to callers
  http: hoist credential request out of handle_curl_result
  http: refactor options to http_get_*
  http_request: factor out curlinfo_strbuf
  http_get_file: style fixes

7 years agot5570: Update for clone-progress-to-stderr branch
Brian Gernhardt [Mon, 21 Oct 2013 17:54:12 +0000 (13:54 -0400)]
t5570: Update for clone-progress-to-stderr branch

git clone now reports its progress to standard error, which throws off
t5570.  Using test_i18ngrep instead of test_cmp allows the test to be
more flexible by only looking for the expected error and ignoring any
other output from the program.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoAlmost -rc0 for 1.8.5
Junio C Hamano [Mon, 28 Oct 2013 17:52:07 +0000 (10:52 -0700)]
Almost -rc0 for 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSync with v1.8.4.2
Junio C Hamano [Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)]
Sync with v1.8.4.2

7 years agoMerge branch 'sb/repack-in-c'
Junio C Hamano [Mon, 28 Oct 2013 17:43:41 +0000 (10:43 -0700)]
Merge branch 'sb/repack-in-c'

Finishing touches to update documentation.

* sb/repack-in-c:
  Reword repack documentation to no longer state it's a script

7 years agoMerge branch 'sg/prompt-svn-remote-fix'
Junio C Hamano [Mon, 28 Oct 2013 17:43:38 +0000 (10:43 -0700)]
Merge branch 'sg/prompt-svn-remote-fix'

Bash portability fix.

* sg/prompt-svn-remote-fix:
  bash prompt: don't use '+=' operator in show upstream code path

7 years agoMerge branch 'jk/split-broken-ident'
Junio C Hamano [Mon, 28 Oct 2013 17:43:32 +0000 (10:43 -0700)]
Merge branch 'jk/split-broken-ident'

Make the fall-back parsing of commit objects with broken author or
committer lines more robust to pick up the timestamps.

* jk/split-broken-ident:
  split_ident: parse timestamp from end of line

7 years agoMerge branch 'jk/remote-literal-string-leakfix'
Junio C Hamano [Mon, 28 Oct 2013 17:43:28 +0000 (10:43 -0700)]
Merge branch 'jk/remote-literal-string-leakfix'

* jk/remote-literal-string-leakfix:
  remote: do not copy "origin" string literal

7 years agoMerge branch 'ew/keepalive'
Junio C Hamano [Mon, 28 Oct 2013 17:43:24 +0000 (10:43 -0700)]
Merge branch 'ew/keepalive'

* ew/keepalive:
  http: use curl's tcp keepalive if available
  http: enable keepalive on TCP sockets

7 years agoMerge branch 'jc/revision-range-unpeel'
Junio C Hamano [Mon, 28 Oct 2013 17:43:16 +0000 (10:43 -0700)]
Merge branch 'jc/revision-range-unpeel'

"git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
output, but "git rev-list --objects v1.0^..v1.0" did not.

* jc/revision-range-unpeel:
  revision: do not peel tags used in range notation

7 years agoMerge branch 'jx/relative-path-regression-fix'
Junio C Hamano [Mon, 28 Oct 2013 17:42:29 +0000 (10:42 -0700)]
Merge branch 'jx/relative-path-regression-fix'

* jx/relative-path-regression-fix:
  Use simpler relative_path when set_git_dir
  relative_path should honor dos-drive-prefix
  test: use unambigous leading path (/foo) for MSYS

7 years agoGit 1.8.4.2 v1.8.4.2
Junio C Hamano [Mon, 28 Oct 2013 17:21:29 +0000 (10:21 -0700)]
Git 1.8.4.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'jk/clone-progress-to-stderr' into maint
Junio C Hamano [Mon, 28 Oct 2013 17:19:24 +0000 (10:19 -0700)]
Merge branch 'jk/clone-progress-to-stderr' into maint

"git clone" gave some progress messages to the standard output, not to
the standard error, and did not allow suppressing them with the
"--no-progress" option.

* jk/clone-progress-to-stderr:
  clone: always set transport options
  clone: treat "checking connectivity" like other progress
  clone: send diagnostic messages to stderr

7 years agoMerge branch 'jk/format-patch-from' into maint
Junio C Hamano [Mon, 28 Oct 2013 17:18:43 +0000 (10:18 -0700)]
Merge branch 'jk/format-patch-from' into maint

"format-patch --from=<whom>" forgot to omit unnecessary in-body from
line, i.e. when <whom> is the same as the real author.

* jk/format-patch-from:
  format-patch: print in-body "From" only when needed

7 years agoMerge branch 'jk/shortlog-tolerate-broken-commit' into maint
Junio C Hamano [Mon, 28 Oct 2013 17:17:31 +0000 (10:17 -0700)]
Merge branch 'jk/shortlog-tolerate-broken-commit' into maint

"git shortlog" used to choke and die when there is a malformed commit
(e.g. missing authors); it now simply ignore such a commit and keeps
going.

* jk/shortlog-tolerate-broken-commit:
  shortlog: ignore commits with missing authors

7 years agoMerge branch 'jk/diff-algo' into maint
Junio C Hamano [Mon, 28 Oct 2013 17:16:11 +0000 (10:16 -0700)]
Merge branch 'jk/diff-algo' into maint

"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.

* jk/diff-algo:
  merge-recursive: fix parsing of "diff-algorithm" option

7 years agotest-lib: fix typo in comment
Torstein Hegge [Sun, 27 Oct 2013 09:56:33 +0000 (10:56 +0100)]
test-lib: fix typo in comment

Point test writers to the test_expect_* functions properly.

Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosha1_file: move comment about return value where it belongs
Christian Couder [Sat, 26 Oct 2013 22:34:30 +0000 (00:34 +0200)]
sha1_file: move comment about return value where it belongs

Commit 5b0864070 (sha1_object_info_extended: make type calculation
optional, Jul 12 2013) changed the return value of the
sha1_object_info_extended function to 0/-1 for success/error.

Previously this function returned the object type for success or
-1 for error. But unfortunately the above commit forgot to change
or move the comment above this function that says "returns enum
object_type or negative".

To fix this inconsistency, let's move the comment above the
sha1_object_info function where it is still true.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosilence gcc array-bounds warning
Jeff King [Thu, 24 Oct 2013 08:45:13 +0000 (04:45 -0400)]
silence gcc array-bounds warning

In shorten_unambiguous_ref, we build and cache a reverse-map of the
rev-parse rules like this:

  static char **scanf_fmts;
  static int nr_rules;
  if (!nr_rules) {
  for (; ref_rev_parse_rules[nr_rules]; nr_rules++)
  ... generate scanf_fmts ...
  }

where ref_rev_parse_rules is terminated with a NULL pointer.
Compiling with "gcc -O2 -Wall" does not cause any problems, but
compiling with "-O3 -Wall" generates:

  $ make CFLAGS='-O3 -Wall' refs.o
  refs.c: In function ‘shorten_unambiguous_ref’:
  refs.c:3379:29: warning: array subscript is above array bounds [-Warray-bounds]
     for (; ref_rev_parse_rules[nr_rules]; nr_rules++)

Curiously, we can silence this by explicitly nr_rules to 0
in the beginning of the loop, even though the compiler
should be able to tell that we follow this code path only
when nr_rules is already 0.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodrop redundant semicolon in empty while
Jeff King [Thu, 24 Oct 2013 08:42:17 +0000 (04:42 -0400)]
drop redundant semicolon in empty while

The extra semi-colon is harmless, since we really do want
the while loop to do nothing. But it does trigger a warning
from clang.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocheckout_entry(): clarify the use of topath[] parameter
Junio C Hamano [Wed, 23 Oct 2013 17:52:42 +0000 (10:52 -0700)]
checkout_entry(): clarify the use of topath[] parameter

The said function has this signature:

extern int checkout_entry(struct cache_entry *ce,
  const struct checkout *state,
  char *topath);

At first glance, it might appear that the caller of checkout_entry()
can specify to which path the contents are written out by the last
parameter, and it is tempting to add "const" in front of its type.

In reality, however, topath[] is to point at a buffer to store the
temporary path generated by the callchain originating from this
function, and the temporary path is always short, much shorter than
the buffer prepared by its only caller in builtin/checkout-index.c.

Document the code a bit to clarify so that future callers know how
to use the function better.

Noticed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoentry.c: convert checkout_entry to use strbuf
Nguyễn Thái Ngọc Duy [Thu, 24 Oct 2013 01:55:35 +0000 (08:55 +0700)]
entry.c: convert checkout_entry to use strbuf

The old code does not do boundary check so any paths longer than
PATH_MAX can cause buffer overflow. Replace it with strbuf to handle
paths of arbitrary length.

The OS may reject if the path is too long though. But in that case we
report the cause (e.g. name too long) and usually move on to checking
out the next entry.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agohttp.c: Spell the null pointer as NULL
Ramsay Jones [Thu, 24 Oct 2013 20:17:19 +0000 (21:17 +0100)]
http.c: Spell the null pointer as NULL

Commit 1bbcc224 ("http: refactor options to http_get_*", 28-09-2013)
changed the type of final 'options' argument of the http_get_file()
function from an int to an 'struct http_get_options' pointer.
However, it neglected to update the (single) call site. Since this
call was passing '0' to that argument, it was (correctly) being
interpreted as a null pointer. Change to argument to NULL.

Noticed by sparse. ("Using plain integer as NULL pointer")

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoUpdate draft release notes to 1.8.5
Junio C Hamano [Wed, 23 Oct 2013 20:37:27 +0000 (13:37 -0700)]
Update draft release notes to 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSync with 'maint'
Junio C Hamano [Wed, 23 Oct 2013 20:36:57 +0000 (13:36 -0700)]
Sync with 'maint'

7 years agoAlmost 1.8.4.2 ;-)
Junio C Hamano [Wed, 23 Oct 2013 20:34:39 +0000 (13:34 -0700)]
Almost 1.8.4.2 ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'jc/ls-files-killed-optim' into maint
Junio C Hamano [Wed, 23 Oct 2013 20:33:08 +0000 (13:33 -0700)]
Merge branch 'jc/ls-files-killed-optim' into maint

"git ls-files -k" needs to crawl only the part of the working tree
that may overlap the paths in the index to find killed files, but
shared code with the logic to find all the untracked files, which
made it unnecessarily inefficient.

* jc/ls-files-killed-optim:
  dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
  t3010: update to demonstrate "ls-files -k" optimization pitfalls
  ls-files -k: a directory only can be killed if the index has a non-directory
  dir.c: use the cache_* macro to access the current index

7 years agoMerge branch 'jh/checkout-auto-tracking' into maint
Junio C Hamano [Wed, 23 Oct 2013 20:32:50 +0000 (13:32 -0700)]
Merge branch 'jh/checkout-auto-tracking' into maint

"git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.

* jh/checkout-auto-tracking:
  t3200: fix failure on case-insensitive filesystems
  branch.c: Relax unnecessary requirement on upstream's remote ref name
  t3200: Add test demonstrating minor regression in 41c21f2
  Refer to branch.<name>.remote/merge when documenting --track
  t3200: Minor fix when preparing for tracking failure
  t2024: Fix &&-chaining and a couple of typos

7 years agoMerge branch 'nd/fetch-into-shallow' into maint
Junio C Hamano [Wed, 23 Oct 2013 20:32:17 +0000 (13:32 -0700)]
Merge branch 'nd/fetch-into-shallow' into maint

When there is no sufficient overlap between old and new history
during a "git fetch" into a shallow repository, objects that the
sending side knows the receiving end has were unnecessarily sent.

* nd/fetch-into-shallow:
  Add testcase for needless objects during a shallow fetch
  list-objects: mark more commits as edges in mark_edges_uninteresting
  list-objects: reduce one argument in mark_edges_uninteresting
  upload-pack: delegate rev walking in shallow fetch to pack-objects
  shallow: add setup_temporary_shallow()
  shallow: only add shallow graft points to new shallow file
  move setup_alternate_shallow and write_shallow_commits to shallow.c

7 years agoMerge branch 'bc/gnome-keyring'
Junio C Hamano [Wed, 23 Oct 2013 20:21:50 +0000 (13:21 -0700)]
Merge branch 'bc/gnome-keyring'

Cleanups and tweaks for credential handling to work with ancient versions
of the gnome-keyring library that are still in use.

* bc/gnome-keyring:
  contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring
  contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring
  contrib/git-credential-gnome-keyring.c: report failure to store password
  contrib/git-credential-gnome-keyring.c: use glib messaging functions
  contrib/git-credential-gnome-keyring.c: use glib memory allocation functions
  contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
  contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds
  contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()
  contrib/git-credential-gnome-keyring.c: set Gnome application name
  contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing
  contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t
  contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly
  contrib/git-credential-gnome-keyring.c: add static where applicable
  contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.
  contrib/git-credential-gnome-keyring.c: remove unused die() function
  contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations

7 years agoMerge branch 'po/dot-url'
Junio C Hamano [Wed, 23 Oct 2013 20:21:48 +0000 (13:21 -0700)]
Merge branch 'po/dot-url'

Explain how '.' can be used to refer to the "current repository"
in the documentation.

* po/dot-url:
  doc/cli: make "dot repository" an independent bullet point
  config doc: update dot-repository notes
  doc: command line interface (cli) dot-repository dwimmery

7 years agoMerge branch 'jc/prompt-upstream'
Junio C Hamano [Wed, 23 Oct 2013 20:21:45 +0000 (13:21 -0700)]
Merge branch 'jc/prompt-upstream'

An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

* jc/prompt-upstream:
  git-prompt.sh: optionally show upstream branch name

7 years agoMerge branch 'hu/cherry-pick-previous-branch'
Junio C Hamano [Wed, 23 Oct 2013 20:21:35 +0000 (13:21 -0700)]
Merge branch 'hu/cherry-pick-previous-branch'

"git cherry-pick" without further options would segfault.

Could use a follow-up to handle '-' after argv[1] better.

* hu/cherry-pick-previous-branch:
  cherry-pick: handle "-" after parsing options

7 years agoMerge branch 'mg/more-textconv'
Junio C Hamano [Wed, 23 Oct 2013 20:21:30 +0000 (13:21 -0700)]
Merge branch 'mg/more-textconv'

Make "git grep" and "git show" pay attention to --textconv when
dealing with blob objects.

* mg/more-textconv:
  grep: honor --textconv for the case rev:path
  grep: allow to use textconv filters
  t7008: demonstrate behavior of grep with textconv
  cat-file: do not die on --textconv without textconv filters
  show: honor --textconv for blobs
  diff_opt: track whether flags have been set explicitly
  t4030: demonstrate behavior of show with textconv

7 years agoMerge branch 'jc/pack-objects'
Junio C Hamano [Wed, 23 Oct 2013 20:21:26 +0000 (13:21 -0700)]
Merge branch 'jc/pack-objects'

* jc/pack-objects:
  pack-objects: shrink struct object_entry

7 years agoClear fd after closing to avoid double-close error
Jens Lindstrom [Tue, 22 Oct 2013 13:36:02 +0000 (15:36 +0200)]
Clear fd after closing to avoid double-close error

In send_pack(), clear the fd passed to pack_objects() by setting
it to -1, since pack_objects() closes the fd (via a call to
run_command()).  Likewise, in get_pack(), clear the fd passed to
run_command().

Not doing so risks having git_transport_push(), caller of
send_pack(), closing the fd again, possibly incorrectly closing
some other open file; or similarly with fetch_refs_from_pack(),
indirect caller of get_pack().

Signed-off-by: Jens Lindström <jl@opera.com>
Acked-by: Jeff King <peff@peff.net>
Acked-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoRevert "test-lib: allow prefixing a custom string before "ok N" etc."
Thomas Rast [Sat, 19 Oct 2013 21:06:08 +0000 (23:06 +0200)]
Revert "test-lib: allow prefixing a custom string before "ok N" etc."

Now that ad0e623 (test-lib: support running tests under valgrind in
parallel, 2013-06-23) has been reverted, this support code has no
users any more.  Revert it, too.

This reverts commit e939e15d241e942662b9f88f6127ab470ab0a0b9.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoRevert "test-lib: support running tests under valgrind in parallel"
Thomas Rast [Sat, 19 Oct 2013 21:06:07 +0000 (23:06 +0200)]
Revert "test-lib: support running tests under valgrind in parallel"

This reverts commit ad0e6233320b004f0d686f6887c803e508607bd2.

--valgrind-parallel was broken from the start: during review I made
the whole valgrind setup code conditional on not being a
--valgrind-parallel worker child.  But even the children crucially
need $GIT_VALGRIND to be set; it should therefore have been set
outside the conditional.

The fix would be a two-liner, but since the introduction of the
feature, almost four months have passed without anyone noticing that
it is broken.  So this feature is not worth the about hundred lines of
test-lib.sh complexity.  Revert it.

Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogit-svn docs: Use tabs consistently within the ascii doc
Stefan Beller [Mon, 21 Oct 2013 19:36:06 +0000 (21:36 +0200)]
git-svn docs: Use tabs consistently within the ascii doc

While I can understand 4 or 7 white spaces are fancy, we'd rather want
to use tabs throughout the whole document.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agot5570: Update for clone-progress-to-stderr branch
Brian Gernhardt [Mon, 21 Oct 2013 17:54:12 +0000 (13:54 -0400)]
t5570: Update for clone-progress-to-stderr branch

git clone now reports its progress to standard error, which throws off
t5570.  Using test_i18ngrep instead of test_cmp allows the test to be
more flexible by only looking for the expected error and ignoring any
other output from the program.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
Junio C Hamano [Tue, 22 Oct 2013 18:38:42 +0000 (11:38 -0700)]
Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref

* jk/clone-progress-to-stderr:
  clone: always set transport options
  clone: treat "checking connectivity" like other progress
  clone: send diagnostic messages to stderr

7 years agot5570: Update for symref capability
Brian Gernhardt [Mon, 21 Oct 2013 17:54:11 +0000 (13:54 -0400)]
t5570: Update for symref capability

git-daemon now uses the symref capability to send the correct HEAD
reference, so the test for that in t5570 now passes.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoDocumentation: revamp gitk(1)
Thomas Rast [Sun, 20 Oct 2013 16:57:41 +0000 (18:57 +0200)]
Documentation: revamp gitk(1)

The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13).  In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.

Restructure and expand the manpage.  List more options that the author
perceives as useful, while remaining somewhat terse.  Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.

Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoReword repack documentation to no longer state it's a script
Stefan Beller [Fri, 18 Oct 2013 23:25:22 +0000 (01:25 +0200)]
Reword repack documentation to no longer state it's a script

This updates the documentation regarding the changes introduced
by a1bbc6c01 (2013-09-15, repack: rewrite the shell script in C).

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoFix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
Nguyễn Thái Ngọc Duy [Sat, 19 Oct 2013 02:41:24 +0000 (09:41 +0700)]
Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

When parse_pathspec() is called with no paths, the behavior could be
either return no paths, or return one path that is cwd. Some commands
do the former, some the latter. parse_pathspec() itself does not make
either the default and requires the caller to specify either flag if
it may run into this situation.

I've grep'd through all parse_pathspec() call sites. Some pass
neither, but those are guaranteed never pass empty path to
parse_pathspec(). There are two call sites that may pass empty path
and are fixed with this patch.

[jc: added a test from Antoine's bug report]

Reported-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoUpdate draft release notes to 1.8.5
Junio C Hamano [Fri, 18 Oct 2013 20:53:05 +0000 (13:53 -0700)]
Update draft release notes to 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'maint'
Junio C Hamano [Fri, 18 Oct 2013 20:53:48 +0000 (13:53 -0700)]
Merge branch 'maint'

* maint:
  git-merge: document the -S option

7 years agoMerge branch 'jc/reflog-doc'
Junio C Hamano [Fri, 18 Oct 2013 20:50:12 +0000 (13:50 -0700)]
Merge branch 'jc/reflog-doc'

Document rules to use GIT_REFLOG_ACTION variable in the scripted
Porcelain.  git-rebase--interactive locally violates them, but it
is a leaf user that does not call out to or dot-source other
scripts, so it does not urgently need to be fixed.

* jc/reflog-doc:
  setup_reflog_action: document the rules for using GIT_REFLOG_ACTION

7 years agoMerge branch 'sb/repack-in-c'
Junio C Hamano [Fri, 18 Oct 2013 20:49:56 +0000 (13:49 -0700)]
Merge branch 'sb/repack-in-c'

Rewrite "git repack" in C.

* sb/repack-in-c:
  repack: improve warnings about failure of renaming and removing files
  repack: retain the return value of pack-objects
  repack: rewrite the shell script in C

7 years agoMerge branch 'jk/clone-progress-to-stderr'
Junio C Hamano [Fri, 18 Oct 2013 20:49:51 +0000 (13:49 -0700)]
Merge branch 'jk/clone-progress-to-stderr'

Some progress and diagnostic messages from "git clone" were
incorrectly sent to the standard output stream, not to the standard
error stream.

* jk/clone-progress-to-stderr:
  clone: always set transport options
  clone: treat "checking connectivity" like other progress
  clone: send diagnostic messages to stderr

7 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Fri, 18 Oct 2013 20:49:00 +0000 (13:49 -0700)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: fr.po: 2135/2135 messages translated

7 years agocheckout: proper error message on 'git checkout foo bar --'
Matthieu Moy [Fri, 18 Oct 2013 09:25:58 +0000 (11:25 +0200)]
checkout: proper error message on 'git checkout foo bar --'

The previous code was detecting the presence of "--" by looking only at
argument 1. As a result, "git checkout foo bar --" was interpreted as an
ambiguous file/revision list, and errored out with:

error: pathspec 'foo' did not match any file(s) known to git.
error: pathspec 'bar' did not match any file(s) known to git.
error: pathspec '--' did not match any file(s) known to git.

This patch fixes it by walking through the argument list to find the
"--", and now complains about the number of references given.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocheckout: allow dwim for branch creation for "git checkout $branch --"
Matthieu Moy [Fri, 18 Oct 2013 09:25:57 +0000 (11:25 +0200)]
checkout: allow dwim for branch creation for "git checkout $branch --"

The "--" notation disambiguates files and branches, but as a side-effect
of the previous implementation, also disabled the branch auto-creation
when $branch does not exist.

A possible scenario is then:

git checkout $branch
=> fails if $branch is both a ref and a file, and suggests --

git checkout $branch --
=> refuses to create the $branch

This patch allows the second form to create $branch, and since the -- is
provided, it does not look for file named $branch.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agograph: fix coloring around octopus merges
Hemmo Nieminen [Wed, 16 Oct 2013 08:28:50 +0000 (11:28 +0300)]
graph: fix coloring around octopus merges

When drawing the graph of an octopus merge, we draw a horizontal line
from parents 3 and above into the asterisk representing the commit. The
sections of this line should be colored to match the graph lines coming
in from above.

However, if the commit is not in the left-most column we do not take
into account the columns to the left of the commit when calculating
these colors. Fix this by adding the appropriate offset to the column
index used for calculating the color.

Signed-off-by: Hemmo Nieminen <hemmo.nieminen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogit-merge: document the -S option
Nicolas Vigier [Mon, 14 Oct 2013 23:41:05 +0000 (01:41 +0200)]
git-merge: document the -S option

The option to gpg sign a merge commit is available but was not
documented. Use wording from the git-commit(1) manpage.

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agogc: remove gc.pid file at end of execution
Jonathan Nieder [Wed, 16 Oct 2013 23:11:46 +0000 (16:11 -0700)]
gc: remove gc.pid file at end of execution

This file isn't really harmful, but isn't useful either, and can create
minor annoyance for the user:

* It's confusing, as the presence of a *.pid file often implies that a
  process is currently running. A user running "ls .git/" and finding
  this file may incorrectly guess that a "git gc" is currently running.

* Leaving this file means that a "git gc" in an already gc-ed repo is
  no-longer a no-op. A user running "git gc" in a set of repositories,
  and then synchronizing this set (e.g. rsync -av, unison, ...) will see
  all the gc.pid files as changed, which creates useless noise.

This patch unlinks the file after the garbage collection is done, so that
gc.pid is actually present only during execution.

Future versions of Git may want to use the information left in the gc.pid
file (e.g. for policies like "don't attempt to run a gc if one has
already been ran less than X hours ago"). If so, this patch can safely be
reverted. For now, let's not bother the users.

Explained-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Improved-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: fr.po: 2135/2135 messages translated
Jean-Noel Avila [Wed, 21 Aug 2013 19:49:43 +0000 (21:49 +0200)]
l10n: fr.po: 2135/2135 messages translated

Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
7 years agoUpdate draft release notes to 1.8.5
Junio C Hamano [Thu, 17 Oct 2013 22:57:12 +0000 (15:57 -0700)]
Update draft release notes to 1.8.5

7 years agoMerge branch 'jk/format-patch-from'
Junio C Hamano [Thu, 17 Oct 2013 22:55:18 +0000 (15:55 -0700)]
Merge branch 'jk/format-patch-from'

"format-patch --from=<whom>" forgot to omit unnecessary in-body
from line, i.e. when <whom> is the same as the real author.

* jk/format-patch-from:
  format-patch: print in-body "From" only when needed

7 years agoMerge branch 'es/name-hash-no-trailing-slash-in-dirs'
Junio C Hamano [Thu, 17 Oct 2013 22:55:15 +0000 (15:55 -0700)]
Merge branch 'es/name-hash-no-trailing-slash-in-dirs'

Clean up the internal of the name-hash mechanism used to work
around case insensitivity on some filesystems to cleanly fix a
long-standing API glitch where the caller of cache_name_exists()
that ask about a directory with a counted string was required to
have '/' at one location past the end of the string.

* es/name-hash-no-trailing-slash-in-dirs:
  dir: revert work-around for retired dangerous behavior
  name-hash: stop storing trailing '/' on paths in index_state.dir_hash
  employ new explicit "exists in index?" API
  name-hash: refactor polymorphic index_name_exists()

7 years agoMerge branch 'jk/trailing-slash-in-pathspec'
Junio C Hamano [Thu, 17 Oct 2013 22:55:13 +0000 (15:55 -0700)]
Merge branch 'jk/trailing-slash-in-pathspec'

Code refactoring.

* jk/trailing-slash-in-pathspec:
  reset: handle submodule with trailing slash
  rm: re-use parse_pathspec's trailing-slash removal

7 years agoMerge branch 'lc/filter-branch-too-many-refs'
Junio C Hamano [Thu, 17 Oct 2013 22:55:12 +0000 (15:55 -0700)]
Merge branch 'lc/filter-branch-too-many-refs'

"git filter-branch" in a repository with many refs blew limit of
command line length.

* lc/filter-branch-too-many-refs:
  Allow git-filter-branch to process large repositories with lots of branches.

7 years agoMerge branch 'jc/checkout-detach-doc'
Junio C Hamano [Thu, 17 Oct 2013 22:55:08 +0000 (15:55 -0700)]
Merge branch 'jc/checkout-detach-doc'

"git checkout [--detach] <commit>" was listed poorly in the
synopsis section of its documentation.

* jc/checkout-detach-doc:
  checkout: update synopsys and documentation on detaching HEAD

7 years agoSync with maint
Junio C Hamano [Thu, 17 Oct 2013 22:54:28 +0000 (15:54 -0700)]
Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoStart preparing for 1.8.4.2
Junio C Hamano [Thu, 17 Oct 2013 22:50:45 +0000 (15:50 -0700)]
Start preparing for 1.8.4.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'jk/upload-pack-keepalive' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:46:01 +0000 (15:46 -0700)]
Merge branch 'jk/upload-pack-keepalive' into maint

* jk/upload-pack-keepalive:
  upload-pack: bump keepalive default to 5 seconds
  upload-pack: send keepalive packets during pack computation

7 years agoMerge branch 'bc/http-backend-allow-405' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:46:00 +0000 (15:46 -0700)]
Merge branch 'bc/http-backend-allow-405' into maint

* bc/http-backend-allow-405:
  http-backend: provide Allow header for 405

7 years agoMerge branch 'jc/cvsserver-perm-bit-fix' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:45:57 +0000 (15:45 -0700)]
Merge branch 'jc/cvsserver-perm-bit-fix' into maint

* jc/cvsserver-perm-bit-fix:
  cvsserver: pick up the right mode bits

7 years agoMerge branch 'js/add-i-mingw' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:45:56 +0000 (15:45 -0700)]
Merge branch 'js/add-i-mingw' into maint

* js/add-i-mingw:
  add--interactive: fix external command invocation on Windows

7 years agoMerge branch 'nd/git-dir-pointing-at-gitfile' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:45:55 +0000 (15:45 -0700)]
Merge branch 'nd/git-dir-pointing-at-gitfile' into maint

* nd/git-dir-pointing-at-gitfile:
  Make setup_git_env() resolve .git file when $GIT_DIR is not specified

7 years agoMerge branch 'jk/has-sha1-file-retry-packed' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:45:54 +0000 (15:45 -0700)]
Merge branch 'jk/has-sha1-file-retry-packed' into maint

* jk/has-sha1-file-retry-packed:
  has_sha1_file: re-check pack directory before giving up

7 years agoMerge branch 'ap/commit-author-mailmap' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:45:51 +0000 (15:45 -0700)]
Merge branch 'ap/commit-author-mailmap' into maint

* ap/commit-author-mailmap:
  commit: search author pattern against mailmap

7 years agoMerge branch 'es/rebase-i-no-abbrev' into maint
Junio C Hamano [Thu, 17 Oct 2013 22:45:50 +0000 (15:45 -0700)]
Merge branch 'es/rebase-i-no-abbrev' into maint

* es/rebase-i-no-abbrev:
  rebase -i: fix short SHA-1 collision
  t3404: rebase -i: demonstrate short SHA-1 collision
  t3404: make tests more self-contained

Conflicts:
t/t3404-rebase-interactive.sh