Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 25, 2009
  1. git-quiltimport: preserve standard input to be able to read user input

    Gerrit Pape authored committed
    When run without --author and it fails to determine an author, git
    quiltimport tries `read patch_author` to get user input, but standard
    input has been redirected to the patch series file.  This commit lets
    quiltimport read the series file through file descriptor 3 so that the
    standard input is preserved.
    
    Reported by Uwe Kleine-König through http://bugs.debian.org/515910
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 22, 2008
  1. dscho

    Rename .git/rebase to .git/rebase-apply

    dscho authored committed
    With git-am, it sounds awkward to have the patches in ".git/rebase/",
    but for technical reasons, we have to keep the same directory name
    for git-am and git-rebase. ".git/rebase-apply" seems to be a good
    compromise.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 17, 2008
  1. Merge branch 'sb/dashless'

    authored
    * sb/dashless:
      Make usage strings dash-less
      t/: Use "test_must_fail git" instead of "! git"
      t/test-lib.sh: exit with small negagive int is ok with test_must_fail
    
    Conflicts:
    	builtin-blame.c
    	builtin-mailinfo.c
    	builtin-mailsplit.c
    	builtin-shortlog.c
    	git-am.sh
    	t/t4150-am.sh
    	t/t4200-rerere.sh
Commits on Jul 16, 2008
  1. dscho

    Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

    dscho authored committed
    Since the files generated and used during a rebase are never to be
    tracked, they should live in $GIT_DIR.  While at it, avoid the rather
    meaningless term "dotest" to "rebase", and unhide ".dotest-merge".
    
    This was wished for on the mailing list, but so far unimplemented.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 13, 2008
  1. Stephan Beyer

    Make usage strings dash-less

    sbeyer authored committed
    When you misuse a git command, you are shown the usage string.
    But this is currently shown in the dashed form.  So if you just
    copy what you see, it will not work, when the dashed form
    is no longer supported.
    
    This patch makes git commands show the dash-less version.
    
    For shell scripts that do not specify OPTIONS_SPEC, git-sh-setup.sh
    generates a dash-less usage string now.
    
    Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 13, 2008
  1. quiltimport: fix misquoting of parsed -p<num> parameter

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 10, 2008
  1. Pierre Habouzit

    git-quiltimport: better parser to grok "enhanced" series files.

    MadCoder authored committed
    The previous parser wasn't able to grok:
    
     * empty lines;
     * annotated patch levels (trailing -pNNN annotations);
     * trailing comments.
    
    Now it understands them and uses the patch level hints as a git apply
    argument.
    
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 29, 2007
  1. dscho

    Replace instances of export VAR=VAL with VAR=VAL; export VAR

    dscho authored committed
    It might be POSIX, but there are shells that do not like the
    expression 'export VAR=VAL'.  To be on the safe side, rewrite them
    into 'VAR=VAL' and 'export VAR'.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 13, 2007
  1. Andy Whitcroft

    git-quiltimport.sh fix --patches handling

    awhitcroft authored committed
    When converting git-quiltimport.sh to the new git-rev-part --parseopt
    system, the handling of --patches was broken.  We inadvertantly always
    attempt to use '--patches' as the value.
    
    This was introduced in the following commit:
    
        commit e01fbf1
        Author: Pierre Habouzit <madcoder@debian.org>
        Date:   Sun Nov 4 11:31:01 2007 +0100
    
            Migrate git-quiltimport.sh to use git-rev-parse --parseopt
    
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 6, 2007
  1. Pierre Habouzit

    Migrate git-quiltimport.sh to use git-rev-parse --parseopt

    MadCoder authored committed
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 27, 2007
  1. Dan Nicholson

    quiltimport: Skip non-existent patches

    dbnicholson authored committed
    When quiltimport encounters a non-existent patch in the series file,
    just skip to the next patch. This matches the behavior of quilt.
    
    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 23, 2007
  1. Supplant the "while case ... break ;; esac" idiom

    David Kastrup authored committed
    A lot of shell scripts contained stuff starting with
    
    	while case "$#" in 0) break ;; esac
    
    and similar.  I consider breaking out of the condition instead of the
    body od the loop ugly, and the implied "true" value of the
    non-matching case is not really obvious to humans at first glance.  It
    happens not to be obvious to some BSD shells, either, but that's
    because they are not POSIX-compliant.  In most cases, this has been
    replaced by a straight condition using "test".  "case" has the
    advantage of being faster than "test" on vintage shells where "test"
    is not a builtin.  Since none of them is likely to run the git
    scripts, anyway, the added readability should be worth the change.
    
    A few loops have had their termination condition expressed
    differently.
    
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 14, 2007
  1. Remove useless uses of cat, and replace with filename arguments

    Josh Triplett authored committed
    Replace uses of cat that do nothing but writing the contents of
    a single file to another command via pipe.
    
    [jc: Original patch from Josh was somewhat buggy and rewrote
    "cat $file | wc -l" to "wc -l $file", but this one should be Ok.]
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 3, 2007
  1. Rewrite "git-frotz" to "git frotz"

    authored
    This uses the remove-dashes target to replace "git-frotz" to "git frotz".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 24, 2007
  1. applymbox & quiltimport: typofix.

    Junio C Hamano authored
    6777c38 fixed only one of three typos introduced in an earlier
    patch 87ab799.  This fixes the other two.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 14, 2007
  1. Linus Torvalds

    git-quiltimport complaining yet still working

    torvalds authored Junio C Hamano committed
    There were two bugs: "stop_here" doesn't exist, but the bug that causes
    this code to trigger in the *first* place is the wrong use of "$dotest".
    It should be ".dotest"
    
    This is essentially the same bug introduced by 87ab799, one was
    fixed with 0d38ab2 but this was somehow left behind.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 30, 2007
  1. git-quiltimport /bin/sh-ism fix

    Francis Daly authored Junio C Hamano committed
    Bryan Wu reported
    /usr/local/bin/git-quiltimport: 114: Syntax error: Missing '))'
    
    Most bourne-ish shells I have here accept
     x=$((echo x)|cat)
    but all bourne-ish shells I have here accept
     x=$( (echo x)|cat)
    because $(( might mean arithmetic expansion.
    
    Signed-off-by: Francis Daly <francis@daoine.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 13, 2007
  1. builtin-mailinfo.c infrastrcture changes

    Don Zickus authored Junio C Hamano committed
    I am working on a project that required parsing through regular
    mboxes that didn't necessarily have patches embedded in them.  I
    started by creating my own modified copy of git-am and working
    from there.  Very quickly, I noticed git-mailinfo wasn't able to
    handle a big chunk of my email.
    
    After hacking up numerous solutions and running into more
    limitations, I decided it was just easier to rewrite a big chunk
    of it.  The following patch has a bunch of fixes and features
    that I needed in order for me do what I wanted.
    
    Note: I'm didn't follow any email rfc papers but I don't think
    any of the changes I did required much knowledge (besides the
    boundary stuff).
    
    List of major changes/fixes:
    - can't create empty patch files fix
    - empty patch files don't fail, this failure will come inside git-am
    - multipart boundaries are now handled
    - only output inbody headers if a patch exists otherwise assume those
    headers are part of the reply and instead output the original headers
    - decode and filter base64 patches correctly
    - various other accidental fixes
    
    I believe I didn't break any existing functionality or
    compatibility (other than what I describe above, which is really
    only the empty patch file).
    
    I tested this through various mailing list archives and
    everything seemed to parse correctly (a couple thousand emails).
    
    [jc: squashed in another patch from Don's five patch series to
     fix the test case, as this patch exposes the bug in the test.]
    
    Signed-off-by: Don Zickus <dzickus@redhat.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 4, 2007
  1. Pavel Roskin

    Assorted typo fixes

    proski authored Junio C Hamano committed
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jan 16, 2007
  1. Replace "echo -n" with printf in shell scripts.

    Jason Riedy authored Junio C Hamano committed
    Not all echos know -n.  This was causing a test failure in
    t5401-update-hooks.sh, but not t3800-mktag.sh for some reason.
    
    Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 11, 2006
  1. Shawn O. Pearce

    Log ref changes made by quiltimport.

    spearce authored Junio C Hamano committed
    When importing a quilt patch to a branch which has a reflog record
    the update to HEAD with a log message indicating the change was
    made by quiltimport and what patch caused the change.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 10, 2006
  1. Pavel Roskin

    Fix more typos, primarily in the code

    proski authored Junio C Hamano committed
    The only visible change is that git-blame doesn't understand
    "--compability" anymore, but it does accept "--compatibility" instead,
    which is already documented.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 27, 2006
  1. dstosberg

    Fix expr usage for FreeBSD

    dstosberg authored Junio C Hamano committed
    Some implementations of "expr" (e.g. FreeBSD's) fail, if an
    argument starts with a dash.
    
    Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 19, 2006
  1. ebiederm

    Implement a --dry-run option to git-quiltimport

    ebiederm authored Junio C Hamano committed
    Since large quilt trees like -mm can easily have patches
    without clear authorship information, add a --dry-run
    option to make the problem patches easy to find.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. ebiederm

    Implement git-quiltimport

    ebiederm authored Junio C Hamano committed
    Importing a quilt patch series into git is not very difficult
    but parsing the patch descriptions and all of the other
    minutia take a bit of effort to get right, so this automates it.
    
    Since git and quilt complement each other it makes sense
    to make it easy to go back and forth between the two.
    
    If a patch is encountered that it cannot derive the author
    from the user is asked.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.