Re: [PATCH 2/2] git reflog expire

From: Shawn Pearce <spearce@spearce.org>
Date: Dec 19, 2006, 09:08 UTC
Message-ID: <20061219090851.GH2511@spearce.org>
In-Reply-To: <7v64c8thr4.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> wrote:

Show 16 quoted lines

> This prepares a place to collect reflog management subcommands,
> and implements "expire" action.
> 
> 	$ git reflog expire --dry-run \
> 		--expire=4.weeks \
> 		--expire-lost=1.week \
> 		refs/heads/master
> 
> The expiration uses two timestamps: --expire and --expire-lost.
> Entries older than expire time (defaults to 90 days), and
> entries older than expire-lost time (defaults to 30 days) and
> talk about a commit that has been rewound and made unreachable
> from the current tip of the ref are removed from the reflog.
> 
> The parameter handling is still rough, but I think the
> core logic for expiration is already sound.

I agree, this looked pretty good to me.

I disagree with the option name '--expire-lost'. The way I initially read that was:

    --expire-lost: ok, if the object was already pruned out of
    the ODB and the reflog entry is older than 1 week, remove it;
    otherwise keep it in case the user could manually recover the
    object from another ODB.

Of course that's not what the code does, because if either the old or the new object is no longer in the ODB you are pruning away the log entry. I cannot however come up with a better name than --expire-lost. :-(

Perhaps --expire-lost should default to just be 1/3 of the time of --expire, whatever --expire is: 90 day default or command line value?

I'm thinking that we may want the 'expire' subcommand to simply be implied by '--expire' instead. Basically my rational here is I want to be able to do 'git reflog HEAD' to view the reflog associated with my current branch, effectively seeing the Git operational history of this branch. Or 'git reflog a b' to see the operational history of two branches with their reflogs interleaved based on entry time.

Needing a subcommand like 'git reflog show HEAD' is just a lot of typing[*1*].

I would also say maybe we want to make --dry-run the default, with a final message which tells the user that if they really want to make it possible to throw away the commits printed above then restart the expire operation, e.g.:

  $ git reflog --expire=4.weeks --expire-lost=1.week master
  would expire ...
  would expire ...
  would expire ...

  Restart with '--prune' to expire the above log entries and commits.
  $ git reflog --expire=4.weeks --expire-lost=1.week master --prune

I'd like to take a stab at the log display code for the reflog command, but I'd also really like to port forward (aka rewrite) that mmap window code I keep saying I'll work on, but never quite seem to do...

*1* Yes, I know, I'll do bash completion for this command too.  ;-)