Re: [PATCH] mergetool: Replace use of "echo -n" with printf(3) to be more portable

From: Junio C Hamano <junkio@cox.net>
Date: Mar 29, 2007, 22:02 UTC
Message-ID: <7vwt0z1zel.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070329170914.GA9435@thunk.org>

Theodore Tso <tytso@mit.edu> writes:

Show 5 quoted lines

> Junio, I've prepared an alterate patch series.  If you haven't pulled
> from repo.or.cz, I'd appreciate it if you could pull from the
> mergetool branch (instead of master) instead:
>
> 	http://repo.or.cz/w/git/mergetool.git

Thanks; will do later tonight after I got home.

> (Apparently there's no way to forcibly reset the pointer of the master
> head on repo.or.cz, probably for security/sanity reasons, without
> going through an administrator.)

Really? I push with '+' (aka "single force") all the time to alt-git.git repository and haven't noticed that:

    [remote "repo"]
            url = repo.or.cz:srv/git/alt-git.git/
            push = refs/tags/ko-master:refs/heads/master
            push = refs/tags/ko-next:refs/heads/next
            push = +refs/tags/ko-pu:refs/heads/pu
            push = refs/tags/ko-maint:refs/heads/maint

Here, tags/ko-* keeps track of what I pushed out the official k.org repositories, and my workflow has been:

    $ git push ko ;# push to k.org refs/heads/{master,next,...}
    $ git fetch ko ;# fetch them back to refs/tags/ko-*
    $ git push repo ;# update alt-git.git