delta/libgit2.git/src, branch ethomson/diff_file github.com: libgit2/libgit2.git git_diff_file: move `id_abbrev` 2016-08-03T21:57:37+00:00 Edward Thomson ethomson@github.com 2016-08-03T21:09:41+00:00 002c8e29a1bbe7bf5c07c9c26037d4f6a1ac81a6 Move `id_abbrev` to a more reasonable place where it packs more nicely (before anybody starts using it). 
Move `id_abbrev` to a more reasonable place where it packs more nicely
(before anybody starts using it).
Merge pull request #3865 from libgit2/ethomson/leaks 2016-08-02T22:43:12+00:00 Edward Thomson ethomson@github.com 2016-08-02T22:43:12+00:00 152efee20b74ea261cf8e05410a110687e17376e Fix leaks, some warnings and an error 
Fix leaks, some warnings and an error
 crlf: set a safe crlf default 2016-07-24T20:10:30+00:00 Edward Thomson ethomson@github.com 2016-07-24T20:10:30+00:00 df87648ab87f99a7cc53bdabc8aceb01e6771dac 






repository: don't cast to `int` for no reason
2016-07-24T19:49:19+00:00

Edward Thomson
ethomson@github.com

2016-07-22T18:02:00+00:00

b118f6479d5ceecbc64868583101c8abd356cf3b

And give it a default so that some compilers don't (unnecessarily)
complain.





And give it a default so that some compilers don't (unnecessarily)
complain.







index: cast to avoid warning
2016-07-24T19:49:19+00:00

Edward Thomson
ethomson@github.com

2016-07-22T16:53:13+00:00

4aaae9354cd12cdd2658696b2506b02fa584e776












packbuilder: `size_t` all the things
2016-07-24T19:49:19+00:00

Edward Thomson
ethomson@github.com

2016-07-15T21:18:39+00:00

60e15ecd5518f26fa2d18cca9ab22b248596e68c

After 1cd65991, we were passing a pointer to an `unsigned long` to
a function that now expected a pointer to a `size_t`.  These types
differ on 64-bit Windows, which means that we trash the stack.

Use `size_t`s in the packbuilder to avoid this.





After 1cd65991, we were passing a pointer to an `unsigned long` to
a function that now expected a pointer to a `size_t`.  These types
differ on 64-bit Windows, which means that we trash the stack.

Use `size_t`s in the packbuilder to avoid this.







apply: safety check files that dont end with eol
2016-07-24T19:49:19+00:00

Edward Thomson
ethomson@github.com

2016-07-15T03:32:35+00:00

581a4d3942ae5a66933632530fccd65f93ac5e4b












apply: check allocation properly
2016-07-24T19:49:19+00:00

Edward Thomson
ethomson@github.com

2016-07-15T03:04:47+00:00

c065f6a1d2b9c7c64646a6c0e65abbb3ca0dc4b1












apply: compare preimage to image
2016-07-24T19:49:19+00:00

Edward Thomson
ethomson@github.com

2016-07-15T02:59:37+00:00

531be3e8c6e8ec08db9798e7837a5abf933cc650

Compare the preimage to the image; don't compare the preimage to itself.





Compare the preimage to the image; don't compare the preimage to itself.







remote: Handle missing config values when deleting a remote
2016-07-15T17:47:01+00:00

David Turner
dturner@twosigma.com

2016-07-15T17:32:23+00:00

d81cb2e405d804d9c39b326d66c6b580b1445eaa

Somehow I ended up with the following in my ~/.gitconfig:
[branch "master"]
remote = origin
merge = master
rebase = true

I assume something went crazy while I was running the git.git tests
some time ago, and that I never noticed until now.

This is not a good configuration, but it shouldn't cause problems. But
it does. Specifically, if you have this in your config, and you
perform the following set of actions:

create a remote
fetch from that remote
create a branch off of the remote master branch called "master"
delete the branch
delete the remote

The remote delete fails with the message "Could not find key
'branch.master.rebase' to delete". This is because it's iterating over
the config entries (including the ones in the global config) and
believes that there is a master branch which must therefore have these
config keys.

https://github.com/libgit2/libgit2/issues/3856





Somehow I ended up with the following in my ~/.gitconfig:
[branch "master"]
remote = origin
merge = master
rebase = true

I assume something went crazy while I was running the git.git tests
some time ago, and that I never noticed until now.

This is not a good configuration, but it shouldn't cause problems. But
it does. Specifically, if you have this in your config, and you
perform the following set of actions:

create a remote
fetch from that remote
create a branch off of the remote master branch called "master"
delete the branch
delete the remote

The remote delete fails with the message "Could not find key
'branch.master.rebase' to delete". This is because it's iterating over
the config entries (including the ones in the global config) and
believes that there is a master branch which must therefore have these
config keys.

https://github.com/libgit2/libgit2/issues/3856