mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
63,181 Commits 8 Branches 892 Tags
7c86d365da1fe2e02f568365f0ae45deb2bd412e
Commit Graph

1531 Commits

Author SHA1 Message Date
Junio C Hamano
de88ac70f3 Git 2.32-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-22 18:29:01 +09:00
Junio C Hamano
c69f2f8c86 Merge branch 'cs/http-use-basic-after-failed-negotiate' 
Regression fix for a change made during this cycle.

* cs/http-use-basic-after-failed-negotiate:
  Revert "remote-curl: fall back to basic auth if Negotiate fails"
  t5551: test http interaction with credential helpers
 2021-05-21 05:49:41 +09:00
Junio C Hamano
88dd4282d9 A handful more topics before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-20 08:55:00 +09:00
Junio C Hamano
bf949ade81 Git 2.32-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-16 21:05:24 +09:00
Junio C Hamano
97eea85a0a The seventeenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-14 08:26:11 +09:00
Junio C Hamano
df6c4f722c The sixteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-11 15:27:23 +09:00
Junio C Hamano
49f38e2de4 The fifteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-10 16:59:47 +09:00
Junio C Hamano
2d677e5b15 The fourteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-07 12:47:42 +09:00
Junio C Hamano
7e39198978 The thirteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-30 13:50:27 +09:00
Junio C Hamano
311531c9de The twelfth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-20 17:23:37 -07:00
Junio C Hamano
b0c09ab879 The eleventh (aka "ort") batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-16 13:53:34 -07:00
Junio C Hamano
d1b10fc6d8 The tenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-15 13:36:01 -07:00
Junio C Hamano
54a3917115 The ninth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-13 15:28:53 -07:00
Junio C Hamano
89b43f80a5 The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-08 13:23:26 -07:00
Junio C Hamano
a0dda6023e The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-07 16:54:09 -07:00
Junio C Hamano
2e36527f23 The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-02 14:43:31 -07:00
Junio C Hamano
a65ce7f831 The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-30 14:35:38 -07:00
Junio C Hamano
84d06cdc06 Sync with v2.31.1 2021-03-26 14:59:47 -07:00
Junio C Hamano
26c4f98ffd The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-26 14:59:03 -07:00
Junio C Hamano
48bf2fa8ba Git 2.31.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-26 14:49:41 -07:00
Junio C Hamano
9198c13e34 The third patch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-24 14:36:27 -07:00
Junio C Hamano
1424303384 The second batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-22 14:00:25 -07:00
Junio C Hamano
98164e9585 The first batch in 2.32 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-19 15:25:40 -07:00
Junio C Hamano
13d7ab6b5d Git 2.31-rc2 2021-03-08 16:09:43 -08:00
Junio C Hamano
56a57652ef Sync with Git 2.30.2 for CVE-2021-21300 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-08 16:09:07 -08:00
Junio C Hamano
be7935ed8b Merged the open-eintr workaround for macOS 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-04 15:42:50 -08:00
Elijah Newren
58d581c344 Documentation/RelNotes: improve release note for rename detection work 
There were some early changes in the 2.31 cycle to optimize some setup
in diffcore-rename.c[1], some later changes to measure performance[2],
and finally some significant changes to improve rename detection
performance.  The final one was merged with the note

   Performance optimization work on the rename detection continues.

That works for the commit log, but feels misleading as a release note
since all the changes were within one cycle.  Simplify this to just

   Performance improvements for rename detection.

The former wording could be seen as hinting that more performance
improvements will come in 2.32, which is true, but we can just cover
those in the 2.32 release notes when the time comes.

[1] a5ac31b5b1 (Merge branch 'en/diffcore-rename', 2021-01-25)
[2] d3a035b055 (Merge branch 'en/merge-ort-perf', 2021-02-11)
[3] 12bd17521c (Merge branch 'en/diffcore-rename', 2021-03-01)

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-04 15:38:11 -08:00
Junio C Hamano
ec125d1bc1 Hopefully the last batch before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-03-01 14:02:58 -08:00
Junio C Hamano
225365fb51 Git 2.31-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-02-25 16:43:33 -08:00
Junio C Hamano
966e671106 The tenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-02-22 16:12:43 -08:00
Junio C Hamano
2283e0e9af The ninth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-02-17 17:21:43 -08:00
Junio C Hamano
328c109303 The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-02-12 14:21:04 -08:00
Johannes Schindelin
94f6e3e283 Git 2.30.2 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:51:13 +01:00
Johannes Schindelin
e4e68081bb Sync with 2.29.3 
* maint-2.29:
  Git 2.29.3
  Git 2.28.1
  Git 2.27.1
  Git 2.26.3
  Git 2.25.5
  Git 2.24.4
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:51:12 +01:00
Johannes Schindelin
0628636d0c Git 2.29.3 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:50:15 +01:00
Johannes Schindelin
d7bdabe52f Sync with 2.28.1 
* maint-2.28:
  Git 2.28.1
  Git 2.27.1
  Git 2.26.3
  Git 2.25.5
  Git 2.24.4
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:50:14 +01:00
Johannes Schindelin
e4f4299859 Git 2.28.1 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:50:10 +01:00
Johannes Schindelin
3f01e56686 Sync with 2.27.1 
* maint-2.27:
  Git 2.27.1
  Git 2.26.3
  Git 2.25.5
  Git 2.24.4
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:50:09 +01:00
Johannes Schindelin
6ff7f46039 Git 2.27.1 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:50:05 +01:00
Johannes Schindelin
2d1142a3e8 Sync with 2.26.3 
* maint-2.26:
  Git 2.26.3
  Git 2.25.5
  Git 2.24.4
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:50:04 +01:00
Johannes Schindelin
a79fd20c71 Git 2.26.3 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:50:00 +01:00
Johannes Schindelin
8f80393c14 Sync with 2.25.5 
* maint-2.25:
  Git 2.25.5
  Git 2.24.4
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:49:59 +01:00
Johannes Schindelin
42ce4c7930 Git 2.25.5 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:49:55 +01:00
Johannes Schindelin
97d1dcb1ef Sync with 2.24.4 
* maint-2.24:
  Git 2.24.4
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:49:55 +01:00
Johannes Schindelin
06214d171b Git 2.24.4 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:49:50 +01:00
Johannes Schindelin
92ac04b8ee Sync with 2.23.4 
* maint-2.23:
  Git 2.23.4
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:49:50 +01:00
Johannes Schindelin
d60b6a96f0 Git 2.23.4 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:49:46 +01:00
Johannes Schindelin
4bd06fd490 Sync with 2.22.5 
* maint-2.22:
  Git 2.22.5
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:49:45 +01:00
Johannes Schindelin
c753e2a7a8 Git 2.22.5 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2021-02-12 15:49:41 +01:00
Johannes Schindelin
bcf08f33d8 Sync with 2.21.4 
* maint-2.21:
  Git 2.21.4
  Git 2.20.5
  Git 2.19.6
  Git 2.18.5
  Git 2.17.6
  unpack_trees(): start with a fresh lstat cache
  run-command: invalidate lstat cache after a command finished
  checkout: fix bug that makes checkout follow symlinks in leading path
 2021-02-12 15:49:41 +01:00