From: Olivier Marin <dkr@xxxxxxxxxxx>
Signed-off-by: Olivier Marin <dkr@xxxxxxxxxxx>
---
Junio C Hamano a écrit :
> Olivier Marin <dkr+ml.git@xxxxxxx> writes:
>
>> +static int append_ref_to_tracked_list(const char *refname,
>> + const unsigned char *sha1, int flags, void *cb_data)
>> +{
>> + struct ref_states *states = cb_data;
>> + struct strbuf buf;
>> +
>> + strbuf_init(&buf, 0);
>> + strbuf_addf(&buf, "%s/", states->remote->name);
>> + if (strncmp(buf.buf, refname, buf.len)) {
>> + strbuf_release(&buf);
>> + return 0;
>> + }
>
> Doesn't this have the same issue Shawn fixed in 7ad2458 (Make "git-remote
> rm" delete refs acccording to fetch specs, 2008-06-01)?
You are right. This version should fix this.
builtin-remote.c | 22 ++++++++++++++++++++--
t/t5505-remote.sh | 2 ++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index 851bdde..d55d320 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -444,6 +444,22 @@ static int get_remote_ref_states(const char *name,
return 0;
}
+static int append_ref_to_tracked_list(const char *refname,
+ const unsigned char *sha1, int flags, void *cb_data)
+{
+ struct ref_states *states = cb_data;
+ struct refspec refspec;
+
+ memset(&refspec, 0, sizeof(refspec));
+ refspec.dst = (char *)refname;
+ if (!remote_find_tracking(states->remote, &refspec)) {
+ path_list_append(skip_prefix(refspec.src, "refs/heads/"),
+ &states->tracked);
+ }
+
+ return 0;
+}
+
static int show(int argc, const char **argv)
{
int no_query = 0, result = 0;
@@ -494,10 +510,12 @@ static int show(int argc, const char **argv)
strbuf_release(&buf);
show_list(" Stale tracking branch%s (use 'git remote "
"prune')", &states.stale);
- show_list(" Tracked remote branch%s",
- &states.tracked);
}
+ if (no_query)
+ for_each_ref(append_ref_to_tracked_list, &states);
+ show_list(" Tracked remote branch%s", &states.tracked);
+
if (states.remote->push_refspec_nr) {
printf(" Local branch%s pushed with 'git push'\n ",
states.remote->push_refspec_nr > 1 ?
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index c27cfad..fbf0d30 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -143,6 +143,8 @@ cat > test/expect << EOF
URL: $(pwd)/one/.git
Remote branch merged with 'git pull' while on branch master
master
+ Tracked remote branches
+ master side
Local branches pushed with 'git push'
master:upstream +refs/tags/lastbackup
EOF
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
