Skip to content

Commit 5c040f5

Browse files
committed
Sync with 2.4.4
Signed-off-by: Junio C Hamano <[email protected]>
2 parents c3b1c1e + f09bd21 commit 5c040f5

File tree

3 files changed

+42
-6
lines changed

3 files changed

+42
-6
lines changed

Documentation/RelNotes/2.4.4.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Git v2.4.4 Release Notes
2+
========================
3+
4+
Fixes since v2.4.3
5+
------------------
6+
7+
* l10n updates for German.
8+
9+
* An earlier leakfix to bitmap testing code was incomplete.
10+
11+
* "git clean pathspec..." tried to lstat(2) and complain even for
12+
paths outside the given pathspec.
13+
14+
* Communication between the HTTP server and http_backend process can
15+
lead to a dead-lock when relaying a large ref negotiation request.
16+
Diagnose the situation better, and mitigate it by reading such a
17+
request first into core (to a reasonable limit).
18+
19+
* The clean/smudge interface did not work well when filtering an
20+
empty contents (failed and then passed the empty input through).
21+
It can be argued that a filter that produces anything but empty for
22+
an empty input is nonsense, but if the user wants to do strange
23+
things, then why not?
24+
25+
* Make "git stash something --help" error out, so that users can
26+
safely say "git stash drop --help".
27+
28+
* Clarify that "log --raw" and "log --format=raw" are unrelated
29+
concepts.
30+
31+
* Catch a programmer mistake to feed a pointer not an array to
32+
ARRAY_SIZE() macro, by using a couple of GCC extensions.
33+
34+
Also contains typofixes, documentation updates and trivial code
35+
clean-ups.

Documentation/git.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
4343
branch of the `git.git` repository.
4444
Documentation for older releases are available here:
4545

46-
* link:v2.4.3/git.html[documentation for release 2.4.3]
46+
* link:v2.4.4/git.html[documentation for release 2.4.4]
4747

4848
* release notes for
49+
link:RelNotes/2.4.4.txt[2.4.4],
4950
link:RelNotes/2.4.3.txt[2.4.3],
5051
link:RelNotes/2.4.2.txt[2.4.2],
5152
link:RelNotes/2.4.1.txt[2.4.1],

po/de.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,7 +2183,7 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
21832183
#: builtin/add.c:358
21842184
#, c-format
21852185
msgid "Maybe you wanted to say 'git add .'?\n"
2186-
msgstr "Wollten Sie vielleicht 'git add .' sagen?\n"
2186+
msgstr "Meinten Sie vielleicht 'git add .'?\n"
21872187

21882188
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
21892189
#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
@@ -10478,8 +10478,8 @@ msgstr ""
1047810478
#: git-am.sh:142
1047910479
msgid "Using index info to reconstruct a base tree..."
1048010480
msgstr ""
10481-
"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis "
10482-
"nachzustellen"
10481+
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
10482+
"nachzustellen ..."
1048310483

1048410484
#: git-am.sh:157
1048510485
msgid ""
@@ -10491,11 +10491,11 @@ msgstr ""
1049110491

1049210492
#: git-am.sh:166
1049310493
msgid "Falling back to patching base and 3-way merge..."
10494-
msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..."
10494+
msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
1049510495

1049610496
#: git-am.sh:182
1049710497
msgid "Failed to merge in the changes."
10498-
msgstr "Merge der Änderungen fehlgeschlagen"
10498+
msgstr "Merge der Änderungen fehlgeschlagen."
1049910499

1050010500
#: git-am.sh:277
1050110501
msgid "Only one StGIT patch series can be applied at once"

0 commit comments

Comments
 (0)