RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Oct-2013 18:18:26
Branch: rpm-5_4 Handle: 2013101716182600
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmgit.c tgit.c
Log:
- git: catch up with tip.
Summary:
Revision Changes Path
2.1.2.40 +7 -2 rpm/rpmio/rpmgit.c
1.1.2.34 +5 -5 rpm/rpmio/tgit.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgit.c
============================================================================
$ cvs diff -u -r2.1.2.39 -r2.1.2.40 rpmgit.c
--- rpm/rpmio/rpmgit.c 23 Sep 2013 04:25:44 -0000 2.1.2.39
+++ rpm/rpmio/rpmgit.c 17 Oct 2013 16:18:26 -0000 2.1.2.40
@@ -448,7 +448,7 @@
if (_rpmgit_debug >= 0) return;
fprintf(fp, "head_detached: %d\n", git_repository_head_detached(R));
-fprintf(fp, " head_orphan: %d\n", git_repository_head_orphan(R));
+fprintf(fp, " head_unborn: %d\n", git_repository_head_unborn(R));
fprintf(fp, " is_empty: %d\n", git_repository_is_empty(R));
fprintf(fp, " is_bare: %d\n", git_repository_is_bare(R));
fn = git_repository_path(R);
@@ -457,7 +457,12 @@
fprintf(fp, " workdir: %s\n", fn);
/* XXX get_repository_config */
/* XXX get_repository_odb */
+ /* XXX get_repository_refdb */
/* XXX get_repository_index */
+ /* XXX get_repository_message */
+fprintf(fp, " state: %d\n", git_repository_state(R));
+fprintf(fp, " namespace: %s\n", git_repository_get_namespace(R));
+fprintf(fp, " is_shallow: %d\n", git_repository_is_empty(R));
}
#endif /* defined(WITH_LIBGT2) */
@@ -1748,7 +1753,7 @@
error = git_repository_head(&head, repo);
- if (error == GIT_EORPHANEDHEAD || error == GIT_ENOTFOUND)
+ if (error == GIT_EUNBORNBRANCH || error == GIT_ENOTFOUND)
branch = NULL;
else if (!error) {
branch = git_reference_name(head);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tgit.c
============================================================================
$ cvs diff -u -r1.1.2.33 -r1.1.2.34 tgit.c
--- rpm/rpmio/tgit.c 5 Sep 2013 16:50:27 -0000 1.1.2.33
+++ rpm/rpmio/tgit.c 17 Oct 2013 16:18:26 -0000 1.1.2.34
@@ -90,7 +90,7 @@
print_progress(pd);
}
-static int cred_acquire(git_cred **out,
+static int cred_acquire_cb(git_cred **out,
const char * url,
const char * username_from_url,
unsigned int allowed_types,
@@ -328,9 +328,9 @@
checkout_opts.progress_cb = checkout_progress;
checkout_opts.progress_payload = &pd;
clone_opts.checkout_opts = checkout_opts;
- clone_opts.fetch_progress_cb = &fetch_progress;
- clone_opts.fetch_progress_payload = &pd;
- clone_opts.cred_acquire_cb = cred_acquire;
+ clone_opts.remote_callbacks.transfer_progress = &fetch_progress;
+ clone_opts.remote_callbacks.credentials = cred_acquire_cb;
+ clone_opts.remote_callbacks.payload = &pd;
/* Do the clone */
xx = git_clone(&cloned_repo, url, path, &clone_opts);
@@ -2927,7 +2927,7 @@
* inform the user about progress.
*/
xx = chkgit(git, "git_remote_download",
- git_remote_download(data->remote, NULL, NULL));
+ git_remote_download(data->remote));
}
data->ret = (xx < 0 ? -1 : 0);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
