gitweb.git
Merge branch 'ye/doc-http-proto'Junio C Hamano Wed, 25 Jun 2014 19:23:52 +0000 (12:23 -0700)

Merge branch 'ye/doc-http-proto'

* ye/doc-http-proto:
http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

Merge branch 'rs/blame-refactor'Junio C Hamano Wed, 25 Jun 2014 19:23:36 +0000 (12:23 -0700)

Merge branch 'rs/blame-refactor'

* rs/blame-refactor:
blame: simplify prepare_lines()
blame: factor out get_next_line()

Merge branch 'pb/trim-trailing-spaces'Junio C Hamano Wed, 25 Jun 2014 19:23:34 +0000 (12:23 -0700)

Merge branch 'pb/trim-trailing-spaces'

* pb/trim-trailing-spaces:
t0008: do not depend on 'echo' handling backslashes specially

Merge branch 'mc/doc-submodule-sync-recurse'Junio C Hamano Wed, 25 Jun 2014 19:23:29 +0000 (12:23 -0700)

Merge branch 'mc/doc-submodule-sync-recurse'

* mc/doc-submodule-sync-recurse:
submodule: document "sync --recursive"

Merge branch 'sp/complete-ext-alias'Junio C Hamano Wed, 25 Jun 2014 19:23:27 +0000 (12:23 -0700)

Merge branch 'sp/complete-ext-alias'

* sp/complete-ext-alias:
completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

Merge branch 'mc/git-p4-prepare-p4-only'Junio C Hamano Wed, 25 Jun 2014 19:23:24 +0000 (12:23 -0700)

Merge branch 'mc/git-p4-prepare-p4-only'

* mc/git-p4-prepare-p4-only:
git-p4: fix submit in non --prepare-p4-only mode

Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano Wed, 25 Jun 2014 19:23:19 +0000 (12:23 -0700)

Merge branch 'jk/repack-pack-writebitmaps-config'

* jk/repack-pack-writebitmaps-config:
t7700: drop explicit --no-pack-kept-objects from .keep test
repack: introduce repack.writeBitmaps config option
repack: simplify handling of --write-bitmap-index
pack-objects: stop respecting pack.writebitmaps

Merge branch 'nd/init-restore-env'Junio C Hamano Wed, 25 Jun 2014 19:22:00 +0000 (12:22 -0700)

Merge branch 'nd/init-restore-env'

Some subcommands do not want to be aliased because of the side
effects that happens while the definitions of the aliases are looked
up from configuration system.

* nd/init-restore-env:
git potty: restore environments after alias expansion

Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano Wed, 25 Jun 2014 19:21:51 +0000 (12:21 -0700)

Merge branch 'jk/repack-pack-keep-objects'

Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.

* jk/repack-pack-keep-objects:
repack: s/write_bitmap/&s/ in code
repack: respect pack.writebitmaps
repack: do not accidentally pack kept objects by default

Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'Junio C Hamano Wed, 25 Jun 2014 19:21:45 +0000 (12:21 -0700)

Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'

* fr/sequencer-fail-with-not-one-upon-no-ff:
sequencer: signal failed ff as an aborted, not a conflicted merge

Fourth batch for 2.1Junio C Hamano Fri, 20 Jun 2014 20:22:55 +0000 (13:22 -0700)

Fourth batch for 2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/test-lazy-prereq' (early part)Junio C Hamano Fri, 20 Jun 2014 20:21:26 +0000 (13:21 -0700)

Merge branch 'jc/test-lazy-prereq' (early part)

* 'jc/test-lazy-prereq' (early part):
t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3302: do not chdir around in the primary test process
t3302: coding style updates
test: turn USR_BIN_TIME into a lazy prerequisite
test: turn EXPENSIVE into a lazy prerequisite

Merge branch 'jc/fetch-pull-refmap'Junio C Hamano Fri, 20 Jun 2014 20:14:10 +0000 (13:14 -0700)

Merge branch 'jc/fetch-pull-refmap'

* jc/fetch-pull-refmap:
docs: Explain the purpose of fetch's and pull's <refspec> parameter.
fetch: allow explicit --refmap to override configuration
fetch doc: add a section on configured remote-tracking branches
fetch doc: remove "short-cut" section
fetch doc: update refspec format description
fetch doc: on pulling multiple refspecs
fetch doc: remove notes on outdated "mixed layout"
fetch doc: update note on '+' in front of the refspec
fetch doc: move FETCH_HEAD material lower and add an example
fetch doc: update introductory part for clarity

Merge branch 'mt/send-email-cover-to-cc'Junio C Hamano Fri, 20 Jun 2014 20:12:19 +0000 (13:12 -0700)

Merge branch 'mt/send-email-cover-to-cc'

* mt/send-email-cover-to-cc:
t9001: avoid non-portable '\n' with sed
test/send-email: to-cover, cc-cover tests
git-send-email: two new options: to-cover, cc-cover

Merge branch 'tb/t5551-clone-notice-to-stderr'Junio C Hamano Fri, 20 Jun 2014 20:12:17 +0000 (13:12 -0700)

Merge branch 'tb/t5551-clone-notice-to-stderr'

* tb/t5551-clone-notice-to-stderr:
t5551: fix the 50,000 tag test

Merge branch 'rs/more-starts-with'Junio C Hamano Fri, 20 Jun 2014 20:12:13 +0000 (13:12 -0700)

Merge branch 'rs/more-starts-with'

* rs/more-starts-with:
Use starts_with() for C strings instead of memcmp()

Merge branch 'jm/api-strbuf-doc'Junio C Hamano Fri, 20 Jun 2014 20:12:10 +0000 (13:12 -0700)

Merge branch 'jm/api-strbuf-doc'

* jm/api-strbuf-doc:
api-strbuf.txt minor typos

Merge branch 'jc/revision-dash-count-parsing'Junio C Hamano Fri, 20 Jun 2014 20:10:25 +0000 (13:10 -0700)

Merge branch 'jc/revision-dash-count-parsing'

"git log -2master" is a common typo that shows two commits starting
from whichever random branch that is not 'master' that happens to
be checked out currently.

* jc/revision-dash-count-parsing:
revision: parse "git log -<count>" more carefully

Third batch for 2.1Junio C Hamano Mon, 16 Jun 2014 19:39:35 +0000 (12:39 -0700)

Third batch for 2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ib/test-selectively-run'Junio C Hamano Mon, 16 Jun 2014 19:18:56 +0000 (12:18 -0700)

Merge branch 'ib/test-selectively-run'

Allow specifying only certain individual test pieces to be run
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").

* ib/test-selectively-run:
t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
test-lib: '--run' to run only specific tests
test-lib: tests skipped by GIT_SKIP_TESTS say so
test-lib: document short options in t/README

Merge branch 'ta/string-list-init'Junio C Hamano Mon, 16 Jun 2014 19:18:55 +0000 (12:18 -0700)

Merge branch 'ta/string-list-init'

* ta/string-list-init:
string-list: spell all values out that are given to a string_list initializer

Merge branch 'jm/dedup-test-config'Junio C Hamano Mon, 16 Jun 2014 19:18:54 +0000 (12:18 -0700)

Merge branch 'jm/dedup-test-config'

* jm/dedup-test-config:
t/t7810-grep.sh: remove duplicate test_config()

Merge branch 'dt/refs-check-refname-component-optim'Junio C Hamano Mon, 16 Jun 2014 19:18:52 +0000 (12:18 -0700)

Merge branch 'dt/refs-check-refname-component-optim'

* dt/refs-check-refname-component-optim:
refs.c: optimize check_refname_component()

Merge branch 'sk/test-cmp-bin'Junio C Hamano Mon, 16 Jun 2014 19:18:50 +0000 (12:18 -0700)

Merge branch 'sk/test-cmp-bin'

* sk/test-cmp-bin:
t5000, t5003: do not use test_cmp to compare binary files

Merge branch 'sh/enable-preloadindex'Junio C Hamano Mon, 16 Jun 2014 19:18:49 +0000 (12:18 -0700)

Merge branch 'sh/enable-preloadindex'

* sh/enable-preloadindex:
environment.c: enable core.preloadindex by default

Merge branch 'rs/read-ref-at'Junio C Hamano Mon, 16 Jun 2014 19:18:48 +0000 (12:18 -0700)

Merge branch 'rs/read-ref-at'

* rs/read-ref-at:
refs.c: change read_ref_at to use the reflog iterators

Merge branch 'jk/error-resolve-conflict-advice'Junio C Hamano Mon, 16 Jun 2014 19:18:47 +0000 (12:18 -0700)

Merge branch 'jk/error-resolve-conflict-advice'

* jk/error-resolve-conflict-advice:
error_resolve_conflict: drop quotations around operation
error_resolve_conflict: rewrap advice message

Merge branch 'rs/pack-objects-no-unnecessary-realloc'Junio C Hamano Mon, 16 Jun 2014 19:18:42 +0000 (12:18 -0700)

Merge branch 'rs/pack-objects-no-unnecessary-realloc'

Avoid unnecessary copy of previous contents when extending the
hashtable used in pack-objects.

* rs/pack-objects-no-unnecessary-realloc:
pack-objects: use free()+xcalloc() instead of xrealloc()+memset()

Merge branch 'lt/log-auto-decorate'Junio C Hamano Mon, 16 Jun 2014 19:18:41 +0000 (12:18 -0700)

Merge branch 'lt/log-auto-decorate'

* lt/log-auto-decorate:
git log: support "auto" decorations

Merge branch 'jm/doc-wording-tweaks'Junio C Hamano Mon, 16 Jun 2014 19:18:39 +0000 (12:18 -0700)

Merge branch 'jm/doc-wording-tweaks'

* jm/doc-wording-tweaks:
Documentation: wording fixes in the user manual and glossary

Merge branch 'jm/format-patch-mail-sig'Junio C Hamano Mon, 16 Jun 2014 19:18:38 +0000 (12:18 -0700)

Merge branch 'jm/format-patch-mail-sig'

* jm/format-patch-mail-sig:
format-patch: add "--signature-file=<file>" option
format-patch: make newline after signature conditional

Merge branch 'jk/http-errors'Junio C Hamano Mon, 16 Jun 2014 19:18:35 +0000 (12:18 -0700)

Merge branch 'jk/http-errors'

Propagate the error messages from the webserver better to the
client coming over the HTTP transport.

* jk/http-errors:
http: default text charset to iso-8859-1
remote-curl: reencode http error messages
strbuf: add strbuf_reencode helper
http: optionally extract charset parameter from content-type
http: extract type/subtype portion of content-type
t5550: test display of remote http error messages
t/lib-httpd: use write_script to copy CGI scripts
test-lib: preserve GIT_CURL_VERBOSE from the environment

Merge branch 'ow/config-mailmap-pathname'Junio C Hamano Mon, 16 Jun 2014 19:18:24 +0000 (12:18 -0700)

Merge branch 'ow/config-mailmap-pathname'

mailmap.file configuration names a pathname, hence should honor
~/path and ~user/path as its value.

* ow/config-mailmap-pathname:
config: respect '~' and '~user' in mailmap.file

Merge branch 'fc/remote-helper-refmap'Junio C Hamano Mon, 16 Jun 2014 19:18:15 +0000 (12:18 -0700)

Merge branch 'fc/remote-helper-refmap'

Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.

* fc/remote-helper-refmap:
transport-helper: remove unnecessary strbuf resets
transport-helper: add support to delete branches
fast-export: add support to delete refs
fast-import: add support to delete refs
transport-helper: add support to push symbolic refs
transport-helper: add support for old:new refspec
fast-export: add new --refspec option
fast-export: improve argument parsing

Merge branch 'nd/daemonize-gc'Junio C Hamano Mon, 16 Jun 2014 19:18:12 +0000 (12:18 -0700)

Merge branch 'nd/daemonize-gc'

"git gc --auto" was recently changed to run in the background to
give control back early to the end-user sitting in front of the
terminal, but it forgot that housekeeping involving reflogs should
be done without other processes competing for accesses to the refs.

* nd/daemonize-gc:
gc --auto: do not lock refs in the background

Merge branch 'jm/t9138-style-fix'Junio C Hamano Mon, 16 Jun 2014 19:18:09 +0000 (12:18 -0700)

Merge branch 'jm/t9138-style-fix'

* jm/t9138-style-fix:
t9138-git-svn-authors-prog.sh fixups

Merge branch 'jm/instaweb-apache-24'Junio C Hamano Mon, 16 Jun 2014 19:18:06 +0000 (12:18 -0700)

Merge branch 'jm/instaweb-apache-24'

* jm/instaweb-apache-24:
git-instaweb: add support for Apache 2.4

Merge branch 'jl/remote-rm-prune'Junio C Hamano Mon, 16 Jun 2014 19:17:58 +0000 (12:17 -0700)

Merge branch 'jl/remote-rm-prune'

"git remote rm" and "git remote prune" can involve removing many
refs at once, which is not a very efficient thing to do when very
many refs exist in the packed-refs file.

* jl/remote-rm-prune:
remote prune: optimize "dangling symref" check/warning
remote: repack packed-refs once when deleting multiple refs
remote rm: delete remote configuration as the last

Merge branch 'jk/complete-merge-pull'Junio C Hamano Mon, 16 Jun 2014 19:17:53 +0000 (12:17 -0700)

Merge branch 'jk/complete-merge-pull'

The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".

* jk/complete-merge-pull:
completion: add missing options for git-merge
completion: add a note that merge options are shared

Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano Mon, 16 Jun 2014 19:17:50 +0000 (12:17 -0700)

Merge branch 'bg/xcalloc-nmemb-then-size'

Like calloc(3), xcalloc() takes nmemb and then size.

* bg/xcalloc-nmemb-then-size:
transport-helper.c: rearrange xcalloc arguments
remote.c: rearrange xcalloc arguments
reflog-walk.c: rearrange xcalloc arguments
pack-revindex.c: rearrange xcalloc arguments
notes.c: rearrange xcalloc arguments
imap-send.c: rearrange xcalloc arguments
http-push.c: rearrange xcalloc arguments
diff.c: rearrange xcalloc arguments
config.c: rearrange xcalloc arguments
commit.c: rearrange xcalloc arguments
builtin/remote.c: rearrange xcalloc arguments
builtin/ls-remote.c: rearrange xcalloc arguments

http-protocol.txt: Basic Auth is defined in RFC 2617... Yi EungJun Sat, 14 Jun 2014 19:09:29 +0000 (04:09 +0900)

http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano Mon, 16 Jun 2014 17:07:19 +0000 (10:07 -0700)

Merge branch 'jl/status-added-submodule-is-never-ignored'

submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.

This is a backward-incompatible change, but should be so in a good
way (aka bugfix).

* jl/status-added-submodule-is-never-ignored:
commit -m: commit staged submodules regardless of ignore config
status/commit: show staged submodules regardless of ignore config

Merge branch 'cb/byte-order'Junio C Hamano Mon, 16 Jun 2014 17:07:17 +0000 (10:07 -0700)

Merge branch 'cb/byte-order'

Compatibility enhancement for Solaris.

* cb/byte-order:
compat/bswap.h: fix endianness detection
compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER

Merge branch 'jk/strbuf-tolower'Junio C Hamano Mon, 16 Jun 2014 17:07:16 +0000 (10:07 -0700)

Merge branch 'jk/strbuf-tolower'

* jk/strbuf-tolower:
strbuf: add strbuf_tolower function

Merge branch 'jk/daemon-tolower'Junio C Hamano Mon, 16 Jun 2014 17:07:14 +0000 (10:07 -0700)

Merge branch 'jk/daemon-tolower'

* jk/daemon-tolower:
daemon/config: factor out duplicate xstrdup_tolower

Merge branch 'as/pretty-truncate'Junio C Hamano Mon, 16 Jun 2014 17:07:12 +0000 (10:07 -0700)

Merge branch 'as/pretty-truncate'

* as/pretty-truncate:
pretty.c: format string with truncate respects logOutputEncoding
t4205, t6006: add tests that fail with i18n.logOutputEncoding set
t4205 (log-pretty-format): use `tformat` rather than `format`
t4041, t4205, t6006, t7102: don't hardcode tested encoding value
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano Mon, 16 Jun 2014 17:07:09 +0000 (10:07 -0700)

Merge branch 'jk/diff-follow-must-take-one-pathspec'

* jk/diff-follow-must-take-one-pathspec:
move "--follow needs one pathspec" rule to diff_setup_done

Merge branch 'sk/windows-unc-path'Junio C Hamano Mon, 16 Jun 2014 17:07:03 +0000 (10:07 -0700)

Merge branch 'sk/windows-unc-path'

* sk/windows-unc-path:
Windows: allow using UNC path for git repository

Merge branch 'rr/rebase-autostash-fix'Junio C Hamano Mon, 16 Jun 2014 17:06:57 +0000 (10:06 -0700)

Merge branch 'rr/rebase-autostash-fix'

* rr/rebase-autostash-fix:
rebase -i: test "Nothing to do" case with autostash
rebase -i: handle "Nothing to do" case with autostash

Merge branch 'jk/report-fail-to-read-objects-better'Junio C Hamano Mon, 16 Jun 2014 17:06:15 +0000 (10:06 -0700)

Merge branch 'jk/report-fail-to-read-objects-better'

* jk/report-fail-to-read-objects-better:
open_sha1_file: report "most interesting" errno

Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano Mon, 16 Jun 2014 17:06:12 +0000 (10:06 -0700)

Merge branch 'jk/diff-files-assume-unchanged'

* jk/diff-files-assume-unchanged:
run_diff_files: do not look at uninitialized stat data

Merge branch 'jk/argv-array-for-child-process'Junio C Hamano Mon, 16 Jun 2014 17:06:10 +0000 (10:06 -0700)

Merge branch 'jk/argv-array-for-child-process'

* jk/argv-array-for-child-process:
argv-array: drop "detach" code
get_importer: use run-command's internal argv_array
get_exporter: use argv_array
get_helper: use run-command's internal argv_array
git_connect: use argv_array
run_column_filter: use argv_array
run-command: store an optional argv_array

Merge branch 'sk/wincred'Junio C Hamano Mon, 16 Jun 2014 17:06:08 +0000 (10:06 -0700)

Merge branch 'sk/wincred'

* sk/wincred:
wincred: avoid overwriting configured variables
wincred: add install target

Merge branch 'jk/do-not-run-httpd-tests-as-root'Junio C Hamano Mon, 16 Jun 2014 17:06:05 +0000 (10:06 -0700)

Merge branch 'jk/do-not-run-httpd-tests-as-root'

* jk/do-not-run-httpd-tests-as-root:
t/lib-httpd: require SANITY prereq

Merge branch 'cc/replace-edit'Junio C Hamano Mon, 16 Jun 2014 17:06:01 +0000 (10:06 -0700)

Merge branch 'cc/replace-edit'

"git replace" learns a new "--edit" option.

* cc/replace-edit:
Documentation: replace: describe new --edit option
replace: add --edit to usage string
replace: add tests for --edit
replace: die early if replace ref already exists
replace: refactor checking ref validity
replace: make sure --edit results in a different object
replace: add --edit option
replace: factor object resolution out of replace_object
replace: use OPT_CMDMODE to handle modes
replace: refactor command-mode determination

Merge branch 'mt/patch-id-stable' (early part)Junio C Hamano Mon, 16 Jun 2014 17:05:37 +0000 (10:05 -0700)

Merge branch 'mt/patch-id-stable' (early part)

* 'mt/patch-id-stable' (early part):
patch-id-test: test stable and unstable behaviour
patch-id: make it stable against hunk reordering
test doc: test_write_lines does not split its arguments
test: add test_write_lines helper

submodule: document "sync --recursive"Matthew Chen Fri, 13 Jun 2014 17:40:50 +0000 (13:40 -0400)

submodule: document "sync --recursive"

The "git submodule sync" command supports the --recursive flag, but
the documentation does not mention this. That flag is useful, for
example when a remote is changed in a submodule of a submodule.

Signed-off-by: Matthew Chen <charlesmchen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

blame: simplify prepare_lines()René Scharfe Fri, 13 Jun 2014 19:54:59 +0000 (21:54 +0200)

blame: simplify prepare_lines()

Changing get_next_line() to return the end pointer instead of NULL in
case no newline character is found treats allows us to treat complete
and incomplete lines the same, simplifying the code. Switching to
counting lines instead of EOLs allows us to start counting at the
first character, instead of having to call get_next_line() first.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

blame: factor out get_next_line()René Scharfe Fri, 13 Jun 2014 19:53:03 +0000 (21:53 +0200)

blame: factor out get_next_line()

Move the code for finding the start of the next line into a helper
function in order to reduce duplication.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

completion: handle '!f() { ... }; f' and "!sh -c '... Steffen Prohaska Thu, 12 Jun 2014 18:49:29 +0000 (20:49 +0200)

completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

'!f() { ... }; f' and "!sh -c '....' -" are recommended patterns for
declaring more complex aliases (see git wiki [1]). This commit teaches
the completion to handle them.

When determining which completion to use for an alias, an opening brace
or single quote is now skipped, and the search for a git command is
continued. For example, the aliases '!f() { git commit ... }' or "!sh
-c 'git commit ...'" now trigger commit completion. Previously, the
search stopped on the opening brace or quote, and the completion tried
it to determine how to complete, which obviously was useless.

The null command ':' is now skipped, so that it can be used as
a workaround to declare the desired completion style.

For example, the aliases

!f() { : git commit ; if ... } f
!sh -c ': git commit; if ...' -

now trigger commit completion.

Shell function declarations now work with or without space before
the parens, i.e. '!f() ...' and '!f () ...' both work.

[1] https://git.wiki.kernel.org/index.php/Aliases

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t0008: do not depend on 'echo' handling backslashes... Junio C Hamano Fri, 13 Jun 2014 20:23:58 +0000 (13:23 -0700)

t0008: do not depend on 'echo' handling backslashes specially

The original used to pass with /bin/dash but not with /bin/bash set
to $SHELL_PATH. The former turns "\\" into "\", but the latter does
not.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4: fix submit in non --prepare-p4-only modeMaxime Coste Wed, 11 Jun 2014 13:09:59 +0000 (14:09 +0100)

git-p4: fix submit in non --prepare-p4-only mode

b4073bb3 (git-p4: Do not include diff in spec file when just
preparing p4, 2014-05-24) broke git p4 submit, here is a proper
fix, including proper handling for windows end of lines.

Signed-off-by: Maxime Coste <frrrwww@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7700: drop explicit --no-pack-kept-objects from .keep... Jeff King Wed, 11 Jun 2014 06:32:45 +0000 (02:32 -0400)

t7700: drop explicit --no-pack-kept-objects from .keep test

We want to make sure that the default behavior of git-repack,
without any options, continues to treat .keep files as it
always has. Adding an explicit --no-pack-kept-objects, as
ee34a2b did, is a much less interesting test, and prevented
us from noticing the bug fixed by 64d3dc9 (repack: do not
accidentally pack kept objects by default, 2014-06-10).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with maintJunio C Hamano Thu, 12 Jun 2014 19:22:38 +0000 (12:22 -0700)

Sync with maint

* maint:
pull: do not abuse 'break' inside a shell 'case'

Merge branch 'jc/rev-parse-argh-dashed-multi-words... Junio C Hamano Thu, 12 Jun 2014 19:17:57 +0000 (12:17 -0700)

Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint

* jc/rev-parse-argh-dashed-multi-words:
update-index: fix segfault with missing --cacheinfo argument

pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny Wed, 11 Jun 2014 08:47:45 +0000 (10:47 +0200)

pull: do not abuse 'break' inside a shell 'case'

It is not C. The code would break under mksh when 'pull.ff' is set:

$ git pull
/usr/lib/git-core/git-pull[67]: break: can't break
Already up-to-date.

Signed-off-by: Jacek Konieczny <jajcus@jajcus.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

docs: Explain the purpose of fetch's and pull's <refspe... Marc Branchaud Wed, 11 Jun 2014 14:24:04 +0000 (10:24 -0400)

docs: Explain the purpose of fetch's and pull's <refspec> parameter.

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repack: introduce repack.writeBitmaps config optionJeff King Tue, 10 Jun 2014 20:20:30 +0000 (16:20 -0400)

repack: introduce repack.writeBitmaps config option

We currently have pack.writeBitmaps, which originally
operated at the pack-objects level. This should really have
been a repack.* option from day one. Let's give it the more
sensible name, but keep the old version as a deprecated
synonym.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repack: simplify handling of --write-bitmap-indexJeff King Tue, 10 Jun 2014 20:19:38 +0000 (16:19 -0400)

repack: simplify handling of --write-bitmap-index

We previously needed to pass --no-write-bitmap-index
explicitly to pack-objects to override its reading of
pack.writebitmaps from the config. Now that it no longer
does so, we can assume that bitmaps are off by default, and
only turn them on when necessary. This also lets us avoid a
confusing tri-state flag for write_bitmaps.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pack-objects: stop respecting pack.writebitmapsJeff King Tue, 10 Jun 2014 20:19:13 +0000 (16:19 -0400)

pack-objects: stop respecting pack.writebitmaps

The handling of the pack.writebitmaps config option
originally happened in pack-objects, which is quite
low-level. It would make more sense for drivers of
pack-objects to read the config, and then manipulate
pack-objects with command-line options.

Recently, repack learned to do so, making the low-level read
of pack.writebitmaps redundant here. Other callers, like
upload-pack, would not generally want to write bitmaps
anyway.

This could be considered a regression for somebody who is
driving pack-objects themselves outside of repack and
expects the config option to be used. However, such users
seem rather unlikely given how new the bitmap code is (and
the fact that they would basically be reimplementing repack
in the first place).

Note that we do not do anything with pack.writeBitmapHashCache
here. That option is not about "do we write bimaps", but
rather "when we are writing bitmaps, how do we do it?". You
would want that to kick in anytime you decide to write them,
similar to how pack.indexVersion is used.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repack: s/write_bitmap/&s/ in codeJeff King Tue, 10 Jun 2014 20:10:07 +0000 (16:10 -0400)

repack: s/write_bitmap/&s/ in code

The config name is "writeBitmaps", so the internal variable
missing the plural is unnecessarily confusing to write.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repack: respect pack.writebitmapsJeff King Tue, 10 Jun 2014 20:09:23 +0000 (16:09 -0400)

repack: respect pack.writebitmaps

The config option to turn on bitmaps is read all the way
down in the plumbing of pack-objects. This makes it hard for
other options in the porcelain of repack to make decisions
based on the bitmap setting. For example,
repack.packKeptObjects tries to kick in by default only when
bitmaps are turned on. But it can't do so reliably because
it doesn't yet know whether we are using bitmaps.

This patch teaches repack to respect pack.writebitmaps. It
means we pass a redundant command-line flag to pack-objects,
but that's OK; it shouldn't affect the outcome.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

repack: do not accidentally pack kept objects by defaultJeff King Tue, 10 Jun 2014 20:08:38 +0000 (16:08 -0400)

repack: do not accidentally pack kept objects by default

Commit ee34a2b (repack: add `repack.packKeptObjects` config
var, 2014-03-03) added a flag which could duplicate kept
objects, but did not mean to turn it on by default. Instead,
the option is tied by default to the decision to write
bitmaps, like:

if (pack_kept_objects < 0)
pack_kept_objects = write_bitmap;

after which we expect pack_kept_objects to be a boolean 0 or
1. However, that assignment neglects that write_bitmap is
_also_ a tri-state with "-1" as the default, and with
neither option given, we accidentally turn the option on.

This patch is the minimal fix to restore the desired
behavior for the default state. Further patches will fix the
more complicated cases.

Note the update to t7700. It failed to turn on bitmaps,
meaning we were actually confirming the wrong behavior!

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Windows: allow using UNC path for git repositoryCezary Zawadka Tue, 13 Jul 2010 14:17:43 +0000 (16:17 +0200)

Windows: allow using UNC path for git repository

[efl: moved MinGW-specific part to compat/]
[jes: fixed compilation on non-Windows]

Eric Sunshine fixed mingw_offset_1st_component() to return
consistently "foo" for UNC "//machine/share/foo", cf

http://groups.google.com/group/msysgit/browse_thread/thread/c0af578549b5dda0

Author: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Cezary Zawadka <czawadka@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

patch-id-test: test stable and unstable behaviourMichael S. Tsirkin Sun, 27 Apr 2014 18:15:51 +0000 (21:15 +0300)

patch-id-test: test stable and unstable behaviour

Verify that patch ID supports an algorithm
that is stable against diff split and reordering.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

patch-id: make it stable against hunk reorderingMichael S. Tsirkin Sun, 27 Apr 2014 18:15:44 +0000 (21:15 +0300)

patch-id: make it stable against hunk reordering

Patch id changes if users reorder file diffs that make up a patch.

As the result is functionally equivalent, a different patch id is
surprising to many users.
In particular, reordering files using diff -O is helpful to make patches
more readable (e.g. API header diff before implementation diff).

Add an option to change patch-id behaviour making it stable against
these kinds of patch change:
calculate SHA1 hash for each hunk separately and sum all hashes
(using a symmetrical sum) to get patch id

We use a 20byte sum and not xor - since xor would give 0 output
for patches that have two identical diffs, which isn't all that
unlikely (e.g. append the same line in two places).

The new behaviour is enabled
- when patchid.stable is true
- when --stable flag is present

Using a new flag --unstable or setting patchid.stable to false force
the historical behaviour.

In the documentation, clarify that patch ID can now be a sum of hashes,
not a hash.
Document how command line and config options affect the
behaviour.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test doc: test_write_lines does not split its argumentsJonathan Nieder Mon, 5 May 2014 23:51:43 +0000 (16:51 -0700)

test doc: test_write_lines does not split its arguments

test_write_lines carefully quotes its arguments as "$@", so

test_write_lines "a b" c

writes two lines as requested, not three.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test: add test_write_lines helperMichael S. Tsirkin Sun, 27 Apr 2014 18:15:47 +0000 (21:15 +0300)

test: add test_write_lines helper

API and implementation as suggested by Junio.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git potty: restore environments after alias expansionNguyễn Thái Ngọc Duy Sun, 8 Jun 2014 09:37:10 +0000 (16:37 +0700)

git potty: restore environments after alias expansion

Commit 4ad8332 (t0001: test git init when run via an alias -
2010-11-26) noted breakages when running init via alias. The problem
is for alias to be used, $GIT_DIR must be searched, but 'init' and
'clone' are not happy with that. So we start a new process like an
external command, with clean environment in this case. Env variables
that are set by command line (e.g. "git --git-dir=.. ") are kept.

This should also fix autocorrecting a command typo to "init" because
it's the same problem: aliases are read, then "init" is unhappy with
$GIT_DIR already set up because of that.

Reminded-by: David Turner <dturner@twopensource.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t9001: avoid non-portable '\n' with sedTorsten Bögershausen Tue, 10 Jun 2014 04:07:59 +0000 (06:07 +0200)

t9001: avoid non-portable '\n' with sed

t9001 used a '\n' in a sed expression to split one line into two
lines, but the usage of '\n' in the "replacement string" is not
portable.

The '\n' can be used to match a newline in the "pattern space",
but otherwise the meaning of '\n' is unspecified in POSIX.

- Gnu versions of sed will treat '\n' as a newline character.
- Other versions of sed (like /usr/bin/sed under Mac OS X)
simply ignore the '\' before the 'n', treating '\n' as 'n'.

For reference see:
pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html
http://www.gnu.org/software/sed/manual/sed.html

As the test already requires perl as a prerequisite, use perl
instead of sed.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

sequencer: signal failed ff as an aborted, not a confli... Fabian Ruch Mon, 9 Jun 2014 15:04:36 +0000 (17:04 +0200)

sequencer: signal failed ff as an aborted, not a conflicted merge

`do_pick_commit` handles three situations if it is not fast-forwarding.
In order for `do_pick_commit` to identify the situation, it examines the
return value of the selected merge command.

1. return value 0 stands for a clean merge
2. 1 is passed in case of a failed merge due to conflict
3. any other return value means that the merge did not even start

So far, the sequencer returns 1 in case of a failed fast-forward, which
would mean "failed merge due to conflict". However, a fast-forward
either starts and succeeds or does not start at all. In particular, it
cannot fail in between like a merge with a dirty index due to conflicts.

In order to signal the three possible situations (not only success and
failure to complete) after a pick through porcelain commands such as
`cherry-pick`, exit with a return value that is neither 0 nor 1. 128 was
chosen in line with the other situations in which the sequencer
encounters an error. In such situations, the sequencer returns a
negative value and `cherry-pick` translates this into a call to `die`.
`die` then terminates the process with exit status 128.

Signed-off-by: Fabian Ruch <bafain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

api-strbuf.txt minor typosJeremiah Mahler Mon, 9 Jun 2014 03:32:03 +0000 (20:32 -0700)

api-strbuf.txt minor typos

Fixed some minor typos in api-strbuf.txt: 'A' instead of 'An', 'have'
instead of 'has', a overlong line, and 'another' instead of 'an other'.

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

revision: parse "git log -<count>" more carefullyJunio C Hamano Fri, 6 Jun 2014 22:33:25 +0000 (15:33 -0700)

revision: parse "git log -<count>" more carefully

This mistyped command line simply ignores "master" and ends up
showing two commits from the current HEAD:

$ git log -2master

because we feed "2master" to atoi() without making sure that the
whole string is parsed as an integer.

Use the strtol_i() helper function instead.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Use starts_with() for C strings instead of memcmp()René Scharfe Fri, 6 Jun 2014 17:24:48 +0000 (19:24 +0200)

Use starts_with() for C strings instead of memcmp()

Convert three cases of checking for a constant prefix using memcmp() to
starts_with(). This way there is no need for magic string length
constants and we avoid running over the end of the string should it be
shorter than the prefix.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisiteJunio C Hamano Mon, 9 Jun 2014 21:03:10 +0000 (14:03 -0700)

t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

This was only necessary because do_tests helper the script defines
took its parameters in a wrong order. Just pass an empty string (or
not passing the optional EXPENSIVE prerequisite) when running the
test with a light-weight set of parameters and have the shell do the
right thing when parsing test_expect_success helper.

Also update coding style while we are at it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisiteJunio C Hamano Mon, 9 Jun 2014 20:43:19 +0000 (13:43 -0700)

t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

This was only necessary because do_tests helper the script defines
took its parameters in a wrong order. Just pass an empty string (or
not passing the optional EXPENSIVE prerequisite) when running the
test with a light-weight set of parameters and have the shell do the
right thing when parsing test_expect_success helper.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3302: do not chdir around in the primary test processJunio C Hamano Mon, 9 Jun 2014 20:36:54 +0000 (13:36 -0700)

t3302: do not chdir around in the primary test process

These days^Wyears we strive to do stuff in subdirectories inside
subshells to avoid mistakes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3302: coding style updatesJunio C Hamano Mon, 9 Jun 2014 20:21:59 +0000 (13:21 -0700)

t3302: coding style updates

Use "<<-END_OF_HERE_TEXT" to push the contents of here-text to the
right in order to show the loop structure better.

Use write_script when writing a script to be run.

Use "test" (not "[ ... ]") and avoid unnecessary ";" in the middle
of a line.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

test: turn USR_BIN_TIME into a lazy prerequisiteJunio C Hamano Mon, 9 Jun 2014 20:54:25 +0000 (13:54 -0700)

test: turn USR_BIN_TIME into a lazy prerequisite

Two test scripts (t3302 and t3419) had copy & paste code to set
USR_BIN_TIME prerequisite. Use the test_lazy_prereq helper to define
them in the common t/test-lib.sh.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

test: turn EXPENSIVE into a lazy prerequisiteJunio C Hamano Mon, 9 Jun 2014 19:23:30 +0000 (12:23 -0700)

test: turn EXPENSIVE into a lazy prerequisite

Two test scripts (t0021 and t5551) had copy & paste code to set
EXPENSIVE prerequisite. Use the test_lazy_prereq helper to define
them in the common t/test-lib.sh.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t5551: fix the 50,000 tag testTorsten Bögershausen Thu, 5 Jun 2014 21:36:21 +0000 (23:36 +0200)

t5551: fix the 50,000 tag test

The first version of test 23 did simply check that no output was
sent to the standard error stream. With 5e2c7cd2 (t5551: do not use
unportable sed '\+', 2013-05-12), we started to also verify that the
expected tags were actually cloned.

Since 68b939b2 (clone: send diagnostic messages to stderr,
2013-09-18), "git clone" shows "Cloning into 'too-many-refs'" to the
standard error stream (it used to do so to the standard output),
causing the test to fail.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 2.1Junio C Hamano Mon, 9 Jun 2014 18:39:43 +0000 (11:39 -0700)

Update draft release notes to 2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/shortlog-ref-exclude'Junio C Hamano Mon, 9 Jun 2014 18:30:12 +0000 (11:30 -0700)

Merge branch 'jc/shortlog-ref-exclude'

"log --exclude=<glob> --all | shortlog" worked as expected, but
"shortlog --exclude=<glob> --all" was not accepted at the command
line argument parser level.

* jc/shortlog-ref-exclude:
shortlog: allow --exclude=<glob> to be passed

Merge branch 'mn/sideband-no-ansi'Junio C Hamano Mon, 9 Jun 2014 18:27:55 +0000 (11:27 -0700)

Merge branch 'mn/sideband-no-ansi'

Tools that read diagnostic output in our standard error stream do
not want to see terminal control sequence (e.g. erase-to-eol).
Detect them by checking if the standard error stream is connected to
a tty.

* mn/sideband-no-ansi:
sideband.c: do not use ANSI control sequence on non-terminal

Merge branch 'rs/mailinfo-header-cmp'Junio C Hamano Mon, 9 Jun 2014 18:27:53 +0000 (11:27 -0700)

Merge branch 'rs/mailinfo-header-cmp'

Avoid running over the end of header string while parsing an
incoming e-mail message to extract the patch.

* rs/mailinfo-header-cmp:
mailinfo: use strcmp() for string comparison

Merge branch 'pb/trim-trailing-spaces'Junio C Hamano Mon, 9 Jun 2014 18:27:47 +0000 (11:27 -0700)

Merge branch 'pb/trim-trailing-spaces'

Fix an error in parsing of .gitignore files that use a trailing
"\ " to mark pathnames that end with a SP.

* pb/trim-trailing-spaces:
dir.c:trim_trailing_spaces(): fix for " \ " sequence

Merge branch 'na/no-http-test-in-the-middle'Junio C Hamano Mon, 9 Jun 2014 18:26:51 +0000 (11:26 -0700)

Merge branch 'na/no-http-test-in-the-middle'

The mode to run tests with HTTP server tests disabled was broken.

* na/no-http-test-in-the-middle:
t5538: move http push tests out to t5542

Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano Mon, 9 Jun 2014 18:26:49 +0000 (11:26 -0700)

Merge branch 'jc/rev-parse-argh-dashed-multi-words'

"update-index --cacheinfo" in 2.0 crashes on a malformed command line.

* jc/rev-parse-argh-dashed-multi-words:
update-index: fix segfault with missing --cacheinfo argument

Merge branch 'lt/request-pull'Junio C Hamano Mon, 9 Jun 2014 18:26:22 +0000 (11:26 -0700)

Merge branch 'lt/request-pull'

A brown-paper-bag bugfix to a test that turned out to be a no-op by
mistake.

* lt/request-pull:
fix brown paper bag breakage in t5150-request-pull.sh

string-list: spell all values out that are given to... Tanay Abhra Tue, 3 Jun 2014 09:13:18 +0000 (02:13 -0700)

string-list: spell all values out that are given to a string_list initializer

STRING_LIST_INIT_{NODUP,DUP} initializers list values only
for earlier structure members, relying on the usual
convention in C that the omitted members are initailized to
0, i.e. the former is expanded to the latter:

struct string_list l = STRING_LIST_INIT_DUP;
struct string_list l = { NULL, 0, 0, 1 };

and the last member that is not mentioned (i.e. 'cmp') is
initialized to NULL.

While there is nothing wrong in this construct, spelling out
all the values where the macros are defined will serve also
as a documentation, so let's do so.

Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>