All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Mark Levedahl <mdl123@verizon.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add git-unbundle - unpack objects and references for disconnected transfer
Date: Fri, 16 Feb 2007 01:48:52 -0500	[thread overview]
Message-ID: <20070216064852.GF28894@spearce.org> (raw)
In-Reply-To: <11716079211954-git-send-email-mdl123@verizon.net>

Mark Levedahl <mdl123@verizon.net> wrote:
> +        # update only if non-fastforward
> +        local=$(git-rev-parse --verify "$ref^0" 2>/dev/null)
> +        if test -n "$local"  ; then
> +            mb=$(git-merge-base $local $sha1)
> +            if test "$mb" != "$local" ; then
> +                echo "Not applying non-fast forward update: $ref"
> +            else
> +                ok=1
> +            fi
> +        else
> +            ok=1
> +        fi
> +    else
> +        #forced, accept non-fast forward update
> +        ok=1
> +    fi
> +    if test -n "$ok" ; then
> +        echo "updating: $ref to $sha1"
> +        git-update-ref -m "git-unbundle update" $ref $sha1

What about passing $local as the final argument to update-ref,
so that the ref won't be modified if someone changed it while
an unbundle was running?  Sure its mostly a manual operation,
but imagine running it on a bare repository while someone else
is pushing into it...

-- 
Shawn.

  reply	other threads:[~2007-02-16  6:49 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-16  0:19 Respun - Scripts to use bundles to move data between repos Mark Levedahl
2007-02-16  0:19 ` [PATCH] Add git-bundle - pack objects and references for disconnected transfer Mark Levedahl
2007-02-16  0:19   ` [PATCH] Add git-unbundle - unpack " Mark Levedahl
2007-02-16  0:19     ` [PATCH] Include git-bundle and git-unbundle in Makefile Mark Levedahl
2007-02-16  0:19       ` [PATCH] Create documentation for git-bundle Mark Levedahl
2007-02-16  0:19         ` [PATCH] Create documentation for git-unbundle Mark Levedahl
2007-02-16  0:19           ` [PATCH] Link git-bundle and git-unbundle docs from git(7) Mark Levedahl
2007-02-16  2:24     ` [PATCH] Add git-unbundle - unpack objects and references for disconnected transfer Junio C Hamano
2007-02-16  2:40       ` Linus Torvalds
2007-02-16  6:38         ` Mark Levedahl
2007-02-16  6:48           ` Shawn O. Pearce [this message]
2007-02-16  7:31             ` Junio C Hamano
2007-02-16  7:45               ` Shawn O. Pearce
2007-02-16  6:22       ` Mark Levedahl
2007-02-16  7:24         ` Junio C Hamano
2007-02-16  2:11   ` [PATCH] Add git-bundle - pack " Junio C Hamano
2007-02-16  4:41     ` Shawn O. Pearce
2007-02-16  7:28       ` Junio C Hamano
2007-02-16  6:39     ` Mark Levedahl
2007-02-16  6:54       ` Shawn O. Pearce
2007-02-16 11:57         ` Simon 'corecode' Schubert
2007-02-16  4:37 ` Respun - Scripts to use bundles to move data between repos Shawn O. Pearce
  -- strict thread matches above, loose matches on Subject: below --
2007-02-16 12:53 Re: [PATCH] Add git-unbundle - unpack objects and references for disconnected transfer Mark Levedahl
2007-02-16 19:57 ` Junio C Hamano
2007-02-16 23:21   ` Mark Levedahl
2007-02-17  6:57     ` Junio C Hamano
2007-02-17 14:40       ` Mark Levedahl
2007-02-17 17:53         ` Junio C Hamano
2007-02-17 14:50   ` Mark Levedahl
2007-02-17 18:41     ` Junio C Hamano
2007-02-16 21:58 ` Mark Levedahl
2007-02-16 22:51   ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070216064852.GF28894@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=mdl123@verizon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.