Edward Thomson
b7bad55e4b
v1.3: very very last-minute changelog updates
v1.3.0
2021-09-27 16:09:50 -04:00
Edward Thomson
424812e3d8
Merge pull request #6071 from 257/examples
...
examples: Free the git_config and git_config_entry after use
2021-09-27 11:23:44 -04:00
Edward Thomson
13f1270a7a
v1.3: changelog updates for last-minute changes
2021-09-27 08:58:50 -04:00
Edward Thomson
8c29885e02
Merge pull request #6076 from libgit2/ethomson/oidarray_dispose
...
oidarray: introduce `git_oidarray_dispose`
2021-09-27 08:57:03 -04:00
Edward Thomson
b6449de323
Merge pull request #6075 from libgit2/ethomson/attr_longpaths
2021-09-27 08:39:55 -04:00
Edward Thomson
853ba20320
Merge pull request #6073 from libgit2/ethomson/attr_lookups
2021-09-27 08:39:39 -04:00
Edward Thomson
a6f6a9f457
Merge pull request #6077 from libgit2/ethomson/strarray
...
buf: common_prefix takes a string array
2021-09-26 22:09:37 -04:00
Edward Thomson
7e7cfe8acd
buf: common_prefix takes a string array
...
`git_strarray` is a public-facing type. Change
`git_buf_text_common_prefix` to not use it, and just take an array of
strings instead.
2021-09-26 20:20:57 -04:00
Edward Thomson
0bd132ab82
oidarray: introduce git_oidarray_dispose
...
Since users are disposing the _contents_ of the oidarray, not freeing
the oidarray itself, the proper cleanup function is
`git_oidarray_dispose`. Deprecate `git_oidarray_free`.
2021-09-26 18:02:07 -04:00
Edward Thomson
46508fe647
attr_file: don't take the repo as an arg
...
The `repo` argument is now unnecessary. Remove it.
2021-09-26 17:46:07 -04:00
Edward Thomson
f5a9f0a258
attr_file: don't validate workdir paths in attr lookups
...
When looking up attributes for a file, we construct an absolute path
to the queried file within the working directory so that we can accept
both absolute paths and working directory relative paths. We then trim
the leading working directory path to give us an in-repo path.
Since we only want the in-repo path to look up attributes - and not to
read it from disk - we don't need to validate its length.
2021-09-26 17:46:07 -04:00
Edward Thomson
091bd738d7
attr: ensure lookups are on repo-relative paths
...
Attribute lookups are done on paths relative to the repository. Fail if
erroneously presented with an absolute path.
2021-09-25 14:39:01 +01:00
Edward Thomson
3d8749d323
checkout: always provide a path for attribute lookup
...
Always pass a working-directory relative path to attribute lookups
during checkout.
2021-09-25 14:39:01 +01:00
Edward Thomson
848bd0098a
blob: improve create_from_disk attribute lookups
...
Resolve absolute paths to be working directory relative when looking up
attributes. Importantly, now we will _never_ pass an absolute path down
to attribute lookup functions.
2021-09-25 14:39:01 +01:00
Edward Thomson
0f4256b8d7
repository: improve hashfile for absolute paths
...
When `git_repository_hashfile` is handed an absolute path, it determines
whether the path is within the repository's working directory or not.
This is necessary when there is no `as_path` specified.
If the path is within the working directory, then the given path should
be used for attribute lookups (it is the effective `as_path`). If it is
not within the working directory, then it is _not_ eligible.
Importantly, now we will _never_ pass an absolute path down to attribute
lookup functions.
2021-09-25 14:39:01 +01:00
Edward Thomson
d6c7ca3ea9
win32: posixify the output of p_getcwd
...
Make p_getcwd match the rest of our win32 path handling semantics.
(This is currently only used in tests, which is why this disparity went
unnoticed.)
2021-09-25 14:39:01 +01:00
Paymon MARANDI
581cfbda85
examples: Free the git_config and git_config_entry after use
2021-09-24 14:14:59 -04:00
Edward Thomson
136901086e
changelog: separate releases with a horizontal rule
2021-09-22 15:31:21 -04:00
Edward Thomson
61bbb2d11a
changelog: fix typo
2021-09-22 15:28:23 -04:00
Edward Thomson
183da2cc24
Merge pull request #6069 from libgit2/ethomson/v1_3
...
v1.3.0
2021-09-22 15:25:53 -04:00
Edward Thomson
e7437162ff
v1.3: update version number
2021-09-22 08:49:24 -04:00
Edward Thomson
e0531f2c14
v1.3: changelog
2021-09-22 08:49:22 -04:00
Edward Thomson
a5644b8090
Merge pull request #6068 from libgit2/ethomson/diff_enum
...
diff: update `GIT_DIFF_IGNORE_BLANK_LINES`
2021-09-22 08:48:17 -04:00
Edward Thomson
1ba7c32709
diff: update GIT_DIFF_IGNORE_BLANK_LINES
...
`GIT_DIFF_IGNORE_BLANK_LINES` needs to be within a (signed) int, per the
`enum` definition of ISO C.
2021-09-21 20:23:44 -04:00
Edward Thomson
efa0d64e03
Merge pull request #6067 from libgit2/ethomson/filter_commit_id
...
filter: use a `git_oid` in filter options, not a pointer
2021-09-21 13:19:10 -04:00
Edward Thomson
abd8142c4a
Merge pull request #6064 from libgit2/ethomson/ci_libssh2
...
ci: pull libssh2 from www.libssh2.org
2021-09-21 12:27:37 -04:00
Edward Thomson
825dd544ab
ci: pull libssh2 from www.libssh2.org
...
libssh2.org and www.libssh2.org were previously identical; now this is a
redirect.
2021-09-21 12:02:01 -04:00
Edward Thomson
5ea2966d01
Merge pull request #6066 from libgit2/ethomson/deprecation
...
Fixes for deprecated APIs
2021-09-21 11:52:05 -04:00
Edward Thomson
90656858ce
filter: use a git_oid in filter options, not a pointer
...
Using a `git_oid *` in filter options was a mistake; it is a deviation
from our typical pattern, and callers in some languages that GC may need
very special treatment in order to pass both an options structure and a
pointer outside of it.
2021-09-21 11:28:39 -04:00
Edward Thomson
470acc7188
rebase: fix (deprecated) signing test
2021-09-21 11:01:27 -04:00
Edward Thomson
62eb2f8316
email: don't clear buffer in append function
...
`git_email__append_from_diff` is meant to - well, append from a diff.
Clearing the buffer, by definition, is not appending. Stop doing that.
2021-09-21 10:59:49 -04:00
Edward Thomson
ba01547d4a
Merge pull request #6061 from libgit2/ethomson/email
...
Introduce `git_email_create`; deprecate `git_diff_format_email`
2021-09-20 21:45:10 -04:00
Edward Thomson
0a8728622e
Merge pull request #6063 from libgit2/ethomson/win32_envvar
...
win32: allow empty environment variables
2021-09-20 14:00:36 -04:00
Edward Thomson
18fc751e00
win32: allow empty environment variables
...
A length of 0 indicates an error and GetLastError() will be set. If
GetLastError() is unset then the environment variable has a length of 0.
2021-09-20 13:13:31 -04:00
Edward Thomson
1396a9b556
Merge pull request #6020 from lolgear/refactoring/stdint_ifdef_condition_has_been_reverted
...
Stdint header condition has been reverted.
2021-09-20 12:36:56 -04:00
Edward Thomson
bfdba8ee93
Merge branch 'sathieu/patch-1' into main
2021-09-20 12:19:48 -04:00
Edward Thomson
8e7621241d
httpproxy: move empty string test above config
...
The configuration change will override the environment variable, so the
environment variable check needs to come first.
2021-09-20 12:19:05 -04:00
Edward Thomson
d60872f681
Merge branch 'longpath_filter_bug' into main
2021-09-20 14:09:37 +01:00
Edward Thomson
005c740b15
win32: ensure content filtering occurs in longpath test
2021-09-20 14:09:00 +01:00
Edward Thomson
482e385353
Merge remote-tracking branch 'mathworks/longpath_filter_bug' into main
2021-09-20 14:06:50 +01:00
Edward Thomson
0644c2e8c5
Merge pull request #6058 from mathworks/proxy_config_with_detached_remote
...
Allow proxy options when connecting with a detached remote.
2021-09-20 08:39:46 -04:00
Edward Thomson
4f5653a4b5
Merge pull request #6060 from ccstolley/ccs_merge_bugfix
...
merge: Check file mode when resolving renames
2021-09-20 08:33:12 -04:00
Laurence McGlashan
3bd462a113
Update remote.c
...
Initialise cfg variable.
2021-09-18 21:08:20 +01:00
Laurence McGlashan
c8823fb050
Apply suggestions from code review
...
Co-authored-by: Edward Thomson <ethomson@github.com >
2021-09-18 21:00:48 +01:00
Edward Thomson
3f36e79690
Merge pull request #6050 from shijinglu/patch-1
...
Update README.md
2021-09-18 14:07:18 -04:00
Edward Thomson
ba3595af0f
diff: deprecate diff_format_email
...
`git_diff_format_email` is deprecated in favor of `git_email_create`.
2021-09-18 08:32:42 -04:00
Edward Thomson
67b1d019a8
email: include renames by default
...
`git format-patch` includes diffs with rename detection enabled by
default when creating emails. Match this behavior.
2021-09-18 08:32:41 -04:00
Edward Thomson
323f222f7e
email: include binary diffs by default
...
`git format-patch` includes binary diffs by default when creating
emails. Match this behavior.
2021-09-18 08:32:41 -04:00
Edward Thomson
c443495bd3
diff: use git_email_create in diff_format_email
2021-09-18 08:32:41 -04:00
Edward Thomson
971ed7537c
email: introduce 'append_from_diff'
...
Introduce `git_email__append_from_diff` so that we don't always
overwrite the input buffer.
2021-09-18 08:32:41 -04:00