Permalink
Switch branches/tags
Nothing to show
Commits on Sep 18, 2009
  1. Merge branch 'stable'

    jeffpc committed Sep 18, 2009
  2. regression: added a new test that exercises the guilt-import code

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 18, 2009
  3. {fork,import}: check patchnames for colons

    Since colons (':') are invalid characters in git ref names, guilt cannont
    use any patch names that contain colons. Refuse to accept a colon in the
    patch name.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 18, 2009
  4. refresh: output the patch name similarly to what quilt does

    Note: Unlike quilt, guilt always says that the patch has been refreshed as
    it always rewrites the patch file.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 18, 2009
Commits on May 29, 2009
  1. Guilt v0.32.1

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed May 29, 2009
  2. select/guard: fixed bashism

    This closes bug #105, as well as #530094 on bugs.debian.org.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed May 29, 2009
Commits on Apr 22, 2009
  1. regression: fix output mismatch with git 1.6.2

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Apr 22, 2009
Commits on Mar 12, 2009
  1. [PATCH] allow guilt to handle binary files

    git plumbings has been working with binary diff for a while.  this one
    liner enable guilt to use those capabilities.
    
    Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    yashi committed with jeffpc Mar 12, 2009
Commits on Jan 16, 2009
  1. regression: filter usage() output

    Git 1.6.x likes to replace the first '-' in $0 with a space. Adding a quick
    filter to the regression suite prevents tests from failing due to this
    trivial mismatch.
    
    [jeffpc: patch description]
    Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    sandeen committed with jeffpc Jan 16, 2009
  2. Guilt v0.32

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Jan 16, 2009
Commits on Jan 13, 2009
  1. regression: fix path filtering on f10

    Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    sandeen committed with jeffpc Jan 13, 2009
Commits on Jan 4, 2009
  1. Guilt v0.32-rc2

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Jan 4, 2009
  2. guilt: bug fix: patch names can contained commas

    Fixes bug #47
    
    The comma caused sed to interpret characters after it as a command. E.g.,
    
    jeffpc@maat:~/bin/guilt$ guilt ser -v
      1229742777.15407_2984.josefsipek_2,FS
    jeffpc@maat:~/bin/guilt$ guilt push
    sed: -e expression #1, char 40: unknown command: `F'
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Jan 4, 2009
  3. guilt: removed cd "$TOP_DIR" in favor of cd_to_toplevel

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Jan 4, 2009
Commits on Dec 30, 2008
  1. regression: fixed git invocation

    The regression suite used 'git-foo' instead of the new 'git foo' syntax. The
    actual guilt code used 'git foo' syntax for a while, but the regression
    suite got neglected during the conversion.
    
    Closes bug #49
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Dec 30, 2008
Commits on Dec 20, 2008
  1. [PATCH] guilt: add option guilt.diffstat

    Introduce option guilt.diffstat so that we don't have to type
    "guilt refresh --diffstat" in its full form every time.
    
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    fengguang committed with jeffpc Dec 20, 2008
  2. [PATCH] guilt doc: use literal paragraphs for example commands

    Display example commands verbatim by indenting the paragraphs.
    
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    fengguang committed with jeffpc Dec 20, 2008
Commits on Dec 14, 2008
  1. Guilt v0.32-rc1

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Dec 14, 2008
  2. Merge branch 'experimental'

    Conflicts:
    
    	guilt
    jeffpc committed Dec 14, 2008
Commits on Oct 2, 2008
  1. push: fixed push pushing more than it should

    The following commands show what the problem is:
    
    $ guilt series -v
    + foo
    = bar
      baz
    $ guilt push bar
    ...
    $ guilt series -v
    + foo
    + bar
    = baz
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Oct 2, 2008
Commits on Oct 1, 2008
  1. guilt: anchor three dash divider to EOL.

    The match on "^---" was too broad, and taking in things like
    PGP sigs, and random ascii-art as a match for the divider between
    the patch and patch header. This anchors the regex to the end of
    the line.  It will still match on the 1st "^---$" encountered,
    and not the last, so if you have multiple "^---$", then you loose.
    
    Some patches don't have any sort of header, so you still need a match
    on the "^--- " found in the oldfile/newfile stanza of the patch itself.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    paulgortmaker committed with Jeff Oct 1, 2008
  2. [GUILT] Use git_editor

    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Alan Jenkins committed with jeffpc Oct 1, 2008
Commits on Sep 30, 2008
  1. guilt-fold: merge headers of the 2 patches

    fold likes to "lose" the header of the patch being folded. This changes
    merges the 2 headers in a really simple way:
    
    * if there are no headers, do nothing
    * if there is only one header, use it
    * if there are two headers, use the current patch's header, followed by a
      delimiting line, followed by the folded patch's header
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 15, 2008
  2. [GUILT PATCH 5/5] Guards test suite

    The guards patches touch a lot of guilt, so make sure they don't muck
    anything up.
    
    [jeffpc: port to new regression suite]
    Signed-off-by: Eric Lesh <eclesh@ucla.edu>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Eric Lesh committed with jeffpc Sep 14, 2008
  3. [GUILT PATCH 4/5] get_series: return guarded patches only

    This renames get_guarded_series to get_series, and introduces
    get_full_series for when the full series is needed.  Many guilt
    scripts Just Work with that change.  Those that don't are fixed up.
    
    With this patch, guards are respected everywhere in guilt.
    
    Signed-off-by: Eric Lesh <eclesh@ucla.edu>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Eric Lesh committed with jeffpc Sep 14, 2008
  4. [GUILT PATCH 3/5] guilt-select: Select guards to apply when pushing p…

    …atches
    
    guilt-select chooses guards that alter which patches will be applied
    with a guilt-push.  The selected guards are stored in
    .git/patches/$branch/guards.
    
    [jeffpc: small tweak of the usage string]
    Signed-off-by: Eric Lesh <eclesh@ucla.edu>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Eric Lesh committed with jeffpc Sep 14, 2008
  5. [GUILT PATCH 2/5] guilt-guard: Assign guards to patches in series

    guilt-guard will assign guards to a patch.  They work so that:
    
        * Patches with no guards are always pushed.
    
        * Patches with positive guards (i.e. +foo) are pushed *only if* the
          guard is selected.
    
        * Patches with negative guards (i.e. -foo) are pushed *unless* the
          guard is selected.
    
    This also introduces a number of guard-related utility functions into
    guilt.  get_guarded_series is used to get the list of patches that are
    applicable given the current guard status.  It replaces get_series in
    a later patch.
    
    [jeffpc: small cleanups & bugfixes]
    Signed-off-by: Eric Lesh <eclesh@ucla.edu>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Eric Lesh committed with jeffpc Sep 14, 2008
  6. [GUILT PATCH 1/5] get_series: Remove comments from end of series lines

    Also make sure that series_remove_patch and series_rename_patch do the
    right thing if there are comments on the line.
    
    [jeffpc: few tiny bugfixes]
    Signed-off-by: Eric Lesh <eclesh@ucla.edu>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Eric Lesh committed with jeffpc Sep 14, 2008
  7. Remove autotagging

    NOTE: This is an experimental patch. It may or may not actually get merged.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 13, 2008
  8. guilt: Don't touch working tree when writing commits

    guilt-refresh and guilt-new -f don't affect the content of the working tree.
    However the implementation would recreate all the files in the current patch.
    This annoys my editor (kate).
    
    [jeffpc: update autotags after guilt-new]
    [jeffpc: the commit function must invoke a sub-shell to not polute namespace]
    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Alan Jenkins committed with jeffpc Sep 30, 2008
  9. [PATCH] explicitly set LC_ALL to 'C' in for guilt run-tests

    The output of guilt's run-tests is dependent on LC_COLLATE due to reliance
    on a given sorting algorithm. Currently, the test '052' will fail if
    LC_ALL/LC_COLLATE/LANG is set to 'en_US.UTF-8' (and likely others values).
    
    Remove the assumption by explicitly setting this in run-tests.
    
    [jeffpc: changed from LANG to LC_ALL & updated description]
    Signed-off-by: Scott Moser <smoser@brickies.net>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    smoser committed with jeffpc Sep 30, 2008
  10. docs: spelling fixes

    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 30, 2008
  11. Contributing: email address fix and subject suggestion

    Signed-off-by: Scott Moser <smoser@brickies.net>
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    smoser committed with jeffpc Sep 30, 2008
Commits on Sep 28, 2008
  1. patchbomb: added --git option

    This way, one can send relatively terse patches when files are moved/copied.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    jeffpc committed Sep 28, 2008