summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.10.5.txt17
-rw-r--r--Documentation/RelNotes/2.11.4.txt17
-rw-r--r--Documentation/RelNotes/2.12.5.txt17
-rw-r--r--Documentation/RelNotes/2.13.6.txt17
-rw-r--r--Documentation/RelNotes/2.14.2.txt70
-rw-r--r--Documentation/config.txt14
-rw-r--r--Documentation/git-branch.txt4
-rw-r--r--Documentation/git-for-each-ref.txt9
-rw-r--r--Documentation/git-merge.txt5
-rw-r--r--Documentation/git-pack-objects.txt17
-rw-r--r--Documentation/git-shell.txt16
-rw-r--r--Documentation/git-tag.txt7
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/merge-strategies.txt3
-rw-r--r--Documentation/technical/api-builtin.txt73
-rw-r--r--Makefile1
-rw-r--r--apply.c53
-rw-r--r--apply.h1
-rw-r--r--archive.c54
-rw-r--r--builtin.h100
-rw-r--r--builtin/add.c6
-rw-r--r--builtin/am.c38
-rw-r--r--builtin/cat-file.c4
-rw-r--r--builtin/clone.c3
-rw-r--r--builtin/commit-tree.c1
-rw-r--r--builtin/describe.c9
-rw-r--r--builtin/fsck.c22
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/merge.c19
-rw-r--r--builtin/rev-list.c3
-rw-r--r--builtin/rev-parse.c4
-rw-r--r--builtin/revert.c2
-rw-r--r--builtin/submodule--helper.c49
-rw-r--r--builtin/tag.c3
-rw-r--r--cache.h10
-rw-r--r--commit.h5
-rw-r--r--compat/poll/poll.c4
-rw-r--r--compat/win32/syslog.c2
-rw-r--r--convert.c10
-rw-r--r--convert.h3
-rwxr-xr-xgit-archimport.perl4
-rwxr-xr-xgit-cvsimport.perl1
-rwxr-xr-xgit-cvsserver.perl77
-rwxr-xr-xgit-merge-octopus.sh2
-rwxr-xr-xgit-merge-one-file.sh8
-rwxr-xr-xgit-merge-resolve.sh2
-rw-r--r--git-rebase--am.sh3
-rw-r--r--git-rebase--interactive.sh7
-rwxr-xr-xgit-request-pull.sh2
-rwxr-xr-xgit-send-email.perl33
-rwxr-xr-xgit-stash.sh13
-rwxr-xr-xgit-submodule.sh7
-rw-r--r--git.c18
-rw-r--r--grep.c2
-rw-r--r--http-push.c2
-rw-r--r--mailinfo.c11
-rw-r--r--path.c9
-rw-r--r--perl/Git.pm2
-rw-r--r--perl/Git/SVN.pm2
-rw-r--r--ref-filter.c10
-rw-r--r--refs.c2
-rw-r--r--refs.h8
-rw-r--r--revision.c3
-rw-r--r--revision.h7
-rw-r--r--sequencer.c20
-rw-r--r--sha1-lookup.c216
-rw-r--r--sha1-lookup.h6
-rw-r--r--sha1_file.c23
-rw-r--r--shell.c14
-rw-r--r--strbuf.c1
-rw-r--r--string-list.h6
-rw-r--r--sub-process.c7
-rw-r--r--submodule.c18
-rwxr-xr-xt/check-non-portable-shell.pl2
-rw-r--r--t/helper/test-path-utils.c18
-rwxr-xr-xt/lib-gpg.sh1
-rwxr-xr-xt/t0001-init.sh30
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh67
-rwxr-xr-xt/t3418-rebase-continue.sh85
-rwxr-xr-xt/t3504-cherry-pick-rerere.sh92
-rwxr-xr-xt/t3700-add.sh1
-rwxr-xr-xt/t4062-diff-pickaxe.sh4
-rwxr-xr-xt/t4124-apply-ws-rule.sh33
-rwxr-xr-xt/t4150-am.sh83
-rwxr-xr-xt/t4202-log.sh6
-rwxr-xr-xt/t5001-archive-attr.sh47
-rwxr-xr-xt/t5002-archive-attr-pattern.sh2
-rwxr-xr-xt/t5004-archive-corner-cases.sh4
-rwxr-xr-xt/t5150-request-pull.sh4
-rwxr-xr-xt/t5308-pack-detect-duplicates.sh11
-rwxr-xr-xt/t5526-fetch-submodules.sh8
-rwxr-xr-xt/t5531-deep-submodule-push.sh25
-rwxr-xr-xt/t6002-rev-list-bisect.sh18
-rwxr-xr-xt/t6018-rev-list-glob.sh20
-rwxr-xr-xt/t6120-describe.sh6
-rwxr-xr-xt/t6300-for-each-ref.sh1
-rwxr-xr-xt/t7004-tag.sh2
-rwxr-xr-xt/t7006-pager.sh80
-rwxr-xr-xt/t7400-submodule-basic.sh6
-rwxr-xr-xt/t7600-merge.sh15
-rwxr-xr-xt/t7810-grep.sh5
-rwxr-xr-xt/t8010-cat-file-filters.sh5
-rwxr-xr-xt/t9001-send-email.sh4
-rwxr-xr-xt/t9400-git-cvsserver-server.sh48
-rw-r--r--t/test-lib.sh4
-rw-r--r--userdiff.c2
-rw-r--r--vcs-svn/fast_export.c41
-rw-r--r--vcs-svn/fast_export.h3
-rw-r--r--vcs-svn/repo_tree.c48
-rw-r--r--vcs-svn/repo_tree.h23
-rw-r--r--vcs-svn/svndump.c33
111 files changed, 1328 insertions, 802 deletions
diff --git a/Documentation/RelNotes/2.10.5.txt b/Documentation/RelNotes/2.10.5.txt
new file mode 100644
index 0000000000..a498fd6fdc
--- /dev/null
+++ b/Documentation/RelNotes/2.10.5.txt
@@ -0,0 +1,17 @@
+Git v2.10.5 Release Notes
+=========================
+
+Fixes since v2.10.4
+-------------------
+
+ * "git cvsserver" no longer is invoked by "git daemon" by default,
+ as it is old and largely unmaintained.
+
+ * Various Perl scripts did not use safe_pipe_capture() instead of
+ backticks, leaving them susceptible to end-user input. They have
+ been corrected.
+
+Credits go to joernchen <joernchen@phenoelit.de> for finding the
+unsafe constructs in "git cvsserver", and to Jeff King at GitHub for
+finding and fixing instances of the same issue in other scripts.
+
diff --git a/Documentation/RelNotes/2.11.4.txt b/Documentation/RelNotes/2.11.4.txt
new file mode 100644
index 0000000000..ad4da8eb09
--- /dev/null
+++ b/Documentation/RelNotes/2.11.4.txt
@@ -0,0 +1,17 @@
+Git v2.11.4 Release Notes
+=========================
+
+Fixes since v2.11.3
+-------------------
+
+ * "git cvsserver" no longer is invoked by "git daemon" by default,
+ as it is old and largely unmaintained.
+
+ * Various Perl scripts did not use safe_pipe_capture() instead of
+ backticks, leaving them susceptible to end-user input. They have
+ been corrected.
+
+Credits go to joernchen <joernchen@phenoelit.de> for finding the
+unsafe constructs in "git cvsserver", and to Jeff King at GitHub for
+finding and fixing instances of the same issue in other scripts.
+
diff --git a/Documentation/RelNotes/2.12.5.txt b/Documentation/RelNotes/2.12.5.txt
new file mode 100644
index 0000000000..8fa73cfce7
--- /dev/null
+++ b/Documentation/RelNotes/2.12.5.txt
@@ -0,0 +1,17 @@
+Git v2.12.5 Release Notes
+=========================
+
+Fixes since v2.12.4
+-------------------
+
+ * "git cvsserver" no longer is invoked by "git daemon" by default,
+ as it is old and largely unmaintained.
+
+ * Various Perl scripts did not use safe_pipe_capture() instead of
+ backticks, leaving them susceptible to end-user input. They have
+ been corrected.
+
+Credits go to joernchen <joernchen@phenoelit.de> for finding the
+unsafe constructs in "git cvsserver", and to Jeff King at GitHub for
+finding and fixing instances of the same issue in other scripts.
+
diff --git a/Documentation/RelNotes/2.13.6.txt b/Documentation/RelNotes/2.13.6.txt
new file mode 100644
index 0000000000..afcae9c808
--- /dev/null
+++ b/Documentation/RelNotes/2.13.6.txt
@@ -0,0 +1,17 @@
+Git v2.13.6 Release Notes
+=========================
+
+Fixes since v2.13.5
+-------------------
+
+ * "git cvsserver" no longer is invoked by "git daemon" by default,
+ as it is old and largely unmaintained.
+
+ * Various Perl scripts did not use safe_pipe_capture() instead of
+ backticks, leaving them susceptible to end-user input. They have
+ been corrected.
+
+Credits go to joernchen <joernchen@phenoelit.de> for finding the
+unsafe constructs in "git cvsserver", and to Jeff King at GitHub for
+finding and fixing instances of the same issue in other scripts.
+
diff --git a/Documentation/RelNotes/2.14.2.txt b/Documentation/RelNotes/2.14.2.txt
index 5517afcf59..bec9186ade 100644
--- a/Documentation/RelNotes/2.14.2.txt
+++ b/Documentation/RelNotes/2.14.2.txt
@@ -32,4 +32,74 @@ Fixes since v2.14.1
daemon is torn down were flaky. This was fixed by reacting to
ECONNRESET and behaving as if we got an EOF.
+ * Some versions of GnuPG fail to kill gpg-agent it auto-spawned
+ and such a left-over agent can interfere with a test. Work it
+ around by attempting to kill one before starting a new test.
+
+ * "git log --tag=no-such-tag" showed log starting from HEAD, which
+ has been fixed---it now shows nothing.
+
+ * The "tag.pager" configuration variable was useless for those who
+ actually create tag objects, as it interfered with the use of an
+ editor. A new mechanism has been introduced for commands to enable
+ pager depending on what operation is being carried out to fix this,
+ and then "git tag -l" is made to run pager by default.
+
+ * "git push --recurse-submodules $there HEAD:$target" was not
+ propagated down to the submodules, but now it is.
+
+ * Commands like "git rebase" accepted the --rerere-autoupdate option
+ from the command line, but did not always use it. This has been
+ fixed.
+
+ * "git clone --recurse-submodules --quiet" did not pass the quiet
+ option down to submodules.
+
+ * "git am -s" has been taught that some input may end with a trailer
+ block that is not Signed-off-by: and it should refrain from adding
+ an extra blank line before adding a new sign-off in such a case.
+
+ * "git svn" used with "--localtime" option did not compute the tz
+ offset for the timestamp in question and instead always used the
+ current time, which has been corrected.
+
+ * Memory leaks in a few error codepaths have been plugged.
+
+ * bash 4.4 or newer gave a warning on NUL byte in command
+ substitution done in "git stash"; this has been squelched.
+
+ * "git grep -L" and "git grep --quiet -L" reported different exit
+ codes; this has been corrected.
+
+ * When handshake with a subprocess filter notices that the process
+ asked for an unknown capability, Git did not report what program
+ the offending subprocess was running. This has been corrected.
+
+ * "git apply" that is used as a better "patch -p1" failed to apply a
+ taken from a file with CRLF line endings to a file with CRLF line
+ endings. The root cause was because it misused convert_to_git()
+ that tried to do "safe-crlf" processing by looking at the index
+ entry at the same path, which is a nonsense---in that mode, "apply"
+ is not working on the data in (or derived from) the index at all.
+ This has been fixed.
+
+ * Killing "git merge --edit" before the editor returns control left
+ the repository in a state with MERGE_MSG but without MERGE_HEAD,
+ which incorrectly tells the subsequent "git commit" that there was
+ a squash merge in progress. This has been fixed.
+
+ * "git archive" did not work well with pathspecs and the