mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'jh/fetch-head-update'
* jh/fetch-head-update: write first for-merge ref to FETCH_HEAD first
This commit is contained in:
commit
1067f8dd0e
|
@ -341,7 +341,7 @@ since you pulled from him:
|
||||||
|
|
||||||
----------------
|
----------------
|
||||||
$ git fetch git://.... linus
|
$ git fetch git://.... linus
|
||||||
$ LT=`cat .git/FETCH_HEAD`
|
$ LT=`git rev-parse FETCH_HEAD`
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
Your work tree is still based on your HEAD ($JC), but you have
|
Your work tree is still based on your HEAD ($JC), but you have
|
||||||
|
|
160
builtin/fetch.c
160
builtin/fetch.c
|
@ -377,6 +377,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
|
||||||
const char *what, *kind;
|
const char *what, *kind;
|
||||||
struct ref *rm;
|
struct ref *rm;
|
||||||
char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
|
char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
|
||||||
|
int want_merge;
|
||||||
|
|
||||||
fp = fopen(filename, "a");
|
fp = fopen(filename, "a");
|
||||||
if (!fp)
|
if (!fp)
|
||||||
|
@ -393,84 +394,95 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
|
||||||
goto abort;
|
goto abort;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (rm = ref_map; rm; rm = rm->next) {
|
/*
|
||||||
struct ref *ref = NULL;
|
* The first pass writes objects to be merged and then the
|
||||||
|
* second pass writes the rest, in order to allow using
|
||||||
|
* FETCH_HEAD as a refname to refer to the ref to be merged.
|
||||||
|
*/
|
||||||
|
for (want_merge = 1; 0 <= want_merge; want_merge--) {
|
||||||
|
for (rm = ref_map; rm; rm = rm->next) {
|
||||||
|
struct ref *ref = NULL;
|
||||||
|
|
||||||
if (rm->peer_ref) {
|
commit = lookup_commit_reference_gently(rm->old_sha1, 1);
|
||||||
ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
|
if (!commit)
|
||||||
strcpy(ref->name, rm->peer_ref->name);
|
rm->merge = 0;
|
||||||
hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
|
|
||||||
hashcpy(ref->new_sha1, rm->old_sha1);
|
|
||||||
ref->force = rm->peer_ref->force;
|
|
||||||
}
|
|
||||||
|
|
||||||
commit = lookup_commit_reference_gently(rm->old_sha1, 1);
|
if (rm->merge != want_merge)
|
||||||
if (!commit)
|
continue;
|
||||||
rm->merge = 0;
|
|
||||||
|
|
||||||
if (!strcmp(rm->name, "HEAD")) {
|
if (rm->peer_ref) {
|
||||||
kind = "";
|
ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
|
||||||
what = "";
|
strcpy(ref->name, rm->peer_ref->name);
|
||||||
}
|
hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
|
||||||
else if (!prefixcmp(rm->name, "refs/heads/")) {
|
hashcpy(ref->new_sha1, rm->old_sha1);
|
||||||
kind = "branch";
|
ref->force = rm->peer_ref->force;
|
||||||
what = rm->name + 11;
|
}
|
||||||
}
|
|
||||||
else if (!prefixcmp(rm->name, "refs/tags/")) {
|
|
||||||
kind = "tag";
|
if (!strcmp(rm->name, "HEAD")) {
|
||||||
what = rm->name + 10;
|
kind = "";
|
||||||
}
|
what = "";
|
||||||
else if (!prefixcmp(rm->name, "refs/remotes/")) {
|
}
|
||||||
kind = "remote-tracking branch";
|
else if (!prefixcmp(rm->name, "refs/heads/")) {
|
||||||
what = rm->name + 13;
|
kind = "branch";
|
||||||
}
|
what = rm->name + 11;
|
||||||
else {
|
}
|
||||||
kind = "";
|
else if (!prefixcmp(rm->name, "refs/tags/")) {
|
||||||
what = rm->name;
|
kind = "tag";
|
||||||
}
|
what = rm->name + 10;
|
||||||
|
}
|
||||||
url_len = strlen(url);
|
else if (!prefixcmp(rm->name, "refs/remotes/")) {
|
||||||
for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
|
kind = "remote-tracking branch";
|
||||||
;
|
what = rm->name + 13;
|
||||||
url_len = i + 1;
|
}
|
||||||
if (4 < i && !strncmp(".git", url + i - 3, 4))
|
else {
|
||||||
url_len = i - 3;
|
kind = "";
|
||||||
|
what = rm->name;
|
||||||
strbuf_reset(¬e);
|
}
|
||||||
if (*what) {
|
|
||||||
if (*kind)
|
url_len = strlen(url);
|
||||||
strbuf_addf(¬e, "%s ", kind);
|
for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
|
||||||
strbuf_addf(¬e, "'%s' of ", what);
|
;
|
||||||
}
|
url_len = i + 1;
|
||||||
fprintf(fp, "%s\t%s\t%s",
|
if (4 < i && !strncmp(".git", url + i - 3, 4))
|
||||||
sha1_to_hex(rm->old_sha1),
|
url_len = i - 3;
|
||||||
rm->merge ? "" : "not-for-merge",
|
|
||||||
note.buf);
|
strbuf_reset(¬e);
|
||||||
for (i = 0; i < url_len; ++i)
|
if (*what) {
|
||||||
if ('\n' == url[i])
|
if (*kind)
|
||||||
fputs("\\n", fp);
|
strbuf_addf(¬e, "%s ", kind);
|
||||||
else
|
strbuf_addf(¬e, "'%s' of ", what);
|
||||||
fputc(url[i], fp);
|
}
|
||||||
fputc('\n', fp);
|
fprintf(fp, "%s\t%s\t%s",
|
||||||
|
sha1_to_hex(rm->old_sha1),
|
||||||
strbuf_reset(¬e);
|
rm->merge ? "" : "not-for-merge",
|
||||||
if (ref) {
|
note.buf);
|
||||||
rc |= update_local_ref(ref, what, ¬e);
|
for (i = 0; i < url_len; ++i)
|
||||||
free(ref);
|
if ('\n' == url[i])
|
||||||
} else
|
fputs("\\n", fp);
|
||||||
strbuf_addf(¬e, "* %-*s %-*s -> FETCH_HEAD",
|
else
|
||||||
TRANSPORT_SUMMARY_WIDTH,
|
fputc(url[i], fp);
|
||||||
*kind ? kind : "branch",
|
fputc('\n', fp);
|
||||||
REFCOL_WIDTH,
|
|
||||||
*what ? what : "HEAD");
|
strbuf_reset(¬e);
|
||||||
if (note.len) {
|
if (ref) {
|
||||||
if (verbosity >= 0 && !shown_url) {
|
rc |= update_local_ref(ref, what, ¬e);
|
||||||
fprintf(stderr, _("From %.*s\n"),
|
free(ref);
|
||||||
url_len, url);
|
} else
|
||||||
shown_url = 1;
|
strbuf_addf(¬e, "* %-*s %-*s -> FETCH_HEAD",
|
||||||
|
TRANSPORT_SUMMARY_WIDTH,
|
||||||
|
*kind ? kind : "branch",
|
||||||
|
REFCOL_WIDTH,
|
||||||
|
*what ? what : "HEAD");
|
||||||
|
if (note.len) {
|
||||||
|
if (verbosity >= 0 && !shown_url) {
|
||||||
|
fprintf(stderr, _("From %.*s\n"),
|
||||||
|
url_len, url);
|
||||||
|
shown_url = 1;
|
||||||
|
}
|
||||||
|
if (verbosity >= 0)
|
||||||
|
fprintf(stderr, " %s\n", note.buf);
|
||||||
}
|
}
|
||||||
if (verbosity >= 0)
|
|
||||||
fprintf(stderr, " %s\n", note.buf);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -70,8 +70,8 @@ test_expect_success "fetch test for-merge" '
|
||||||
master_in_two=`cd ../two && git rev-parse master` &&
|
master_in_two=`cd ../two && git rev-parse master` &&
|
||||||
one_in_two=`cd ../two && git rev-parse one` &&
|
one_in_two=`cd ../two && git rev-parse one` &&
|
||||||
{
|
{
|
||||||
echo "$master_in_two not-for-merge"
|
|
||||||
echo "$one_in_two "
|
echo "$one_in_two "
|
||||||
|
echo "$master_in_two not-for-merge"
|
||||||
} >expected &&
|
} >expected &&
|
||||||
cut -f -2 .git/FETCH_HEAD >actual &&
|
cut -f -2 .git/FETCH_HEAD >actual &&
|
||||||
test_cmp expected actual'
|
test_cmp expected actual'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# br-branches-default-merge
|
# br-branches-default-merge
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# br-branches-default-merge branches-default
|
# br-branches-default-merge branches-default
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-branches-default-octopus
|
# br-branches-default-octopus
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-branches-default-octopus branches-default
|
# br-branches-default-octopus branches-default
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# br-branches-one-merge
|
# br-branches-one-merge
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# br-branches-one-merge branches-one
|
# br-branches-one-merge branches-one
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-config-explicit-merge
|
# br-config-explicit-merge
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-config-explicit-merge config-explicit
|
# br-config-explicit-merge config-explicit
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-config-explicit-octopus
|
# br-config-explicit-octopus
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-config-explicit-octopus config-explicit
|
# br-config-explicit-octopus config-explicit
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-config-glob-merge
|
# br-config-glob-merge
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-config-glob-merge config-glob
|
# br-config-glob-merge config-glob
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-config-glob-octopus
|
# br-config-glob-octopus
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-config-glob-octopus config-glob
|
# br-config-glob-octopus config-glob
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-remote-explicit-merge
|
# br-remote-explicit-merge
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-remote-explicit-merge remote-explicit
|
# br-remote-explicit-merge remote-explicit
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-remote-explicit-octopus
|
# br-remote-explicit-octopus
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-remote-explicit-octopus remote-explicit
|
# br-remote-explicit-octopus remote-explicit
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-remote-glob-merge
|
# br-remote-glob-merge
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# br-remote-glob-merge remote-glob
|
# br-remote-glob-merge remote-glob
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-remote-glob-octopus
|
# br-remote-glob-octopus
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# br-remote-glob-octopus remote-glob
|
# br-remote-glob-octopus remote-glob
|
||||||
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
|
||||||
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
|
||||||
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
|
||||||
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
|
||||||
|
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
|
||||||
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
|
||||||
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
|
||||||
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
|
||||||
|
|
Loading…
Reference in a new issue