From 38fe95c56d51ef444d6ee4acf42abe2ea3f5fdff Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 May 2007 00:01:50 -0700 Subject: [PATCH] Move ko-master, sa/master and friends out of tags Otherwise they make "git-describe --contains" useless. --- KO | 14 +++++++------- SA | 5 +++-- TODO | 7 +++++++ WI | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/KO b/KO index 2a6f301250..2d7346ff7b 100755 --- a/KO +++ b/KO @@ -5,14 +5,14 @@ case "$1" in --no-fetch) shift ;; *) git fetch ko ;; esac -mb=$(git merge-base ko-master master) -h=$(git rev-parse $mb ko-master | sort -u | wc -l) +mb=$(git merge-base ko/master master) +h=$(git rev-parse $mb ko/master | sort -u | wc -l) if test "$h" != 1 then - echo "OOOOOPPPPPPPPPPPPPPSSS! master is not ko-master fast forward." + echo "OOOOOPPPPPPPPPPPPPPSSS! master is not ko/master fast forward." exit 1 fi -git show-branch --topo-order ko-master master -git show-branch --topo-order ko-maint maint -git show-branch --topo-order ko-next next -git show-branch --topo-order ko-pu pu +git show-branch --topo-order ko/master master +git show-branch --topo-order ko/maint maint +git show-branch --topo-order ko/next next +git show-branch --topo-order ko/pu pu diff --git a/SA b/SA index b71be38c5d..a54f03b4a6 100755 --- a/SA +++ b/SA @@ -2,6 +2,7 @@ # Take a snapshot of master and next *after* making an # "What's in git.git" announcement, for the next round. -git tag -f sa/master refs/heads/master -git tag -f sa/maint refs/heads/maint +git update-ref refs/hold/sa/master refs/heads/master +git update-ref refs/hold/sa/maint refs/heads/maint + diff --git a/TODO b/TODO index 2ac0bc6bb0..b759a8b2af 100644 --- a/TODO +++ b/TODO @@ -123,6 +123,13 @@ Technical (milder) From: Junio C Hamano Message-ID: <11793556371774-git-send-email-junkio@cox.net> +* "pure" clones, that does not know about where it was cloned + from. Specifically, no [remote "origin"] in .git/config, nor + refs/remotes/origin. + + From: Junio C Hamano + Message-ID: <7vr6pac86g.fsf@assigned-by-dhcp.cox.net> + * upload-pack support to start fetching from any valid point on the history, not just published refs. (Erik W. Biederman ) diff --git a/WI b/WI index fdd596defd..5578342086 100755 --- a/WI +++ b/WI @@ -19,7 +19,7 @@ echo "X-master-at: $master_at" echo "Content-Type: text/plain; charset=utf-8" echo "Content-Transfer-Encoding: 8bit" -tagged=`git rev-parse --not --verify tags/sa/maint` +tagged=`git rev-parse --not --verify hold/sa/maint` list=`git-rev-list $tagged refs/heads/maint 2>/dev/null` if test -n "$list" then @@ -29,7 +29,7 @@ then log $tagged heads/maint fi -tagged=`git rev-parse --not --verify tags/sa/master` +tagged=`git rev-parse --not --verify hold/sa/master` list=`git-rev-list $tagged refs/heads/master 2>/dev/null` if test -n "$list" then -- 2.32.0.93.g670b81a890