git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nick Andrew <nick@nick-andrew.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Enable git rev-list to parse --quiet
Date: Fri, 18 Jul 2008 19:20:01 +1000	[thread overview]
Message-ID: <20080718092001.GD16102@mail.local.tull.net> (raw)
In-Reply-To: <7v8wvzeojm.fsf@gitster.siamese.dyndns.org>

On Thu, Jul 17, 2008 at 10:42:21PM -0700, Junio C Hamano wrote:
> Thanks for noticing, but this replaces one breakage with another.
> 
> Your new behaviour is a new "tell me if it is an empty set" option, and it
> means quite different thing from what --quiet does.

Fair enough. Yes, I want to find out if it is an empty set. The
manpage does say "fully connected" which I interpreted to mean
that one set of commits is a subset of the other..

I want to automatically (e.g. in crontab) update a git repo to the latest
HEAD from a remote branch ... but with the possibility that the local
repo has local changes, and I want no chance of merge failure. In other
words, "git fetch remote; git merge origin/master" and only do the
merge if it's a fast-forward. If there are any local commits, or local
uncommitted changes, then leave the local working tree alone.

So my idea was to use "git rev-list --quiet master ^origin/master"
and check the exit code; if zero do "git merge origin/master". Without
a working "--quiet" nor exit code I can pipe the output to "wc -l"
but is there a more efficient/reliable way to implement the requirement?

Nick.

  parent reply	other threads:[~2008-07-18  9:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-18  4:05 [PATCH] Enable git rev-list to parse --quiet Nick Andrew
2008-07-18  5:42 ` Junio C Hamano
2008-07-18  6:10   ` Junio C Hamano
2008-07-18  9:20   ` Nick Andrew [this message]
2008-07-18 10:50     ` Johannes Schindelin
2008-07-20  7:56     ` Junio C Hamano
2008-07-20 12:04       ` Nick Andrew
2008-07-20 18:31         ` Junio C Hamano

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=20080718092001.GD16102@mail.local.tull.net \
    --to=nick@nick-andrew.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).