Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Documentation/RelNotes/2.53.0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,7 @@ Fixes since v2.52
(merge fddba8f737 ja/doc-synopsis-style later to maint).
(merge 22ce0cb639 en/xdiff-cleanup-2 later to maint).
(merge 8ef7355a8f je/doc-pull later to maint).
(merge 48176f953f jc/capability-leak later to maint).
(merge 8cbbdc92f7 kh/doc-pre-commit-fix later to maint).
(merge d4bc39a4d9 mh/doc-config-gui-gcwarning later to maint).
(merge 41d425008a kh/doc-send-email-paragraph-fix later to maint).
5 changes: 5 additions & 0 deletions Documentation/config/gui.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,8 @@ gui.blamehistoryctx::
linkgit:gitk[1] for the selected commit, when the `Show History
Context` menu item is invoked from 'git gui blame'. If this
variable is set to zero, the whole history is shown.

gui.GCWarning::
Determines whether linkgit:git-gui[1] should prompt for garbage
collection when git detects a large number of loose objects in
the repository. The default value is "true".
1 change: 0 additions & 1 deletion Documentation/git-send-email.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ for instructions.
If disabled with `--no-use-imap-only`, the emails will be sent like usual.
Disabled by default, but the `sendemail.useImapOnly` configuration
variable can be used to enable it.

+
This feature requires setting up `git imap-send`. See linkgit:git-imap-send[1]
for instructions.
Expand Down
11 changes: 4 additions & 7 deletions Documentation/githooks.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,14 @@ invoked before obtaining the proposed commit log message and
making a commit. Exiting with a non-zero status from this script
causes the `git commit` command to abort before creating a commit.

The default 'pre-commit' hook, when enabled, catches introduction
of lines with trailing whitespaces and aborts the commit when
such a line is found.

All the `git commit` hooks are invoked with the environment
variable `GIT_EDITOR=:` if the command will not bring up an editor
to modify the commit message.

The default 'pre-commit' hook, when enabled--and with the
`hooks.allownonascii` config option unset or set to false--prevents
the use of non-ASCII filenames.
The default 'pre-commit' hook, when enabled, prevents the introduction
of non-ASCII filenames and lines with trailing whitespace. The non-ASCII
check can be turned off by setting the `hooks.allownonascii` config
option to `true`.

pre-merge-commit
~~~~~~~~~~~~~~~~
Expand Down
2 changes: 2 additions & 0 deletions connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ static void process_capabilities(struct packet_reader *reader, size_t *linelen)
size_t nul_location = strlen(line);
if (nul_location == *linelen)
return;

free(server_capabilities_v1);
server_capabilities_v1 = xstrdup(line + nul_location + 1);
*linelen = nul_location;

Expand Down
1 change: 1 addition & 0 deletions t/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ integration_tests = [
't5562-http-backend-content-length.sh',
't5563-simple-http-auth.sh',
't5564-http-proxy.sh',
't5565-push-multiple.sh',
't5570-git-daemon.sh',
't5571-pre-push-hook.sh',
't5572-pull-submodule.sh',
Expand Down
39 changes: 39 additions & 0 deletions t/t5565-push-multiple.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/sh

test_description='push to group'

. ./test-lib.sh

test_expect_success setup '
for i in 1 2 3
do
git init dest-$i &&
git -C dest-$i symbolic-ref HEAD refs/heads/not-a-branch ||
return 1
done &&
test_tick &&
git commit --allow-empty -m "initial" &&
git config set --append remote.them.pushurl "file://$(pwd)/dest-1" &&
git config set --append remote.them.pushurl "file://$(pwd)/dest-2" &&
git config set --append remote.them.pushurl "file://$(pwd)/dest-3" &&
git config set --append remote.them.push "+refs/heads/*:refs/heads/*"
'

test_expect_success 'push to group' '
git push them &&
j= &&
for i in 1 2 3
do
git -C dest-$i for-each-ref >actual-$i &&
if test -n "$j"
then
test_cmp actual-$j actual-$i
else
cat actual-$i
fi &&
j=$i ||
return 1
done
'

test_done