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í
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
Michael Schubert
6f6b0c013c
tests-clar/repo: remove unused variable
2012-10-24 15:42:09 +02:00
Ignacio Casal Quinteiro
4bc252e4ec
Fix example in comment
2012-10-24 15:00:56 +02:00
Scott J. Goldman
308581de9e
Fix Makefile.embed to build src/sha1/*.c
2012-10-23 18:18:19 -07:00
Vicent Martí
81e7b10a15
Merge pull request #1012 from carlosmn/libcrypto-sha
...
Use libcrypto's SHA-1 implementation when linking to it
2012-10-23 13:43:28 -07:00
Carlos Martín Nieto
7205a4d94c
Use libcrypto's SHA-1 implementation when linking to it
...
libcryto's SHA-1 implementation is measurably better than the one that
ships with the library. If we link to it for HTTPS support already,
use that implementation instead.
Testing on a ~600MB of the linux repository, this reduces indexing
time by 40% and removes the hashing from the top spot in the perf
output.
2012-10-23 20:30:16 +02:00
Russell Belfer
5b67d145d8
Merge pull request #923 from yorah/topic/config-store
...
Add git_config_level support when handling config files
2012-10-23 09:53:15 -07:00
yorah
a1abe66aca
Add config level support in the config API
...
Added `struct git_config_entry`: a git_config_entry contains the key, the value, and the config file level from which a config element was found.
Added `git_config_open_level`: build a single-level focused config object from a multi-level one.
We are now storing `git_config_entry`s in the khash of the config_file
2012-10-23 12:48:38 +02:00
yorah
f8ede94808
Fix adding variable to config file with no trailing newline
...
This can occur after a manual modification of a config file.
2012-10-23 11:48:50 +02:00
Vicent Martí
8a89aa1f57
Merge pull request #963 from carlosmn/remote-save-autotag
...
Save the autotag configuration for remotes
2012-10-22 12:04:48 -07:00
Vicent Martí
40846f3d9a
Merge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEAD
...
More orphaned head love
2012-10-22 10:51:43 -07:00
nulltoken
f36fb761dc
tests: more git_repository_head_detached() coverage
2012-10-22 19:46:00 +02:00
nulltoken
c436ed26e0
reset: make git_reset() cope with an orphaned HEAD
2012-10-22 19:46:00 +02:00
Vicent Martí
0e19840800
Merge pull request #1008 from nulltoken/fix/chunked_blob
...
blob: do not create temp files in the current path
2012-10-22 10:39:40 -07:00
nulltoken
cfa6465cc4
blob: do not create temp files in the current path
...
- make sure temporary streamed blobs are created under the
.git/objects folder and not in the current path, whatever it is.
- do not make the name of the temp file depend on the hintpath.
2012-10-22 15:08:09 +02:00
nulltoken
cd1ef82253
test: extract make_head_orphaned() logic
2012-10-20 12:07:53 +02:00
nulltoken
209e34fa70
tests: leverage git_repository_detach_head()
2012-10-20 12:01:04 +02:00
Vicent Martí
c497a63bd6
Merge pull request #1001 from veeti/build-fixes
...
Changes to CMake for packaging
2012-10-19 17:06:51 -07:00
Philip Kelley
11c2a9c67d
Merge pull request #1003 from arrbee/fix-test-core-env
...
Fix env variable tests with new Win32 path rules
2012-10-19 17:06:07 -07:00
Veeti Paananen
88e0fc05d6
Remove backwards compatibility for INSTALL_LIB
2012-10-20 02:59:40 +03:00
Veeti Paananen
291f712292
Let environment CFLAGS override the debug flags
2012-10-20 02:57:02 +03:00
Veeti Paananen
9795a40f88
Use standard CMake variable names for installation paths
...
Rename INSTALL_INC and INSTALL_BIN to INCLUDE_INSTALL_DIR and
BIN_INSTALL_DIR, which are more commonly used. This is also
consistent with the variable for the library path which is
already LIB_INSTALL_DIR.
2012-10-20 02:56:35 +03:00
Russell Belfer
0d422ec9c2
Fix env variable tests with new Win32 path rules
...
The new Win32 global path search was not working with the
environment variable tests. But when I fixed the test, the new
codes use of getenv() was causing more failures (presumably because
of caching on Windows ???). This fixes the global file lookup to
always go directly to the Win32 API in a predictable way.
2012-10-19 15:40:43 -07:00
Vicent Marti
875b16eb54
repository: Typo
2012-10-19 23:44:49 +02:00
Vicent Martí
cf028856bc
Merge pull request #1000 from nulltoken/error/GIT_EORPHANEDHEAD
...
Add error GIT_EORPHANEDHEAD
2012-10-19 14:43:09 -07:00
Russell Belfer
4fec465bd3
Merge pull request #1002 from tnm/patch-1
...
Update README because vmg is @vmg.
2012-10-19 14:17:26 -07:00
Ted Nyman
1a23440235
Update README because vmg is @vmg.
2012-10-19 14:05:55 -07:00
nulltoken
8b05bea870
errors: deploy GIT_EORPHANEDHEAD usage
2012-10-19 22:01:53 +02:00
nulltoken
c4f68b3503
errors: introduce GIT_EORPHANEDHEAD
2012-10-19 21:23:34 +02:00
nulltoken
0532e7bb87
branch: allow deletion of branch when HEAD's missing
2012-10-19 21:23:22 +02:00
nulltoken
8dd0bef921
tests: Fix unused variable warning
2012-10-19 20:35:12 +02:00
Russell Belfer
350b83b67d
Merge pull request #998 from nulltoken/topic/explicit-errors
...
Enhance test coverage
2012-10-18 15:15:04 -07:00
nulltoken
2df37f42c1
refs: cover more refname validity edge cases
2012-10-18 23:59:22 +02:00
nulltoken
4fd7e8e583
status: querying a bare repo returns EBAREREPO
2012-10-18 23:38:35 +02:00
nulltoken
c2e43fb1f2
diff: workdir diffing in a bare repo returns EBAREREPO
2012-10-18 23:38:27 +02:00
Vicent Martí
502be5ff3f
Merge pull request #993 from pwkelley/clar_update
...
Update clar and add reliable rename for Win32
2012-10-18 14:15:37 -07:00
Vicent Martí
feea12859a
Merge pull request #995 from nulltoken/fix/issue_994
...
revparse: properly handle refnames containing a @
2012-10-18 14:14:37 -07:00
nulltoken
5912d74c69
revparse: properly handle refnames containing a @
...
Fix #994
2012-10-18 23:05:33 +02:00
Philip Kelley
c08b8a3a73
Update clar and add reliable rename for Win32
2012-10-18 14:50:17 -04:00
Carlos Martín Nieto
b2b571ce0c
fetch: declare variables at the top of the block
2012-10-18 19:05:24 +02:00
Vicent Martí
6f6871a9db
Merge pull request #992 from carlosmn/fetch-cancel
...
remote: support fetch cancelation
2012-10-18 09:52:13 -07:00
Carlos Martín Nieto
f0d2ddbbf8
remote: support fetch cancelation
...
Introduce git_remote_stop() which sets a variable that is checked by
the fetch process in a few key places. If this is variable is set, the
fetch is aborted.
2012-10-18 04:31:03 +02:00