git/git.git
5 years agoConvert struct object to object_id
brian m. carlson [Tue, 10 Nov 2015 02:22:28 +0000 (02:22 +0000)]
Convert struct object to object_id

struct object is one of the major data structures dealing with object
IDs.  Convert it to use struct object_id instead of an unsigned char
array.  Convert get_object_hash to refer to the new member as well.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoAdd several uses of get_object_hash.
brian m. carlson [Tue, 10 Nov 2015 02:22:27 +0000 (02:22 +0000)]
Add several uses of get_object_hash.

Convert most instances where the sha1 member of struct object is
dereferenced to use get_object_hash.  Most instances that are passed to
functions that have versions taking struct object_id, such as
get_sha1_hex/get_oid_hex, or instances that can be trivially converted
to use struct object_id instead, are not converted.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoobject: introduce get_object_hash macro.
brian m. carlson [Tue, 10 Nov 2015 02:22:26 +0000 (02:22 +0000)]
object: introduce get_object_hash macro.

This macro is a temporary change to ease the transition of struct object
to use struct object_id.  It takes an argument of struct object and
returns the object's hash.  Provide this hash next to struct object for
easier conversion.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoref_newer: convert to use struct object_id
brian m. carlson [Tue, 10 Nov 2015 02:22:25 +0000 (02:22 +0000)]
ref_newer: convert to use struct object_id

Convert ref_newer and its caller to use struct object_id instead of
unsigned char *.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agopush_refs_with_export: convert to struct object_id
brian m. carlson [Tue, 10 Nov 2015 02:22:24 +0000 (02:22 +0000)]
push_refs_with_export: convert to struct object_id

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoget_remote_heads: convert to struct object_id
brian m. carlson [Tue, 10 Nov 2015 02:22:23 +0000 (02:22 +0000)]
get_remote_heads: convert to struct object_id

Replace an unsigned char array with struct object_id and express several
hard-coded constants in terms of GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoparse_fetch: convert to use struct object_id
brian m. carlson [Tue, 10 Nov 2015 02:22:22 +0000 (02:22 +0000)]
parse_fetch: convert to use struct object_id

Convert the parse_fetch function to use struct object_id.  Remove the
strlen check as get_oid_hex will fail safely on receiving a too-short
NUL-terminated string.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoadd_sought_entry_mem: convert to struct object_id
brian m. carlson [Tue, 10 Nov 2015 02:22:21 +0000 (02:22 +0000)]
add_sought_entry_mem: convert to struct object_id

Convert this function to use struct object_id.  Express several
hardcoded constants in terms of GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoConvert struct ref to use object_id.
brian m. carlson [Tue, 10 Nov 2015 02:22:20 +0000 (02:22 +0000)]
Convert struct ref to use object_id.

Use struct object_id in three fields in struct ref and convert all the
necessary places that use it.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agosha1_file: introduce has_object_file helper.
brian m. carlson [Tue, 10 Nov 2015 02:22:19 +0000 (02:22 +0000)]
sha1_file: introduce has_object_file helper.

Add has_object_file, which is a wrapper around has_sha1_file, but for
struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
5 years agoMerge branch 'master' of git://git.bogomips.org/git-svn
Jeff King [Fri, 20 Nov 2015 11:56:58 +0000 (06:56 -0500)]
Merge branch 'master' of git://git.bogomips.org/git-svn

* 'master' of git://git.bogomips.org/git-svn:
  git-svn: improve rebase/mkdirs performance

5 years agoMerge branch 'lf/ref-is-hidden-namespace'
Jeff King [Fri, 20 Nov 2015 11:56:11 +0000 (06:56 -0500)]
Merge branch 'lf/ref-is-hidden-namespace'

Extend transfer.hideRefs to work better with use of namespaces.

* lf/ref-is-hidden-namespace:
  t5509: add basic tests for hideRefs
  hideRefs: add support for matching full refs
  upload-pack: strip refs before calling ref_is_hidden()
  config.txt: document the semantics of hideRefs with namespaces

5 years agoMerge branch 'dk/gc-idx-wo-pack'
Jeff King [Fri, 20 Nov 2015 11:55:34 +0000 (06:55 -0500)]
Merge branch 'dk/gc-idx-wo-pack'

Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.

* dk/gc-idx-wo-pack:
  gc: remove garbage .idx files from pack dir
  t5304: test cleaning pack garbage
  prepare_packed_git(): refactor garbage reporting in pack directory

5 years agogit-svn: improve rebase/mkdirs performance
Dair Grant [Thu, 5 Nov 2015 10:26:15 +0000 (10:26 +0000)]
git-svn: improve rebase/mkdirs performance

Processing empty_dir directives becomes extremely slow for svn
repositories with a large enough history.

This is due to using a single hash to store the list of empty
directories, with the expensive step being purging items from
that hash using grep+delete.

Storing directories in a hash of hashes improves the performance
of this purge step and removes a potentially lengthy delay after
every rebase/mkdirs command.

The svn repository with this behaviour has 110K commits with
unhandled.log containing 170K empty_dir directives.

This takes 10 minutes to process when using a single hash, vs
3 seconds with a hash of hashes.

Signed-off-by: Dair Grant <dair@feralinteractive.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
5 years agoEleventh batch for 2.7
Junio C Hamano [Thu, 5 Nov 2015 23:26:08 +0000 (15:26 -0800)]
Eleventh batch for 2.7

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'ea/checkout-progress'
Junio C Hamano [Thu, 5 Nov 2015 23:24:28 +0000 (15:24 -0800)]
Merge branch 'ea/checkout-progress'

"git checkout" did not follow the usual "--[no-]progress"
convention and implemented only "--quiet" that is essentially
a superset of "--no-progress".  Extend the command to support the
usual "--[no-]progress".

* ea/checkout-progress:
  checkout: add --progress option

5 years agoMerge branch 'dt/http-range'
Junio C Hamano [Thu, 5 Nov 2015 23:24:27 +0000 (15:24 -0800)]
Merge branch 'dt/http-range'

A Range: request can be responded with a full response and when
asked properly libcurl knows how to strip the result down to the
requested range.  However, we were hand-crafting a range request
and it did not kick in.

* dt/http-range:
  http: use off_t to store partial file size
  http.c: use CURLOPT_RANGE for range requests

5 years agoSync with 2.6.3
Junio C Hamano [Thu, 5 Nov 2015 20:22:13 +0000 (12:22 -0800)]
Sync with 2.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoGit 2.6.3 v2.6.3
Junio C Hamano [Thu, 5 Nov 2015 20:20:34 +0000 (12:20 -0800)]
Git 2.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'rs/daemon-plug-child-leak' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:16 +0000 (12:18 -0800)]
Merge branch 'rs/daemon-plug-child-leak' into maint

"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.

* rs/daemon-plug-child-leak:
  daemon: plug memory leak
  run-command: factor out child_process_clear()

5 years agoMerge branch 'rs/wt-status-detached-branch-fix' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:15 +0000 (12:18 -0800)]
Merge branch 'rs/wt-status-detached-branch-fix' into maint

"git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.

* rs/wt-status-detached-branch-fix:
  wt-status: use skip_prefix() to get rid of magic string length constants
  wt-status: don't skip a magical number of characters blindly
  wt-status: avoid building bogus branch name with detached HEAD
  wt-status: exit early using goto in wt_shortstatus_print_tracking()
  t7060: add test for status --branch on a detached HEAD

5 years agoMerge branch 'jk/initialization-fix-to-add-submodule-odb' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:14 +0000 (12:18 -0800)]
Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint

We peek objects from submodule's object store by linking it to the
list of alternate object databases, but the code to do so forgot to
correctly initialize the list.

* jk/initialization-fix-to-add-submodule-odb:
  add_submodule_odb: initialize alt_odb list earlier

5 years agoMerge branch 'js/misc-fixes' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:13 +0000 (12:18 -0800)]
Merge branch 'js/misc-fixes' into maint

Various compilation fixes and squelching of warnings.

* js/misc-fixes:
  Correct fscanf formatting string for I64u values
  Silence GCC's "cast of pointer to integer of a different size" warning
  Squelch warning about an integer overflow

5 years agoMerge branch 'jc/add-u-A-default-to-top' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:12 +0000 (12:18 -0800)]
Merge branch 'jc/add-u-A-default-to-top' into maint

"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.

* jc/add-u-A-default-to-top:
  add: simplify -u/-A without pathspec

5 years agoMerge branch 'jk/delete-modechange-conflict' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:11 +0000 (12:18 -0800)]
Merge branch 'jk/delete-modechange-conflict' into maint

Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.

* jk/delete-modechange-conflict:
  merge: detect delete/modechange conflict
  t6031: generalize for recursive and resolve strategies
  t6031: move triple-rename test to t3030

5 years agoMerge branch 'js/imap-send-curl-compilation-fix' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:10 +0000 (12:18 -0800)]
Merge branch 'js/imap-send-curl-compilation-fix' into maint

"git imap-send" did not compile well with older version of cURL library.

* js/imap-send-curl-compilation-fix:
  imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available

5 years agoMerge branch 'rp/link-curl-before-ssl' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:08 +0000 (12:18 -0800)]
Merge branch 'rp/link-curl-before-ssl' into maint

The linkage order of libraries was wrong in places around libcurl.

* rp/link-curl-before-ssl:
  configure.ac: detect ssl need with libcurl
  Makefile: make curl-config path configurable
  Makefile: link libcurl before zlib

5 years agoMerge branch 'nd/clone-linked-checkout' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:07 +0000 (12:18 -0800)]
Merge branch 'nd/clone-linked-checkout' into maint

It was not possible to use a repository-lookalike created by "git
worktree add" as a local source of "git clone".

* nd/clone-linked-checkout:
  clone: better error when --reference is a linked checkout
  clone: allow --local from a linked checkout
  enter_repo: allow .git files in strict mode
  enter_repo: avoid duplicating logic, use is_git_directory() instead
  t0002: add test for enter_repo(), non-strict mode
  path.c: delete an extra space

5 years agoMerge branch 'sa/send-email-smtp-batch-data-limit' into maint
Junio C Hamano [Thu, 5 Nov 2015 20:18:06 +0000 (12:18 -0800)]
Merge branch 'sa/send-email-smtp-batch-data-limit' into maint

When "git send-email" wanted to talk over Net::SMTP::SSL,
Net::Cmd::datasend() did not like to be fed too many bytes at the
same time and failed to send messages.  Send the payload one line
at a time to work around the problem.

* sa/send-email-smtp-batch-data-limit:
  git-send-email.perl: Fixed sending of many/huge changes/patches

5 years agot5509: add basic tests for hideRefs
Lukas Fleischer [Thu, 5 Nov 2015 06:07:31 +0000 (07:07 +0100)]
t5509: add basic tests for hideRefs

Test whether regular and full hideRefs patterns work as expected when
namespaces are used.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agohideRefs: add support for matching full refs
Lukas Fleischer [Tue, 3 Nov 2015 07:58:16 +0000 (08:58 +0100)]
hideRefs: add support for matching full refs

In addition to matching stripped refs, one can now add hideRefs
patterns that the full (unstripped) ref is matched against. To
distinguish between stripped and full matches, those new patterns
must be prefixed with a circumflex (^).

This commit also removes support for the undocumented and unintended
hideRefs settings ".have" (suppressing all "have" lines) and
"capabilities^{}" (suppressing the capabilities line).

Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoupload-pack: strip refs before calling ref_is_hidden()
Lukas Fleischer [Thu, 5 Nov 2015 06:07:29 +0000 (07:07 +0100)]
upload-pack: strip refs before calling ref_is_hidden()

Make hideRefs handling in upload-pack consistent with the behavior
described in the documentation by stripping refs before comparing them
with prefixes in hideRefs.

Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoconfig.txt: document the semantics of hideRefs with namespaces
Lukas Fleischer [Tue, 3 Nov 2015 07:58:14 +0000 (08:58 +0100)]
config.txt: document the semantics of hideRefs with namespaces

Right now, there is no clear definition of how transfer.hideRefs should
behave when a namespace is set. Explain that hideRefs prefixes match
stripped names in that case. This is how hideRefs patterns are currently
handled in receive-pack.

Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoSync with maint
Junio C Hamano [Wed, 4 Nov 2015 22:21:41 +0000 (14:21 -0800)]
Sync with maint

* maint:

5 years agoMerge branch 'xf/user-manual-ff' into maint
Junio C Hamano [Wed, 4 Nov 2015 22:20:49 +0000 (14:20 -0800)]
Merge branch 'xf/user-manual-ff' into maint

* xf/user-manual-ff:
  user-manual: fix the description of fast-forward

5 years agoMerge branch 'xf/user-manual-markup' into maint
Junio C Hamano [Wed, 4 Nov 2015 22:20:47 +0000 (14:20 -0800)]
Merge branch 'xf/user-manual-markup' into maint

AsciiDoc markup fixes.

* xf/user-manual-markup:
  Documentation: match undefline with the text in old release notes
  Documentation: match underline with the text
  Documentation: fix header markup

5 years agoMerge branch 'jc/everyday-markup' into maint
Junio C Hamano [Wed, 4 Nov 2015 22:20:46 +0000 (14:20 -0800)]
Merge branch 'jc/everyday-markup' into maint

AsciiDoc markup fixes.

* jc/everyday-markup:
  Documentation/everyday: match undefline with the text

5 years agoMerge branch 'jc/em-dash-in-doc' into maint
Junio C Hamano [Wed, 4 Nov 2015 22:20:45 +0000 (14:20 -0800)]
Merge branch 'jc/em-dash-in-doc' into maint

AsciiDoc markup fixes.

* jc/em-dash-in-doc:
  Documentation: AsciiDoc spells em-dash as double-dashes, not triple

5 years agoMerge branch 'es/worktree-add' into maint
Junio C Hamano [Wed, 4 Nov 2015 22:20:44 +0000 (14:20 -0800)]
Merge branch 'es/worktree-add' into maint

* es/worktree-add:
  worktree: usage: denote <branch> as optional with 'add'

5 years agogc: remove garbage .idx files from pack dir
Doug Kelly [Wed, 4 Nov 2015 03:05:08 +0000 (21:05 -0600)]
gc: remove garbage .idx files from pack dir

Add a custom report_garbage handler to collect and remove
garbage .idx files from the pack directory.

Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agot5304: test cleaning pack garbage
Doug Kelly [Wed, 4 Nov 2015 03:05:07 +0000 (21:05 -0600)]
t5304: test cleaning pack garbage

Pack garbage, noticeably stale .idx files, can be cleaned up during
a garbage collection.  This tests to ensure such garbage is properly
cleaned up.

Note that the prior test for checking pack garbage with count-objects
left some stale garbage after the test exited.  This has also been
corrected.

Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoSync with maint
Junio C Hamano [Tue, 3 Nov 2015 23:41:50 +0000 (15:41 -0800)]
Sync with maint

5 years agoMerge branch 'mk/blame-error-message' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:42 +0000 (15:32 -0800)]
Merge branch 'mk/blame-error-message' into maint

The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
  blame: fix option name in error message

5 years agoMerge branch 'jk/merge-file-exit-code' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:41 +0000 (15:32 -0800)]
Merge branch 'jk/merge-file-exit-code' into maint

"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.

* jk/merge-file-exit-code:
  merge-file: clamp exit code to maximum 127

5 years agoMerge branch 'dt/name-hash-dir-entry-fix' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:40 +0000 (15:32 -0800)]
Merge branch 'dt/name-hash-dir-entry-fix' into maint

The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component).  This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.

* dt/name-hash-dir-entry-fix:
  name-hash: don't reuse cache_entry in dir_entry

5 years agoMerge branch 'jc/am-3-fallback-regression-fix' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:39 +0000 (15:32 -0800)]
Merge branch 'jc/am-3-fallback-regression-fix' into maint

"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).

* jc/am-3-fallback-regression-fix:
  am -3: do not let failed merge from completing the error codepath

5 years agoMerge branch 'jc/usage-stdin' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:38 +0000 (15:32 -0800)]
Merge branch 'jc/usage-stdin' into maint

The synopsis text and the usage string of subcommands that read
list of things from the standard input are often shown as if they
only take input from a file on a filesystem, which was misleading.

* jc/usage-stdin:
  usage: do not insist that standard input must come from a file

5 years agoMerge branch 'rt/placeholder-in-usage' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:37 +0000 (15:32 -0800)]
Merge branch 'rt/placeholder-in-usage' into maint

A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.

* rt/placeholder-in-usage:
  am, credential-cache: add angle brackets to usage string

5 years agoMerge branch 'dt/t7063-fix-flaky-test' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:36 +0000 (15:32 -0800)]
Merge branch 'dt/t7063-fix-flaky-test' into maint

* dt/t7063-fix-flaky-test:
  t7063: fix flaky untracked-cache test

5 years agoMerge branch 'mk/submodule-gitdir-path' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:34 +0000 (15:32 -0800)]
Merge branch 'mk/submodule-gitdir-path' into maint

The submodule code has been taught to work better with separate
work trees created via "git worktree add".

* mk/submodule-gitdir-path:
  path: implement common_dir handling in git_pathdup_submodule()
  submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()

5 years agoMerge branch 'nd/gc-auto-background-fix' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:33 +0000 (15:32 -0800)]
Merge branch 'nd/gc-auto-background-fix' into maint

When "git gc --auto" is backgrounded, its diagnosis message is
lost.  Save it to a file in $GIT_DIR and show it next time the "gc
--auto" is run.

* nd/gc-auto-background-fix:
  gc: save log from daemonized gc --auto and print it next time

5 years agoMerge branch 'ls/p4-translation-failure' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:31 +0000 (15:32 -0800)]
Merge branch 'ls/p4-translation-failure' into maint

Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.

* ls/p4-translation-failure:
  git-p4: handle "Translation of file content failed"
  git-p4: add test case for "Translation of file content failed" error

5 years agoMerge branch 'gr/rebase-i-drop-warn' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:30 +0000 (15:32 -0800)]
Merge branch 'gr/rebase-i-drop-warn' into maint

Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.

* gr/rebase-i-drop-warn:
  rebase-i: work around Windows CRLF line endings
  t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings

5 years agoMerge branch 'js/clone-dissociate' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:28 +0000 (15:32 -0800)]
Merge branch 'js/clone-dissociate' into maint

"git clone --dissociate" runs a big "git repack" process at the
end, and it helps to close file descriptors that are open on the
packs and their idx files before doing so on filesystems that
cannot remove a file that is still open.

* js/clone-dissociate:
  clone --dissociate: avoid locking pack files
  sha1_file.c: add a function to release all packs
  sha1_file: consolidate code to close a pack's file descriptor
  t5700: demonstrate a Windows file locking issue with `git clone --dissociate`

5 years agoMerge branch 'ld/p4-import-labels' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:27 +0000 (15:32 -0800)]
Merge branch 'ld/p4-import-labels' into maint

Correct "git p4 --detect-labels" so that it does not fail to create
a tag that points at a commit that is also being imported.

* ld/p4-import-labels:
  git-p4: fix P4 label import for unprocessed commits
  git-p4: do not terminate creating tag for unknown commit
  git-p4: failing test for ignoring invalid p4 labels

5 years agoMerge branch 'tk/stripspace' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:26 +0000 (15:32 -0800)]
Merge branch 'tk/stripspace' into maint

The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.

* tk/stripspace:
  stripspace: use parse-options for command-line parsing
  strbuf: make stripspace() part of strbuf

5 years agoMerge branch 'jk/repository-extension' into maint
Junio C Hamano [Tue, 3 Nov 2015 23:32:25 +0000 (15:32 -0800)]
Merge branch 'jk/repository-extension' into maint

Prepare for Git on-disk repository representation to undergo
backward incompatible changes by introducing a new repository
format version "1", with an extension mechanism.

* jk/repository-extension:
  introduce "preciousObjects" repository extension
  introduce "extensions" form of core.repositoryformatversion

5 years agoTenth batch for 2.7
Junio C Hamano [Tue, 3 Nov 2015 23:18:22 +0000 (15:18 -0800)]
Tenth batch for 2.7

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'rs/daemon-plug-child-leak'
Junio C Hamano [Tue, 3 Nov 2015 23:13:11 +0000 (15:13 -0800)]
Merge branch 'rs/daemon-plug-child-leak'

"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.

* rs/daemon-plug-child-leak:
  daemon: plug memory leak
  run-command: factor out child_process_clear()

5 years agoMerge branch 'mk/blame-first-parent'
Junio C Hamano [Tue, 3 Nov 2015 23:13:09 +0000 (15:13 -0800)]
Merge branch 'mk/blame-first-parent'

"git blame" learnt to take "--first-parent" and "--reverse" at the
same time when it makes sense.

* mk/blame-first-parent:
  blame: allow blame --reverse --first-parent when it makes sense
  blame: extract find_single_final
  blame: test to describe use of blame --reverse --first-parent

5 years agoMerge branch 'rs/wt-status-detached-branch-fix'
Junio C Hamano [Tue, 3 Nov 2015 23:13:08 +0000 (15:13 -0800)]
Merge branch 'rs/wt-status-detached-branch-fix'

"git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.

* rs/wt-status-detached-branch-fix:
  wt-status: use skip_prefix() to get rid of magic string length constants
  wt-status: don't skip a magical number of characters blindly
  wt-status: avoid building bogus branch name with detached HEAD
  wt-status: exit early using goto in wt_shortstatus_print_tracking()
  t7060: add test for status --branch on a detached HEAD

5 years agoMerge branch 'rs/show-branch-argv-array'
Junio C Hamano [Tue, 3 Nov 2015 23:13:06 +0000 (15:13 -0800)]
Merge branch 'rs/show-branch-argv-array'

Code simplification.

* rs/show-branch-argv-array:
  show-branch: use argv_array for default arguments

5 years agoMerge branch 'js/git-gdb'
Junio C Hamano [Tue, 3 Nov 2015 23:13:05 +0000 (15:13 -0800)]
Merge branch 'js/git-gdb'

Allow easier debugging of a single "git" invocation in our test
scripts.

* js/git-gdb:
  test: facilitate debugging Git executables in tests with gdb

5 years agoMerge branch 'jk/initialization-fix-to-add-submodule-odb'
Junio C Hamano [Tue, 3 Nov 2015 23:13:04 +0000 (15:13 -0800)]
Merge branch 'jk/initialization-fix-to-add-submodule-odb'

We peek objects from submodule's object store by linking it to the
list of alternate object databases, but the code to do so forgot to
correctly initialize the list.

* jk/initialization-fix-to-add-submodule-odb:
  add_submodule_odb: initialize alt_odb list earlier

5 years agoMerge branch 'da/difftool'
Junio C Hamano [Tue, 3 Nov 2015 23:13:01 +0000 (15:13 -0800)]
Merge branch 'da/difftool'

The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them.  Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.

* da/difftool:
  difftool: ignore symbolic links in use_wt_file

5 years agoMerge branch 'jc/mailinfo-lib'
Junio C Hamano [Tue, 3 Nov 2015 23:12:59 +0000 (15:12 -0800)]
Merge branch 'jc/mailinfo-lib'

Hotfix for a topic already in 'master'.

* jc/mailinfo-lib:
  mailinfo: fix passing wrong address to git_mailinfo_config

5 years agoMerge branch 'kn/for-each-branch'
Junio C Hamano [Tue, 3 Nov 2015 23:12:55 +0000 (15:12 -0800)]
Merge branch 'kn/for-each-branch'

Using the timestamp based criteria in "git branch --sort" did not
tiebreak branches that point at commits with the same timestamp (or
the same commit), making the resulting output unstable.

* kn/for-each-branch:
  ref-filter: fallback on alphabetical comparison

5 years agodaemon: plug memory leak
René Scharfe [Sat, 24 Oct 2015 12:23:20 +0000 (14:23 +0200)]
daemon: plug memory leak

Call child_process_clear() when a child ends to release the memory
allocated for its environment.  This is necessary because unlike all
other users of start_command() we don't call finish_command(), which
would have taken care of that for us.

This leak was introduced by f063d38b (daemon: use cld->env_array
when re-spawning).

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agorun-command: factor out child_process_clear()
René Scharfe [Sat, 24 Oct 2015 12:11:27 +0000 (14:11 +0200)]
run-command: factor out child_process_clear()

Avoid duplication by moving the code to release allocated memory for
arguments and environment to its own function, child_process_clear().
Export it to provide a counterpart to child_process_init().

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agohttp: use off_t to store partial file size
Jeff King [Mon, 2 Nov 2015 22:10:27 +0000 (17:10 -0500)]
http: use off_t to store partial file size

When we try to resume transfer of a partially-downloaded
object or pack, we fopen() the existing file for append,
then use ftell() to get the current position. We use a
"long", which can hold only 2GB on a 32-bit system, even
though packfiles may be larger than that.

Let's switch to using off_t, which should hold any file size
our system is capable of storing. We need to use ftello() to
get the off_t. This is in POSIX and hopefully available
everywhere; if not, we should be able to wrap it by falling
back to ftell(), which would presumably return "-1" on such
a large file (and we would simply skip resuming in that case).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agohttp.c: use CURLOPT_RANGE for range requests
David Turner [Mon, 2 Nov 2015 21:39:58 +0000 (16:39 -0500)]
http.c: use CURLOPT_RANGE for range requests

A HTTP server is permitted to return a non-range response to a HTTP
range request (and Apache httpd in fact does this in some cases).
While libcurl knows how to correctly handle this (by skipping bytes
before and after the requested range), it only turns on this handling
if it is aware that a range request is being made.  By manually
setting the range header instead of using CURLOPT_RANGE, we were
hiding the fact that this was a range request from libcurl.  This
could cause corruption.

Signed-off-by: David Turner <dturner@twopensource.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agocheckout: add --progress option
Edmundo Carmona Antoranz [Sun, 1 Nov 2015 21:19:05 +0000 (15:19 -0600)]
checkout: add --progress option

Under normal circumstances, and like other git commands,
git checkout will write progress info to stderr if
attached to a terminal. This option allows progress
to be forced even if not using a terminal. Also,
progress can be skipped if using option --no-progress.

Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agomailinfo: fix passing wrong address to git_mailinfo_config
Nguyễn Thái Ngọc Duy [Sun, 1 Nov 2015 14:30:30 +0000 (15:30 +0100)]
mailinfo: fix passing wrong address to git_mailinfo_config

git_mailinfo_config() expects "struct mailinfo *". But in
setup_mailinfo(), "mi" is already "struct mailinfo *". &mi would make
it "struct mailinfo **" and git_mailinfo_config() would damage some
other memory when it assigns some value to mi->use_scissors.

This is caught by t4150.20. git_mailinfo_config() breaks
mi->name.alloc and makes strbuf_release() in clear_mailinfo() attempt
to free strbuf_slopbuf.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoshow-branch: use argv_array for default arguments
René Scharfe [Sat, 31 Oct 2015 19:06:45 +0000 (20:06 +0100)]
show-branch: use argv_array for default arguments

Use argv_array instead of open-coding it.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agowt-status: use skip_prefix() to get rid of magic string length constants
René Scharfe [Sat, 31 Oct 2015 17:37:43 +0000 (18:37 +0100)]
wt-status: use skip_prefix() to get rid of magic string length constants

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agowt-status: don't skip a magical number of characters blindly
René Scharfe [Sat, 31 Oct 2015 17:37:12 +0000 (18:37 +0100)]
wt-status: don't skip a magical number of characters blindly

Use the variable branch_name, which already has "refs/heads/" removed,
instead of blindly advancing in the ->branch string by 11 bytes.  This
is safer and less magical.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agowt-status: avoid building bogus branch name with detached HEAD
René Scharfe [Sat, 31 Oct 2015 17:36:35 +0000 (18:36 +0100)]
wt-status: avoid building bogus branch name with detached HEAD

If we're on a detached HEAD then wt_shortstatus_print_tracking() takes
the string "HEAD (no branch)", translates it, skips the first eleven
characters and passes the result to branch_get(), which returns a bogus
result and accesses memory out of bounds in order to produce it.
Somehow stat_tracking_info(), which is passed that result, does the
right thing anyway, i.e. it finds that there is no base.

Avoid the bogus results and memory accesses by checking for HEAD first
and exiting early in that case.  This fixes t7060 with --valgrind.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agowt-status: exit early using goto in wt_shortstatus_print_tracking()
René Scharfe [Sat, 31 Oct 2015 17:36:01 +0000 (18:36 +0100)]
wt-status: exit early using goto in wt_shortstatus_print_tracking()

Deduplicate printing the line terminator by jumping to the end of the
function.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agot7060: add test for status --branch on a detached HEAD
René Scharfe [Sat, 31 Oct 2015 17:35:32 +0000 (18:35 +0100)]
t7060: add test for status --branch on a detached HEAD

This test fails when run under Valgrind because branch_get() gets passed
a bogus branch name pointer:

==62831== Invalid read of size 1
==62831==    at 0x4F76AE: branch_get (remote.c:1650)
==62831==    by 0x53499E: wt_shortstatus_print_tracking (wt-status.c:1654)
==62831==    by 0x53499E: wt_shortstatus_print (wt-status.c:1706)
==62831==    by 0x428D29: cmd_status (commit.c:1384)
==62831==    by 0x405D6D: run_builtin (git.c:350)
==62831==    by 0x405D6D: handle_builtin (git.c:536)
==62831==    by 0x404F10: run_argv (git.c:582)
==62831==    by 0x404F10: main (git.c:690)
==62831==  Address 0x5e89b0b is 6 bytes after a block of size 5 alloc'd
==62831==    at 0x4C28C4F: malloc (vg_replace_malloc.c:299)
==62831==    by 0x59579E9: strdup (strdup.c:42)
==62831==    by 0x52E108: xstrdup (wrapper.c:43)
==62831==    by 0x5322A6: wt_status_prepare (wt-status.c:130)
==62831==    by 0x4276E0: status_init_config (commit.c:184)
==62831==    by 0x428BB8: cmd_status (commit.c:1350)
==62831==    by 0x405D6D: run_builtin (git.c:350)
==62831==    by 0x405D6D: handle_builtin (git.c:536)
==62831==    by 0x404F10: run_argv (git.c:582)
==62831==    by 0x404F10: main (git.c:690)

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoblame: allow blame --reverse --first-parent when it makes sense
Max Kirillov [Fri, 30 Oct 2015 05:01:53 +0000 (07:01 +0200)]
blame: allow blame --reverse --first-parent when it makes sense

Allow combining --reverse and --first-parent if initial commit of
specified range is at the first-parent chain starting from the final
commit. Disable the prepare_revision_walk()'s builtin children
collection, instead picking only the ones which are along the first
parent chain.

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoblame: extract find_single_final
Max Kirillov [Fri, 30 Oct 2015 05:01:52 +0000 (07:01 +0200)]
blame: extract find_single_final

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoblame: test to describe use of blame --reverse --first-parent
Max Kirillov [Fri, 30 Oct 2015 05:01:51 +0000 (07:01 +0200)]
blame: test to describe use of blame --reverse --first-parent

Reverse blame can be used to locate removal of lines which does not
change adjacent lines. Such edits do not appear in non-reverse blame,
because the adjacent lines last changed commit is older history, before
the edit.

For a big and active project which uses topic branches, or analogous
feature, for example pull-requests, the history can contain many
concurrent branches, and even after an edit merged into the target
branch, there are still many (sometimes several tens or even hundreds)
topic branch which do not contain it:

 a0--a1-----*a2-*a3-a4...-*a100
 |\         /   /         /
 | b0-B1..bN   /         /
 |\           /         /
 | c0..   ..cN         /
 \                    /
  z0..            ..zN

Here, the '*'s mark the first parent in merge, and uppercase B1 - the
commit where the line being blamed for was removed. Since commits cN-zN
do not contain B1, they still have the line removed in B1, and
reverse blame can report that the last commit for the line was zN
(meaning that it was removed in a100). In fact it really does return
some very late commit, and this makes it unusable for finding the B1
commit.

The search could be done by blame --reverse --first-parent. For range
a0..a100 it would return a1, and then only one additional blame along
the a0..bN will return the desired commit b0. But combining --reverse
and --first-parent was forbidden in 95a4fb0eac, because incorrectly
specified range could produce unexpected and meaningless result.

Add test which describes the expected behavior of
`blame --reverse --first-parent` in the case described above.

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agotest: facilitate debugging Git executables in tests with gdb
Johannes Schindelin [Fri, 30 Oct 2015 19:02:56 +0000 (12:02 -0700)]
test: facilitate debugging Git executables in tests with gdb

When prefixing a Git call in the test suite with 'debug ', it will
now be run with GDB, allowing the developer to debug test failures
more conveniently.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoref-filter: fallback on alphabetical comparison
Karthik Nayak [Fri, 30 Oct 2015 08:45:28 +0000 (14:15 +0530)]
ref-filter: fallback on alphabetical comparison

In ref-filter.c the comparison of refs while sorting is handled by
cmp_ref_sorting() function. When sorting as per numerical values
(e.g. --sort=objectsize) there is no fallback comparison when both
refs hold the same value. This can cause unexpected results (i.e. the
order of listing refs with equal values cannot be pre-determined) as
pointed out by Johannes Sixt ($gmane/280117).

Hence, fallback to alphabetical comparison based on the refname
whenever the other criterion is equal.

A test in t3203 was expecting that branch-two sorts before HEAD, which
happened to be how qsort(3) on Linux sorted the array, but (1) that
outcome was not even guaranteed, and (2) once we start breaking ties
with the refname, "HEAD" should sort before "branch-two" so the
original expectation was inconsistent with the criterion we now use.

Update it to match the new world order, which we can now depend on
being stable.

Helped-by: Junio C Hamano <gitster@pobox.com>
Reported-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoNinth batch for 2.7
Junio C Hamano [Fri, 30 Oct 2015 20:17:31 +0000 (13:17 -0700)]
Ninth batch for 2.7

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years agoMerge branch 'jk/merge-file-exit-code'
Junio C Hamano [Fri, 30 Oct 2015 20:07:08 +0000 (13:07 -0700)]
Merge branch 'jk/merge-file-exit-code'

"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.

* jk/merge-file-exit-code:
  merge-file: clamp exit code to maximum 127

5 years agoMerge branch 'gr/rebase-i-drop-warn'
Junio C Hamano [Fri, 30 Oct 2015 20:07:06 +0000 (13:07 -0700)]
Merge branch 'gr/rebase-i-drop-warn'

Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.

* gr/rebase-i-drop-warn:
  rebase-i: work around Windows CRLF line endings
  t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings

5 years agoMerge branch 'xf/user-manual-ff'
Junio C Hamano [Fri, 30 Oct 2015 20:07:05 +0000 (13:07 -0700)]
Merge branch 'xf/user-manual-ff'

* xf/user-manual-ff:
  user-manual: fix the description of fast-forward

5 years agoMerge branch 'rs/pop-commit'
Junio C Hamano [Fri, 30 Oct 2015 20:07:03 +0000 (13:07 -0700)]
Merge branch 'rs/pop-commit'

Code simplification.

* rs/pop-commit:
  use pop_commit() for consuming the first entry of a struct commit_list

5 years agoMerge branch 'mk/blame-error-message'
Junio C Hamano [Fri, 30 Oct 2015 20:07:01 +0000 (13:07 -0700)]
Merge branch 'mk/blame-error-message'

The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
  blame: fix option name in error message

5 years agoMerge branch 'js/misc-fixes'
Junio C Hamano [Fri, 30 Oct 2015 20:06:59 +0000 (13:06 -0700)]
Merge branch 'js/misc-fixes'

Various compilation fixes and squelching of warnings.

* js/misc-fixes:
  Correct fscanf formatting string for I64u values
  Silence GCC's "cast of pointer to integer of a different size" warning
  Squelch warning about an integer overflow

5 years agoMerge branch 'js/imap-send-curl-compilation-fix'
Junio C Hamano [Fri, 30 Oct 2015 20:06:58 +0000 (13:06 -0700)]
Merge branch 'js/imap-send-curl-compilation-fix'

"git imap-send" did not compile well with older version of cURL library.

* js/imap-send-curl-compilation-fix:
  imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available

5 years agoMerge branch 'jk/delete-modechange-conflict'
Junio C Hamano [Fri, 30 Oct 2015 20:06:56 +0000 (13:06 -0700)]
Merge branch 'jk/delete-modechange-conflict'

Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.

* jk/delete-modechange-conflict:
  merge: detect delete/modechange conflict
  t6031: generalize for recursive and resolve strategies
  t6031: move triple-rename test to t3030

5 years agoMerge branch 'jc/add-u-A-default-to-top'
Junio C Hamano [Fri, 30 Oct 2015 20:06:55 +0000 (13:06 -0700)]
Merge branch 'jc/add-u-A-default-to-top'

"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.

* jc/add-u-A-default-to-top:
  add: simplify -u/-A without pathspec

5 years agoMerge branch 'ar/clone-dissociate'
Junio C Hamano [Fri, 30 Oct 2015 20:06:53 +0000 (13:06 -0700)]
Merge branch 'ar/clone-dissociate'

"git clone --dissociate" used to require that "--reference" was
used at the same time, but you can create a new repository that
borrows objects from another without using "--reference", namely
with "clone --local" from a repository that borrows objects from
other repositories.

* ar/clone-dissociate:
  clone: allow "--dissociate" without reference

5 years agoMerge git://ozlabs.org/~paulus/gitk
Junio C Hamano [Fri, 30 Oct 2015 16:02:27 +0000 (09:02 -0700)]
Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Update Russian translation
  gitk: Add accelerator to German locale
  gitk: Add accelerators to Japanese locale
  gitk: Update msgid's for menu items with accelerator
  gitk: l10n: Update Catalan translation
  gitk: Add missing accelerators
  Updated Vietnamese translation

5 years agoMerge https://github.com/vnwildman/gitk
Paul Mackerras [Fri, 30 Oct 2015 10:01:55 +0000 (21:01 +1100)]
Merge https://github.com/vnwildman/gitk

This brings in an update to the Vietnamese translation.

Signed-off-by: Paul Mackerras <paulus@samba.org>
5 years agogitk: Update Russian translation
Dimitriy Ryazantcev [Tue, 13 Oct 2015 09:52:46 +0000 (12:52 +0300)]
gitk: Update Russian translation

Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
5 years agogitk: Add accelerator to German locale
Takashi Iwai [Tue, 20 Oct 2015 12:33:04 +0000 (14:33 +0200)]
gitk: Add accelerator to German locale

Assigned either to the first letter or some unique letter.  At least
there are no conflicts, as far as I see...

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
5 years agogitk: Add accelerators to Japanese locale
Takashi Iwai [Tue, 20 Oct 2015 12:33:03 +0000 (14:33 +0200)]
gitk: Add accelerators to Japanese locale

Just follow the English accelerator keys.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>