From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Warren Date: Thu, 06 Aug 2009 13:04:41 -0700 Subject: [U-Boot] minor debug cleanups in ./net In-Reply-To: <200908061557.30782.rgetz@blackfin.uclinux.org> References: <200907221856.46498.rgetz@blackfin.uclinux.org> <200908061427.10961.rgetz@blackfin.uclinux.org> <20090806194057.A0EB0832E416@gemini.denx.de> <200908061557.30782.rgetz@blackfin.uclinux.org> Message-ID: <4A7B3759.3030809@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Robin Getz wrote: > On Thu 6 Aug 2009 15:40, Wolfgang Denk pondered: > >> Dear Robin Getz, >> >> In message <200908061427.10961.rgetz@blackfin.uclinux.org> you wrote: >> >>> On Thu 23 Jul 2009 03:01, Robin Getz pondered: >>> >>>> OK - this is on >>>> >>>> git remote -v >>>> origin git://git.denx.de/u-boot-net.git >>>> >>>> git log --max-count=1 >>>> commit 97cfe86163505ea18e7ff7b71e78df5bb03dad57 >>>> >>>> (Is there a better way to tell if git is up to date?) >>>> >>> Was there any problems with this one? >>> >> Well, "git describe" needs less typing, and gives better information. >> > > Thanks for the tip. > > rgetz at pinky:~/blackfin/mainline/u-boot/master> git remote -v > origin git://git.denx.de/u-boot.git > rgetz at pinky:~/blackfin/mainline/u-boot/master> git describe --all HEAD^ > warning: tag 'v2009.08-rc1' is really 'tags/v2009.08-rc1' here > v2009.08-rc1-29-gc3fa4f0 > > when I switch to the net tree, I get: > > rgetz at pinky:~/blackfin/mainline/u-boot/net> git remote -v > origin git://git.denx.de/u-boot-net.git > rgetz at pinky:~/blackfin/mainline/u-boot/net> git describe --all HEAD^ > warning: tag 'U-Boot-1_2_0' is really 'tags/U-Boot-1_2_0' here > U-Boot-1_2_0-6291-g0b23fb3 > > That is because Ben hasn't done a git pull from the master since U-Boot-1_2_0? Or have I don't something wrong on my end? > > -robin > I never pull from the master, but follow the workflow described here: http://www.denx.de/wiki/U-Boot/CustodianGitTrees I have a local 'u-boot' branch that pulls from the master, then re-base the net branch to that one. I'm very far from being a git master, but thus far I've never seen problems. regards, Ben