Ben Straub
1fc375e6ef
Fix Windows build
...
Pedantic ordering of GIT_UNUSED vs. variable declarations.
2012-10-25 09:02:55 -07:00
Vicent Martí
1eb8cd7f87
Merge pull request #990 from ben/clone-callbacks
...
Progress callbacks
2012-10-25 08:16:13 -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
Ben Straub
1e3b8ed5cf
Remove 'bytes' param from git_remote_download
2012-10-24 14:07:07 -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
Michael Schubert
6f6b0c013c
tests-clar/repo: remove unused variable
2012-10-24 15:42:09 +02: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
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
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
Ben Straub
9c05c17b7a
Checkout progress now reports completed/total steps
2012-10-19 20:05:18 -07:00
Ben Straub
cd001bbbfe
Fix from rebase
2012-10-19 19:37:47 -07:00
Ben Straub
25e8b20169
Fix broken tests
2012-10-19 19:36:23 -07:00
Ben Straub
30a46ab1a9
Adjust for rebase
2012-10-19 19:36:22 -07:00
Ben Straub
aa1e86741d
Clone: in-line callbacks for progress
...
Also implemented in the git2 example.
2012-10-19 19:36:22 -07:00
Ben Straub
216863c48f
Fetch/indexer: progress callbacks
2012-10-19 19:36:22 -07:00
nulltoken
0ae81fc479
index: remove read_tree() progress indicator
...
git_index_read_tree() was exposing a parameter to provide the user with
a progress indicator. Unfortunately, due to the recursive nature of the
tree walk, the maximum number of items to process was unknown. Thus,
the indicator was only counting processed entries, without providing
any information how the number of remaining items.
2012-10-19 19:36:22 -07:00
Ben Straub
183d8bddeb
Remove checkout_stats from git_clone
2012-10-19 19:36:22 -07:00
Ben Straub
806426565f
Convert checkout_* to use progress callback
2012-10-19 19:36:21 -07:00
Ben Straub
2c8bbb27d9
Convert checkout_index to use progress callback
2012-10-19 19:34:15 -07:00
Ben Straub
3028be0723
Add git_indexer_stats field to git_remote
...
Also removing all the *stats parameters from external
APIs that don't need them anymore.
2012-10-19 19:34:14 -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
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 Martí
cf028856bc
Merge pull request #1000 from nulltoken/error/GIT_EORPHANEDHEAD
...
Add error GIT_EORPHANEDHEAD
2012-10-19 14:43:09 -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
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
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
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
Russell Belfer
4c47a8bcfe
Merge pull request #968 from arrbee/diff-support-typechange
...
Support TYPECHANGE records in status and adjust checkout accordingly
2012-10-17 14:14:51 -07:00
Michael Schubert
70d41f6bcd
Fix -Wunused-but-set-variable warning
2012-10-16 23:42:01 +02:00
Vicent Marti
18217e7e8a
test: Don't be so picky with failed lookups
...
Not found means not found, and the other way around.
2012-10-16 19:37:21 +02:00
Philip Kelley
9e37305aad
Merge pull request #984 from arrbee/fix-fnmatch-and-ignore
...
Fix single file ignores
2012-10-16 08:34:28 -07:00
nulltoken
add5efe7e9
test: fix some memory leaks
2012-10-16 00:49:05 +02:00
Ben Straub
71b79a0aab
Merge pull request #982 from nulltoken/clone/no-checkout
...
clone: Explicit support of no-checkout option
2012-10-15 15:24:50 -07:00
Russell Belfer
52032ae536
Fix single-file ignore checks
...
To answer if a single given file should be ignored, the path to
that file has to be processed progressively checking that there
are no intermediate ignored directories in getting to the file
in question. This enables that, fixing the broken old behavior,
and adds tests to exercise various ignore situations.
2012-10-15 12:54:46 -07:00
nulltoken
68206c54bf
test: fix some memory leaks
2012-10-15 20:41:43 +02:00
nulltoken
fa5d94a0d4
reset: prevent hard reset in a bare repository
2012-10-15 20:41:42 +02:00
nulltoken
c4f68b3202
clone: fix detection of remote HEAD
2012-10-15 20:40:37 +02:00
nulltoken
4d968f134b
clone: Explicit support of no-checkout option
2012-10-15 20:40:37 +02:00
Ben Straub
86a2da6e8a
Clone: use libgit2's test repos
2012-10-15 10:48:17 -07:00
