Move ko-master, sa/master and friends out of tags
Otherwise they make "git-describe --contains" useless.todo
parent
41649bee8e
commit
38fe95c56d
14
KO
14
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
|
||||
|
|
|
|||
5
SA
5
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
|
||||
|
||||
|
||||
|
|
|
|||
7
TODO
7
TODO
|
|
@ -123,6 +123,13 @@ Technical (milder)
|
|||
From: Junio C Hamano <junkio@cox.net>
|
||||
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 <junkio@cox.net>
|
||||
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
|
||||
<m164jc9ekx.fsf@ebiederm.dsl.xmission.com>)
|
||||
|
|
|
|||
4
WI
4
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue