@@ -8,44 +8,56 @@ Fixes since v1.6.3.1
8
8
casting the (char *) pointer to (int *); GCC 4.4 did not like this,
9
9
and aborted compilation.
10
10
11
- * http-push had a small use-after-free bug.
12
-
13
- * command completion code in bash did not reliably detect that we are
14
- in a bare repository.
15
-
16
- * "git for-each-ref" had a segfaulting bug when dealing with a tag object
17
- created by an ancient git.
18
-
19
11
* Some unlink(2) failures went undiagnosed.
20
12
21
13
* The "recursive" merge strategy misbehaved when faced rename/delete
22
14
conflicts while coming up with an intermediate merge base.
23
15
16
+ * The low-level merge algorithm did not handle a degenerate case of
17
+ merging a file with itself using itself as the common ancestor
18
+ gracefully. It should produce the file itself, but instead
19
+ produced an empty result.
20
+
24
21
* GIT_TRACE mechanism segfaulted when tracing a shell-quoted aliases.
25
22
23
+ * OpenBSD also uses st_ctimspec in "struct stat", instead of "st_ctim".
24
+
25
+ * With NO_CROSS_DIRECTORY_HARDLINKS, "make install" can be told not to
26
+ create hardlinks between $(gitexecdir)/git-$builtin_commands and
27
+ $(bindir)/git.
28
+
29
+ * command completion code in bash did not reliably detect that we are
30
+ in a bare repository.
31
+
26
32
* "git add ." in an empty directory complained that pathspec "." did not
27
33
match anything, which may be technically correct, but not useful. We
28
34
silently make it a no-op now.
29
35
36
+ * "git add -p" (and "patch" action in "git add -i") was broken when
37
+ the first hunk that adds a line at the top was split into two and
38
+ both halves are marked to be used.
39
+
40
+ * "git for-each-ref" had a segfaulting bug when dealing with a tag object
41
+ created by an ancient git.
42
+
30
43
* "git format-patch -k" still added patch numbers if format.numbered
31
44
configuration was set.
32
45
33
- * OpenBSD also uses st_ctimspec in "struct stat", instead of "st_ctim" .
46
+ * "git grep --color ''" did not terminate .
34
47
35
- * With NO_CROSS_DIRECTORY_HARDLINKS, "make install" can be told not to
36
- create hardlinks between $(gitexecdir)/git-$builtin_commands and
37
- $(bindir)/git.
48
+ * http-push had a small use-after-free bug.
38
49
39
50
* "git push" was converting OFS_DELTA pack representation into less
40
51
efficient REF_DELTA representation unconditionally upon transfer,
41
52
making the transferred data unnecessarily larger.
42
53
54
+ * "git remote show origin" segfaulted when origin was still empty.
55
+
43
56
Many other general usability updates around help text, diagnostic messages
44
57
and documentation are included as well.
45
58
46
59
---
47
60
exec >/var/tmp/1
48
- O=v1.6.3.1-51-g2a1feb9
61
+ O=v1.6.3.1-68-g456cb4c
49
62
echo O=$(git describe maint)
50
63
git shortlog --no-merges $O..maint
51
-
0 commit comments