1. 12 Sep, 2017 1 commit
  2. 24 Feb, 2013 1 commit
  3. 27 Sep, 2010 2 commits
    • Ævar Arnfjörð Bjarmason's avatar
      perl: use "use warnings" instead of -w · 3328aced
      Ævar Arnfjörð Bjarmason authored
      Change the Perl scripts to turn on lexical warnings instead of setting
      the global $^W variable via the -w switch.
      
      The -w sets warnings for all code that interpreter runs, while "use
      warnings" is lexically scoped. The former is probably not what the
      authors wanted.
      
      As an auxiliary benefit it's now possible to build Git with:
      
          PERL_PATH='/usr/bin/env perl'
      
      Which would previously result in failures, since "#!/usr/bin/env perl -w"
      doesn't work as a shebang.
      Signed-off-by: Ævar Arnfjörð Bjarmason's avatarÆvar Arnfjörð Bjarmason <avarab@gmail.com>
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      3328aced
    • Ævar Arnfjörð Bjarmason's avatar
      perl: bump the required Perl version to 5.8 from 5.6.[21] · d48b2841
      Ævar Arnfjörð Bjarmason authored
      Formalize our dependency on perl 5.8, bumped from 5.6.[12]. We already
      used the three-arg form of open() which was introduced in 5.6.1, but
      t/t9700/test.pl explicitly depended on 5.6.2.
      
      However git-add--interactive.pl has been failing on the 5.6 line since
      it was introduced in v1.5.0-rc0~12^2~2 back in 2006 due to this open
      syntax:
      
          sub run_cmd_pipe {
                 my $fh = undef;
                 open($fh, '-|', @_) or die;
                 return <$fh>;
          }
      
      Which when executed dies on "Can't use an undefined value as
      filehandle reference". Several of our tests also fail on 5.6 (even
      more when compiled with NO_PERL_MAKEMAKER=1):
      
          t2016-checkout-patch.sh
          t3904-stash-patch.sh
          t3701-add-interactive.sh
          t7105-reset-patch.sh
          t7501-commit.sh
          t9700-perl-git.sh
      
      Our code is bitrotting on 5.6 with no-one interested in fixing it, and
      pinning us to such an ancient release of Perl is keeping us from using
      useful features introduced in the 5.8 release.
      
      The 5.6 series is now over 10 years old, and the 5.6.2 maintenance
      release almost 7. 5.8 on the other hand is more than 8 years old.
      
      All the modern Unix-like operating systems have now upgraded to it or
      a later version, and 5.8 packages are available for old IRIX, AIX
      Solaris and Tru64 systems.
      Signed-off-by: Ævar Arnfjörð Bjarmason's avatarÆvar Arnfjörð Bjarmason <avarab@gmail.com>
      Acked-by: 's avatarTor Arntsen <tor@spacetec.no>
      Acked-by: 's avatarRandal L. Schwartz <merlyn@stonehenge.com>
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      d48b2841
  4. 13 Jul, 2008 1 commit
    • Stephan Beyer's avatar
      Make usage strings dash-less · 1b1dd23f
      Stephan Beyer authored
      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: 's avatarStephan Beyer <s-beyer@gmx.net>
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      1b1dd23f
  5. 31 Aug, 2007 1 commit
    • Miles Bader's avatar
      Make git-archimport log entries more consistent · 608403d7
      Miles Bader authored
      When appending the "git-archimport-id:" line to the end of log entries,
      git-archimport would use two blank lines as a separator when there was no
      body in the arch log (only a Summary: line), and zero blank lines when there
      was a body (making it hard to see the break between the actual log message
      and the git-archimport-id: line).
      
      This patch makes git-archimport generate one blank line as a separator in all
      cases.
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      608403d7
  6. 07 Jun, 2007 1 commit
    • Junio C Hamano's avatar
      War on whitespace · a6080a0a
      Junio C Hamano authored
      This uses "git-apply --whitespace=strip" to fix whitespace errors that have
      crept in to our source files over time.  There are a few files that need
      to have trailing whitespaces (most notably, test vectors).  The results
      still passes the test, and build result in Documentation/ area is unchanged.
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      a6080a0a
  7. 07 Mar, 2007 1 commit
    • Paolo Bonzini's avatar
      git-archimport: allow remapping branch names · d9cb5399
      Paolo Bonzini authored
      This patch adds support to archimport for remapping the branch
      names to match those used in git more closely.  This is useful
      for projects that migrate to git (as opposed to users that want
      to use git on Arch-based projects).  For example, one can choose
      an Arch branch name and call it "master".
      
      The new command-line syntax works even if there is a colon in
      a branch name, since only the part after the last colon is taken
      to be the git name (git does not allow colons in branch names).
      
      The new feature is implemented so that archives rotated every
      year can also be remapped into a single git archive.
      Signed-off-by: Paolo Bonzini's avatarPaolo Bonzini  <bonzini@gnu.org>
      Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
      d9cb5399
  8. 28 Feb, 2007 1 commit
  9. 05 Feb, 2007 1 commit
  10. 12 Jan, 2007 1 commit
  11. 10 Jul, 2006 1 commit
  12. 01 Mar, 2006 1 commit
  13. 18 Feb, 2006 1 commit
    • Eric Wong's avatar
      archimport: remove files from the index before adding/updating · 3ff903bf
      Eric Wong authored
      This fixes a bug when importing where a directory gets removed/renamed
      but is immediately replaced by a file of the same name in the same
      changeset.
      
      This fix only applies to the accurate (default) strategy the moment.
      
      This patch should also fix the fast strategy if/when it is updated
      to handle the cases that would've triggered this bug.
      
      This bug was originally found in git-svn, but I remembered I did the
      same thing with archimport as well.
      Signed-off-by: 's avatarEric Wong <normalperson@yhbt.net>
      Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
      3ff903bf
  14. 19 Dec, 2005 1 commit
  15. 11 Dec, 2005 9 commits
  16. 17 Nov, 2005 5 commits
  17. 16 Nov, 2005 1 commit
  18. 11 Nov, 2005 1 commit
  19. 02 Oct, 2005 1 commit
  20. 11 Sep, 2005 3 commits
  21. 10 Sep, 2005 1 commit
    • martin@catalyst.net.nz's avatar
      [PATCH] archimport - add merge detection · b779d5f0
      martin@catalyst.net.nz authored
      We now keep track of the patches merged in each branch since they have
      diverged, using the records that the Arch "logs" provide. Merge parents
      for a commit are defined if we are merging a series of patches that starts
      from the mergebase.
      
      If patches from a related branch are merged out-of-order, we keep track of
      how much has been merged sequentially -- the tip of that sequential merge
      is our new parent from that branch.
      
      This mechanism works very well for branches that merge in dovetail and/or
      flying fish patterns, probably less well for others.
      Signed-off-by: 's avatarMartin Langhoff <martin@catalyst.net.nz>
      Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
      b779d5f0
  22. 08 Sep, 2005 1 commit
    • Junio C Hamano's avatar
      Big tool rename. · 215a7ad1
      Junio C Hamano authored
      As promised, this is the "big tool rename" patch.  The primary differences
      since 0.99.6 are:
      
        (1) git-*-script are no more.  The commands installed do not
            have any such suffix so users do not have to remember if
            something is implemented as a shell script or not.
      
        (2) Many command names with 'cache' in them are renamed with
            'index' if that is what they mean.
      
      There are backward compatibility symblic links so that you and
      Porcelains can keep using the old names, but the backward
      compatibility support  is expected to be removed in the near
      future.
      Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
      215a7ad1
  23. 04 Sep, 2005 2 commits
  24. 30 Aug, 2005 1 commit
    • Martin Langhoff's avatar
      [PATCH] Initial import of git-archimport-script · d3968363
      Martin Langhoff authored
      Imports a project history from one or more Arch repositories, following
      the branching and tagging across repositories. Note you should import
      separate projects to separate GIT repositories.
      
      Supported
       - Imports, tags and simple commits.
       - File renames
       - Arch tags
       - Binary files
       - Large trees
       - Multiple repositories
       - Branches
      
      TODO:
       - Allow re-running the import on an already-imported project
       - Follow merges using Arch data
       - Audit shell escaping of filenames
       - Better support for file metadata
       - Better/safer creation of temp directories
      
      Unsupported:
       - Arch 'configuration'
      
      [jc: my arch/tla is very rusty and after Tom announced he is stepping
       down as the maintainer I have very little motivation to relearn it,
       so I would appreciate if people discuss any bugs or enhancements
       directly with Martin.  Of course I can help with the git end of the
       issues.]
      Signed-off-by: 's avatarMartin Langhoff <martin@catalyst.net.nz>
      Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
      d3968363