Commits on Jan 21, 2007
  1. GIT v1.5.0-rc2

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  2. @matled

    prune: --grace=time

    This option gives grace period to objects that are unreachable
    from the refs from getting pruned.
    
    The default value is 24 hours and may be changed using
    gc.prunegrace.
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jan 19, 2007
  3. @dscho

    --walk-reflogs: do not crash with cyclic reflog ancestry

    Since you can reset --hard to any revision you already had, when
    traversing the reflog ancestry, we may not free() the commit buffer.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Jan 20, 2007
  4. @dscho

    --walk-reflogs: actually find the right commit by date.

    Embarassing thinko.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    dscho committed with Junio C Hamano Jan 20, 2007
  5. Fix --walk-reflog with --pretty=oneline

    Now, "git log --abbrev-commit --pretty=o --walk-reflogs HEAD" is
    reasonably pleasant to use.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  6. reflog-walk: build fixes

    Dependency on reflog-walk.h was missing in the Makefile, and
    reflog-walk.c did not even include it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  7. log --walk-reflog: documentation

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  8. @dscho

    --walk-reflogs: disallow uninteresting commits

    Do not allow uninteresting commits with --walk-reflogs, since it is
    not clear what should be shown in these cases:
    
    	$ git log --walk-reflogs master..next
    	$ git log --walk-reflogs ^master
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    dscho committed with Junio C Hamano Jan 20, 2007
  9. @dscho

    Teach the revision walker to walk by reflogs with --walk-reflogs

    When called with "--walk-reflogs", as long as there are reflogs
    available, the walker will take this information into account, rather
    than the parent information in the commit object.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Jan 11, 2007
  10. git-rebase: allow rebasing a detached HEAD.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  11. branch -f: no reason to forbid updating the current branch in a bare …

    …repo.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  12. git-tag -d: allow deleting multiple tags at once.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  13. @dscho

    Do not verify filenames in a bare repository

    For example, it makes no sense to check the presence of a file
    named "HEAD" when calling "git log HEAD" in a bare repository.
    
    Noticed by Han-Wen Nienhuys.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    dscho committed with Junio C Hamano Jan 20, 2007
  14. Stop ignoring Documentation/README

    We do not copy this file from elsewhere anymore.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  15. @dscho

    apply --cached: fix crash in subdirectory

    The static variable "prefix" was shadowed by an unused parameter
    of the same name. In case of execution in a subdirectory, the
    static variable was accessed, leading to a crash.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    dscho committed with Junio C Hamano Jan 21, 2007
  16. show-branch --reflog: fix show_date() call

    Not passing tz to show_date() is not a fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 20, 2007
  17. @dscho

    show_date(): fix relative dates

    We pass a timestamp (i.e. number of seconds elapsed since Jan 1 1970,
    00:00:00 GMT) to the function. So there is no need to "fix" the
    timestamp according to the timezone.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    dscho committed with Junio C Hamano Jan 20, 2007
Commits on Jan 20, 2007
  1. show-branch --reflog: tighten input validation.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  2. show-branch --reflog: show the reflog message at the top.

    This changes the output so the list at the top shows the reflog
    message, along with their relative timestamps.
    
    You can use --reflog=<n> to show <n> most recent log entries, or
    use --reflog=<n>,<b> to show <n> entries going back from the
    entry <b>.  <b> can be either a number (so --reflog=4,20 shows 4
    records starting from @{20}) or a timestamp (e.g. --reflog='4,1 day').
    
    Here is a sample output (with --list option):
    
      $ git show-branch --reflog=10 --list jc/show-reflog
        [jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
        [jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
        [jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog: sho
        [jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog: sho
        [jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_ref_a
        [jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read_ref_a
        [jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend read_ref_a
        [jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow retrievi
        [jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
        [jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --reflog: use
    
    This shows what I did more cleanly:
    
      $ git show-branch --reflog=10 jc/show-reflog
      ! [jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
       ! [jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
        ! [jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog:
         ! [jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog:
          ! [jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_
           ! [jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read
            ! [jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend rea
             ! [jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow
              ! [jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
               ! [jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --r
      ----------
      +          [jc/show-reflog@{0}] show-branch --reflog: show the reflog
        +        [jc/show-reflog@{2}] show-branch --reflog: show the reflog
       +++       [jc/show-reflog@{1}] show-branch --reflog: show the reflog
      +++++      [jc/show-reflog@{4}] Extend read_ref_at() to be usable fro
           +     [jc/show-reflog@{5}] Extend read_ref_at() to be usable fro
            +    [jc/show-reflog@{6}] Extend read_ref_at() to be usable fro
             +   [jc/show-reflog@{7}] read_ref_at(): allow retrieving the r
               + [jc/show-reflog@{9}] show-branch --reflog: use updated rea
               + [jc/show-reflog@{9}^] read_ref_at(): allow reporting the c
               + [jc/show-reflog@{9}~2] show-branch --reflog: show the refl
               + [jc/show-reflog@{9}~3] read_ref_at(): allow retrieving the
      ++++++++++ [jc/show-reflog@{8}] dwim_ref(): Separate name-to-ref DWIM
    
    At @{9}, I had a commit to complete 5 patch series, but I wanted
    to consolidate two commits that enhances read_ref_at() into one
    (they were @{9}^ and @{9}~3), and another two that touch show-branch
    into one (@{9} and @{9}~2).
    
    I first saved them with "format-patch -4", and then did a reset
    at @{8}.  At @{7}, I applied one of them with "am", and then
    used "git-apply" on the other one, and amended the commit at
    @{6} (so @{6} and @{7} has the same parent).  I did not like the
    log message, so I amended again at @{5}.
    
    Then I cherry-picked @{9}~2 to create @{3} (the log message
    shows that it needs to learn to set GIT_REFLOG_ACTION -- it uses
    "git-commit" and the log entry is attributed for it).  Another
    cherry-pick built @{2} out of @{9}, but what I wanted to do was
    to squash these two into one, so I did a "reset HEAD^" at @{1}
    and then made the final commit by amending what was at the top.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  3. Extend read_ref_at() to be usable from places other than sha1_name.

    You can pass an extra argument to the function to receive the
    reflog message information.  Also when the log does not go back
    beyond the point the user asked, the cut-off time and count are
    given back to the caller for emitting the error messages as
    appropriately.
    
    We could later add configuration for get_sha1_basic() to make it
    an error instead of it being just a warning.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  4. dwim_ref(): Separate name-to-ref DWIM code out.

    I'll be using this in another function to figure out what to
    pass to resolve_ref().
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  5. @dscho

    config_set_multivar(): disallow newlines in keys

    This will no longer work:
    
    $ git repo-config 'key.with
    newline' some-value
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    dscho committed with Junio C Hamano Jan 20, 2007
  6. rename --exec to --receive-pack for push and send-pack

    For now it's just to get a more descriptive name.  Later we might update the
    push protocol to run more than one program on the other end.  Moreover this
    matches better the corresponding config option remote.<name>. receivepack.
    
    --exec continues to work
    
    Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Uwe Kleine-König committed with Junio C Hamano Jan 19, 2007
  7. make --exec=... option to git-push configurable

    Having to specify git push --exec=... is annoying if you cannot have
    git-receivepack in your PATH on the remote side (or don't want to).
    
    This introduces the config item remote.<name>.receivepack to override
    the default value (which is "git-receive-pack").
    
    Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Uwe Kleine-König committed with Junio C Hamano Jan 19, 2007
  8. Update documentation of fetch-pack, push and send-pack

    add all supported options to Documentation/git-....txt and the usage strings.
    
    Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Uwe Kleine-König committed with Junio C Hamano Jan 19, 2007
  9. Documentation/git.txt: command re-classification

    This adds two new classes (pure-helpers and "Interacting with
    Others") to the command list in the main manual page.  The
    latter class is primarily about foreign SCM interface and is
    placed before low-level (plumbing) commands.
    
    Also it promotes a handful commands to mainporcelain category
    while demoting some others.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 18, 2007
Commits on Jan 19, 2007
  1. Documentation: generated cmds-*.txt does not depend on git.txt

    Pointed out by Santi.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  2. refs.c::read_ref_at(): fix bogus munmap() call.

    The code uses mmap() to read reflog data, but moves the pointer around
    while reading, and uses that updated pointer in the call to munmap().
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 19, 2007
  3. for_each_reflog_ent: do not leak FILE *

    The callback function can signal an early return by returning non-zero,
    but the function leaked the FILE * opened on the reflog when doing so.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 18, 2007
  4. Documentation: Generate command lists.

    This moves the source of the list of commands and categorization
    to the end of Documentation/cmd-list.perl, so that re-categorization
    and re-ordering would become easier to manage.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 18, 2007
Commits on Jan 18, 2007
  1. Documentation: sync git.txt command list and manual page title

    Also reorders a handful entries to make each list sorted
    alphabetically.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 18, 2007
  2. Documentation: move command list in git.txt into separate files.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 18, 2007
  3. @matled

    prune-packed: add -q to usage

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jan 18, 2007
  4. @dkagedal

    Document --ignore-if-in-upstream in git-format-patch

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dkagedal committed with Junio C Hamano Jan 18, 2007
  5. @dkagedal

    Shell syntax fix in git-reset

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dkagedal committed with Junio C Hamano Jan 18, 2007