Commit Graph

3908 Commits

Author SHA1 Message Date
Edward Thomson
f45ec1a076 index refactoring 2012-10-29 20:04:21 -05:00
Ben Straub
81eecc342b Fetch: don't clobber received count
This memset was being reached after the entire packfile under
WinHttp, so the byte count was being lost for small repos.
2012-10-29 13:34:14 -07:00
Vicent Martí
63e44d5e9b Merge pull request #1027 from PaulThompson/cmake-flags-clean
Cmake flags clean
2012-10-29 13:24:08 -07:00
Vicent Martí
8a1479a55a Merge pull request #796 from nulltoken/topic/git-stash
Stash
2012-10-29 12:57:04 -07:00
Paul Thompson
88149fae9f Leave CMAKE_BUILD_TYPE absent on those generators which don't use it. 2012-10-28 10:21:28 +11:00
Paul Thompson
4a3be934de Removed overwrite of CMAKE_C_FLAGS_DEBUG.
- No overwriting allows control from cmake cache or cmdline
- -g is already the CMake default
- -O0 is already gcc's default
2012-10-28 09:56:18 +11:00
Paul Thompson
54c56d3efd Remove "-O2 -g" from default CMAKE_C_FLAGS.
- Those are the RelWithDebInfo flags.
- They should be controlled from CMAKE_BUILD_TYPE
2012-10-28 09:42:54 +11:00
Paul Thompson
2df7c94490 Remove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG.
- For Debug builds, CMake uses concatenated
  CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG
- This reverts commit 291f712292.
2012-10-28 09:30:08 +11:00
nulltoken
31966d20e3 repo: enhance git_repository_state() detection 2012-10-27 16:45:59 +02:00
nulltoken
00e161b977 tests: fix a memory leak 2012-10-27 11:43:48 +02:00
Ben Straub
a0ce87c51c Add network transfer callbacks on Windows 2012-10-26 13:43:13 -07:00
nulltoken
e4c64cf2aa stash: add git_stash_drop() 2012-10-26 22:11:15 +02:00
nulltoken
233884131d stash: add git_stash_foreach() 2012-10-26 22:11:09 +02:00
nulltoken
590fb68be0 stash: add git_stash_save() 2012-10-26 22:10:48 +02:00
nulltoken
eb44cfe07b error: add GITERR_STASH error type 2012-10-26 21:02:06 +02:00
nulltoken
4ea0a0ca05 refs: add GIT_REFS_STASH_FILE define 2012-10-26 21:02:05 +02:00
nulltoken
b1be9dd0e5 index: introduce git_index_owner() 2012-10-26 21:02:04 +02:00
nulltoken
1f87fa3595 reflog: fix bogus removal of reflog entries 2012-10-26 21:02:01 +02:00
nulltoken
27e3c58392 reflog: create reflog and its directory structure 2012-10-26 21:02:00 +02:00
nulltoken
d2aa6de722 reflog: Make git_reflog_free() accept null param 2012-10-26 21:02:00 +02:00
nulltoken
f7ae3f7531 reflog: fix documentation typos 2012-10-26 21:01:59 +02:00
nulltoken
65d12df525 message: reorganize tests 2012-10-26 21:01:58 +02:00
Vicent Martí
8bba3c95b8 Merge pull request #1021 from ethomson/cmake_vs
remove /ZM1000 from msvc builds
2012-10-25 13:17:08 -07:00
Edward Thomson
94155e2fa2 remove /ZM1000 from msvc builds 2012-10-25 14:51:08 -05:00
Russell Belfer
cb7180a6e2 Add git_diff_patch_print
This adds a `git_diff_patch_print()` API which is more like the
existing API to "print" a patch from an entire `git_diff_list`
but operates on a single `git_diff_patch` object.

Also, it rewrites the `git_diff_patch_to_str()` API to use that
function (making it very small).
2012-10-25 11:48:39 -07:00
Russell Belfer
3943dc78a5 Check errors while generating diff patch string 2012-10-25 11:12:56 -07:00
Russell Belfer
1b9346897b Merge pull request #925 from nulltoken/topic/moving-branch-updates-config
Updates config upon moving and deletion of branches
2012-10-25 10:55:03 -07:00
Vicent Marti
505f37b41a config: Only dereference value on success 2012-10-25 19:22:35 +02:00
Ben Straub
67dad09bdb Remove inline hint 2012-10-25 09:59:49 -07:00
Ben Straub
1fc375e6ef Fix Windows build
Pedantic ordering of GIT_UNUSED vs. variable declarations.
2012-10-25 09:02:55 -07:00
nulltoken
fcccf3045f remote: introduce git_remote_rename() 2012-10-25 17:42:36 +02:00
nulltoken
3a14d3e2bc buf: introduce git_buf_splice() 2012-10-25 17:42:35 +02:00
nulltoken
fb39b3a54c refspec: introduce git_refspec__serialize() 2012-10-25 17:42:34 +02:00
nulltoken
4fe5520a10 remote: remove some code duplication 2012-10-25 17:42:33 +02:00
nulltoken
e497b16c57 remote: prevent from saving a nameless remote 2012-10-25 17:42:33 +02:00
nulltoken
aba7078177 config: introduce git_config_rename_section() 2012-10-25 17:42:32 +02:00
nulltoken
383f164a09 branch: rename config section upon moving 2012-10-25 17:42:31 +02:00
nulltoken
0b98a8a424 branch: remove config section upon deletion 2012-10-25 17:42:31 +02:00
Vicent Martí
1eb8cd7f87 Merge pull request #990 from ben/clone-callbacks
Progress callbacks
2012-10-25 08:16:13 -07:00
Russell Belfer
93cf7bb8e2 Add git_diff_patch_to_str API
This adds an API to generate a complete single-file patch text
from a git_diff_patch object.
2012-10-24 20:56:32 -07:00
Martin Woodward
3728dfc056 Add new email address for Nicolas Pitre
See 03aa8ff3be, Nicolas Pitre's email address has changed to nico@fluxnic.net
2012-10-25 06:05:04 +03:00
Vicent Martí
5edb846e03 Merge pull request #1013 from ethomson/reset_merge
reset changes for merge
2012-10-24 18:33:02 -07:00
Edward Thomson
03bdb2addd GIT_EUNMERGED 2012-10-24 20:24:37 -05:00
Edward Thomson
632d8b230b reset changes for merge 2012-10-24 20:24:37 -05:00
Martin Woodward
bb3b305281 Add Dmitry Kakurin to hall of fame
See lines 59-60 from 44b1ff4c12/src/filter.c which contain a couple of lines of code to ignore an EOF at the end of a file when detecting if it is a text file or not. These came from this contribution that Dmitry made to core Git back in 2008 (f9dd4bf4e5) which was committed by Junio.

Dmitry gave his permission for these changes to be included in LibGit2 as well via email to vmg and myself
2012-10-25 03:22:38 +02:00
Martin Woodward
e4c2e006ca Add Holger Weiss to hall of fame
Permission obtained from Holger Weiss to include all of his contributions to Git into LibGit2. See 21e403a7b9
2012-10-25 02:23:59 +02:00
Ben Straub
1e3b8ed5cf Remove 'bytes' param from git_remote_download 2012-10-24 14:07:07 -07:00
Ben Straub
9762ad993d Renaming: fix example 2012-10-24 13:43:23 -07:00
Ben Straub
7d222e1312 Network progress: rename things
git_indexer_stats and friends -> git_transfer_progress*

Also made git_transfer_progress members more sanely
named.
2012-10-24 13:29:14 -07:00
Ben Straub
c4958e6818 Fix documentation comment 2012-10-24 12:38:05 -07:00