OSDN Git Service
Jens Lehmann [Thu, 19 Jun 2014 20:12:56 +0000 (22:12 +0200)]
revert: add t3513 for submodule updates
Test that the revert command updates the work tree as expected (for
submodule changes which don't result in conflicts). Add a helper function
to first revert the checked out target commit to make the last revert
produce the to-be-tested work tree.
Set the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT and
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switches to
document that revert has the similar failures.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Thu, 19 Jun 2014 20:12:54 +0000 (22:12 +0200)]
stash: add t3906 for submodule updates
Test that the stash apply command updates the work tree as expected for
changes which don't result in conflicts. To make that work add a helper
function that uses read-tree to apply the changes of the target commit
to the work tree, then stashes these changes and at last applies that
stash.
Implement the KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES switch
and reuse two other already present switches to expect the known
failure that stash does ignore submodule changes.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 17:03:53 +0000 (19:03 +0200)]
am: add t4255 for submodule updates
Test that the am command updates the work tree as expected (for submodule
changes which don't result in conflicts). To make that work add two
helper functions that use format-patch to create the input for am.
Add the KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
switch to expect the known failure that --no-ff merges attempt to merge
the new files in the former submodule directory with those of the removed
submodule.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 17:03:18 +0000 (19:03 +0200)]
cherry-pick: add t3512 for submodule updates
Test that the cherry-pick command updates the work tree as expected (for
submodule changes which don't result in conflicts).
Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that cherry-pick has the same --no-ff known failures merge has.
Implement the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT switch to expect
the known failure that while cherry picking just a SHA-1 update for an
ignored submodule the commit incorrectly fails with "The previous
cherry-pick is now empty, possibly due to conflict resolution.".
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 17:02:47 +0000 (19:02 +0200)]
pull: add t5572 for submodule updates
Test that the pull command updates the work tree as expected (for
submodule changes which don't result in conflicts) when used without
arguments or with the '--ff', '--ff-only' and '--no-ff' flag each. Add
helper functions to reset the branch to be updated to to the current
HEAD so that pull is doing the transition from HEAD to the given branch.
Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that pull has the same --no-ff known failures merge has.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Thu, 19 Jun 2014 20:12:51 +0000 (22:12 +0200)]
rebase: add t3426 for submodule updates
Test that the rebase command updates the work tree as expected for
changes which don't result in conflicts. To make that work add two
helper functions that add a commit only touching files and then
revert it. This allows to rebase the target commit over these two
and to compare the result.
Set KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that "replace directory with submodule" fails for an
interactive rebase because a directory "sub1" already exists.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 17:01:41 +0000 (19:01 +0200)]
merge: add t7613 for submodule updates
Test that the merge command updates the work tree as expected (for
submodule changes which don't result in conflicts) when used without
arguments or with the '--ff', '--ff-only' and '--no-ff' flag.
Implement the KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR
switch to expect the known failure that --no-ff merges do not create the
empty submodule directory.
The KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
switch is also implemented to expect the known failure that --no-ff
merges attempt to merge the new files in the former submodule directory
with those of the removed submodule.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Thu, 19 Jun 2014 20:12:48 +0000 (22:12 +0200)]
bisect: add t6041 for submodule updates
Test that the bisect command updates the work tree as expected. To make
that work with the new submodule test framework a git_bisect helper
function is added. This adds a commit after the one given to be switched
to and makes that one the bad commit. The starting point is then given to
bisect as the good commit which makes bisect change the work tree to the
commit in between, which is the commit given.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 17:00:28 +0000 (19:00 +0200)]
reset: add t7112 for submodule updates
Test that the reset command updates the work tree as expected for changes
with '--keep', '--merge' (for changes which don't result in conflicts) and
'--hard'.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 16:59:51 +0000 (18:59 +0200)]
read-tree: add t1013 for submodule updates
Test that the read-tree command updates the work tree as expected for
changes which don't result in conflicts with the '-m' and '--reset' flag.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 16:59:20 +0000 (18:59 +0200)]
apply: add t4137 for submodule updates
Test that the apply command updates the work tree as expected for the
'--index' and the '--3way' options (for submodule changes which don't
result in conflicts).
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Sun, 15 Jun 2014 16:58:44 +0000 (18:58 +0200)]
checkout: call the new submodule update test framework
Test that the checkout command updates the work tree as expected with
and without the '-f' flag.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Tue, 1 Jul 2014 21:24:14 +0000 (23:24 +0200)]
submodules: add the lib-submodule-update.sh test library
Add this test library to simplify covering all combinations of submodule
update scenarios without having to add those to a test of each work tree
manipulating command over and over again.
The functions test_submodule_switch() and test_submodule_forced_switch()
are intended to be called from a test script with a single argument. This
argument is either a work tree manipulating command (including any command
line options) or a function (when more than a single git command is needed
to switch work trees from the current HEAD to another commit). This
command (or function) is passed a target branch as argument. The two new
functions check that each submodule transition is handled as expected,
which currently means that submodule work trees are not affected until
"git submodule update" is called. The "forced" variant is for commands
using their '-f' or '--hard' option and expects them to overwrite local
modifications as a result. Each of these two functions contains 14
tests_expect_* calls.
Calling one of these test functions the first time creates a repository
named "submodule_update_repo". At first it contains two files, then a
single submodule is added in another commit followed by commits covering
all relevant submodule modifications. This repository is newly cloned into
the "submodule_update" for each test_expect_* to avoid interference
between different parts of the test functions (some to-be-tested commands
also manipulate refs along with the work tree, e.g. "git reset").
Follow-up commits will then call these two test functions for all work
tree manipulating commands (with a combination of all their options
relevant to what they do with the work tree) making sure they work as
expected. Later this test library will be extended to cover merges
resulting in conflicts too. Also it is intended to be easily extendable
for the recursive update functionality, where even more combinations of
submodule modifications have to be tested for.
This version documents two bugs in current Git with expected failures:
*) When a submodule is replaced with a tracked file of the same name the
submodule work tree including any local modifications (and even the
whole history if it uses a .git directory instead of a gitfile!) is
silently removed.
*) Forced work tree updates happily manipulate files in the directory of a
submodule that has just been removed in the superproject (but is of
course still present in the work tree due to the way submodules are
currently handled). This becomes dangerous when files in the submodule
directory are overwritten by files from the new superproject commit, as
any modifications to the submodule files will be lost) and is expected
to also destroy history in the - admittedly unlikely case - the new
commit adds a file named ".git" to the submodule directory.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann [Thu, 19 Jun 2014 20:12:23 +0000 (22:12 +0200)]
test-lib: add test_dir_is_empty()
For the upcoming submodule test framework we often need to assert that an
empty directory exists in the work tree. Add the test_dir_is_empty()
function which asserts that the given argument is an empty directory.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio 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>
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
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
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()
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()
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
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
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
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
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()
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Junio 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'
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
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>
Cezary 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>
Michael 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>
Michael 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>
Jonathan 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>
Michael 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>
Junio 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>
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
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
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
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
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
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
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
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>
Ramsay Jones [Tue, 20 May 2014 23:33:46 +0000 (00:33 +0100)]
t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ilya Bobyr [Wed, 30 Apr 2014 09:50:44 +0000 (02:50 -0700)]
test-lib: '--run' to run only specific tests
Allow better control of the set of tests that will be executed for a
single test suite. Mostly useful while debugging or developing as it
allows to focus on a specific test.
Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ilya Bobyr [Wed, 30 Apr 2014 09:50:43 +0000 (02:50 -0700)]
test-lib: tests skipped by GIT_SKIP_TESTS say so
We used to show "(missing )" next to tests skipped because they are
specified in GIT_SKIP_TESTS. Use "(GIT_SKIP_TESTS)" instead.
Plus tests that check basic GIT_SKIP_TESTS functions.
Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ilya Bobyr [Wed, 30 Apr 2014 09:50:42 +0000 (02:50 -0700)]
test-lib: document short options in t/README
Most arguments that could be provided to a test have short forms.
Unless documented, the only way to learn them is to read the code.
Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 6 Jun 2014 18:42:05 +0000 (11:42 -0700)]
Second batch for 2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 6 Jun 2014 18:39:12 +0000 (11:39 -0700)]
Merge branch 'ss/howto-manage-trunk'
* ss/howto-manage-trunk:
How to keep a project's canonical history correct.
Junio C Hamano [Fri, 6 Jun 2014 18:38:57 +0000 (11:38 -0700)]
Merge branch 'mc/git-p4-prepare-p4-only'
* mc/git-p4-prepare-p4-only:
git-p4: Do not include diff in spec file when just preparing p4
Junio C Hamano [Fri, 6 Jun 2014 18:38:54 +0000 (11:38 -0700)]
Merge branch 'jn/test-lint-unmoor'
* jn/test-lint-unmoor:
test-lint: find unportable sed, echo, test, and export usage after &&
Junio C Hamano [Fri, 6 Jun 2014 18:38:51 +0000 (11:38 -0700)]
Merge branch 'ep/shell-assign-and-export-vars'
* ep/shell-assign-and-export-vars:
scripts: more "export VAR=VALUE" fixes
scripts: "export VAR=VALUE" construct is not portable
Junio C Hamano [Fri, 6 Jun 2014 18:38:48 +0000 (11:38 -0700)]
Merge branch 'jj/command-line-adjective'
* jj/command-line-adjective:
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
Junio C Hamano [Fri, 6 Jun 2014 18:38:44 +0000 (11:38 -0700)]
Merge branch 'jc/coding-guidelines'
* jc/coding-guidelines:
CodingGuidelines: avoid "test <cond> -a/-o <cond>"
CodingGuidelines: on splitting a long line
CodingGuidelines: on comparison
CodingGuidelines: do not call the conditional statement "if()"
CodingGuidelines: give an example for shell function preamble
CodingGuidelines: give an example for control statements
CodingGuidelines: give an example for redirection
CodingGuidelines: give an example for case/esac statement
CodingGuidelines: once it is in, it is not worth the code churn
Junio C Hamano [Fri, 6 Jun 2014 18:36:10 +0000 (11:36 -0700)]
Merge branch 'nd/status-auto-comment-char'
* nd/status-auto-comment-char:
commit: allow core.commentChar=auto for character auto selection
config: be strict on core.commentChar
Junio C Hamano [Fri, 6 Jun 2014 18:36:06 +0000 (11:36 -0700)]
Merge branch 'mt/rebase-i-keep-empty-test'
* mt/rebase-i-keep-empty-test:
rebase --keep-empty -i: add test
Junio C Hamano [Fri, 6 Jun 2014 18:35:01 +0000 (11:35 -0700)]
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
* mk/show-s-no-extra-blank-line-for-merges:
git-show: fix 'git show -s' to not add extra terminator after merge commit
Junio C Hamano [Fri, 6 Jun 2014 18:32:49 +0000 (11:32 -0700)]
Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'
* sk/spawn-less-case-insensitively-from-grep-O-i:
git grep -O -i: if the pager is 'less', pass the '-I' option
Junio C Hamano [Fri, 6 Jun 2014 18:32:21 +0000 (11:32 -0700)]
Merge branch 'jd/subtree'
* jd/subtree:
contrib/subtree: allow adding an annotated tag
contrib/subtree/Makefile: clean up rule for "clean"
contrib/subtree/Makefile: clean up rules to generate documentation
contrib/subtree/Makefile: s/libexecdir/gitexecdir/
contrib/subtree/Makefile: use GIT-VERSION-FILE
contrib/subtree/Makefile: scrap unused $(gitdir)
Junio C Hamano [Fri, 6 Jun 2014 18:32:13 +0000 (11:32 -0700)]
Merge branch 'wk/doc-clarify-upstream'
* wk/doc-clarify-upstream:
Documentation: mention config sources for @{upstream}
Junio C Hamano [Fri, 6 Jun 2014 18:29:38 +0000 (11:29 -0700)]
Merge branch 'tb/unicode-6.3-zero-width'
Update the logic to compute the display width needed for utf8
strings and allow us to more easily maintain the tables used in
that logic.
We may want to let the users choose if codepoints with ambiguous
widths are treated as a double or single width in a follow-up patch.
* tb/unicode-6.3-zero-width:
utf8: make it easier to auto-update git_wcwidth()
utf8.c: use a table for double_width
Junio C Hamano [Fri, 6 Jun 2014 18:28:13 +0000 (11:28 -0700)]
Merge branch 'jk/index-pack-report-missing'
* jk/index-pack-report-missing:
index-pack: distinguish missing objects from type errors
Junio C Hamano [Fri, 6 Jun 2014 18:26:50 +0000 (11:26 -0700)]
Merge branch 'bc/blame-crlf-test'
If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as "Not
Committed Yet", even if they were unmodified.
* bc/blame-crlf-test:
blame: correctly handle files regardless of autocrlf
Junio C Hamano [Fri, 6 Jun 2014 18:26:38 +0000 (11:26 -0700)]
Merge branch 'sk/submodules-absolute-path-on-windows'
* sk/submodules-absolute-path-on-windows:
Revert "submodules: fix ambiguous absolute paths under Windows"
Junio C Hamano [Fri, 6 Jun 2014 18:24:44 +0000 (11:24 -0700)]
Merge branch 'dk/blame-reorg'
"git blame" has been optimized greatly by reorganising the data
structure that is used to keep track of the work to be done, thanks
to David Karstrup <dak@gnu.org>.
* dk/blame-reorg:
blame: large-scale performance rewrite
Junio C Hamano [Fri, 6 Jun 2014 18:24:32 +0000 (11:24 -0700)]
Merge branch 'wg/svn-fe-style-fixes'
* wg/svn-fe-style-fixes:
svn-fe: conform to pep8
Junio C Hamano [Fri, 6 Jun 2014 18:24:30 +0000 (11:24 -0700)]
Merge branch 'jn/contrib-remove-vim'
Spring cleaning of contrib/.
* jn/contrib-remove-vim:
contrib: remove vim support instructions
Junio C Hamano [Fri, 6 Jun 2014 18:23:46 +0000 (11:23 -0700)]
Merge branch 'jn/contrib-remove-diffall'
Spring cleaning of contrib/.
* jn/contrib-remove-diffall:
contrib: remove git-diffall
Junio C Hamano [Fri, 6 Jun 2014 18:23:13 +0000 (11:23 -0700)]
Merge branch 'dt/merge-recursive-case-insensitive'
On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
* dt/merge-recursive-case-insensitive:
mv: allow renaming to fix case on case insensitive filesystems
merge-recursive.c: fix case-changing merge bug
Junio C Hamano [Fri, 6 Jun 2014 18:23:04 +0000 (11:23 -0700)]
Merge branch 'rs/reflog-exists'
* rs/reflog-exists:
checkout.c: use ref_exists instead of file_exist
refs.c: add new functions reflog_exists and delete_reflog
Junio C Hamano [Fri, 6 Jun 2014 18:22:24 +0000 (11:22 -0700)]
Merge branch 'tg/tag-state-tag-name-in-editor-hints'
* tg/tag-state-tag-name-in-editor-hints:
builtin/tag.c: show tag name to hint in the message editor
Junio C Hamano [Fri, 6 Jun 2014 18:21:49 +0000 (11:21 -0700)]
Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager'
* jk/grep-tell-run-command-to-cd-when-running-pager:
grep: use run-command's "dir" option for --open-files-in-pager
Junio C Hamano [Fri, 6 Jun 2014 18:21:47 +0000 (11:21 -0700)]
Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'
* fc/status-printf-squelch-format-zero-length-warnings:
silence a bunch of format-zero-length warnings
Junio C Hamano [Fri, 6 Jun 2014 18:21:36 +0000 (11:21 -0700)]
Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'
* jk/squelch-compiler-warning-from-funny-error-macro:
let clang use the constant-return error() macro
inline constant return from error() function
Junio C Hamano [Fri, 6 Jun 2014 18:18:34 +0000 (11:18 -0700)]
Merge branch 'dk/raise-core-deltabasecachelimit'
The `core.deltabasecachelimit` used to default to 16 MiB , but this
proved to be too small, and has been bumped to 96 MiB.
* dk/raise-core-deltabasecachelimit:
Bump core.deltaBaseCacheLimit to 96m