--- git-1.7.10.4.orig/git-svn.perl.orig +++ git-1.7.10.4/git-svn.perl.orig @@ -0,0 +1,6842 @@ +#!/usr/bin/perl +# Copyright (C) 2006, Eric Wong +# License: GPL v2 or later +use 5.008; +use warnings; +use strict; +use vars qw/ $AUTHOR $VERSION + $sha1 $sha1_short $_revision $_repository + $_q $_authors $_authors_prog %users/; +$AUTHOR = 'Eric Wong '; +$VERSION = '@@GIT_VERSION@@'; + +# From which subdir have we been invoked? +my $cmd_dir_prefix = eval { + command_oneline([qw/rev-parse --show-prefix/], STDERR => 0) +} || ''; + +my $git_dir_user_set = 1 if defined $ENV{GIT_DIR}; +$ENV{GIT_DIR} ||= '.git'; +$Git::SVN::default_repo_id = 'svn'; +$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn'; +$Git::SVN::Ra::_log_window_size = 100; +$Git::SVN::_minimize_url = 'unset'; + +if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) { + $ENV{SVN_SSH} = $ENV{GIT_SSH}; +} + +if (exists $ENV{SVN_SSH} && $^O eq 'msys') { + $ENV{SVN_SSH} =~ s/\\/\\\\/g; + $ENV{SVN_SSH} =~ s/(.*)/"$1"/; +} + +$Git::SVN::Log::TZ = $ENV{TZ}; +$ENV{TZ} = 'UTC'; +$| = 1; # unbuffer STDOUT + +sub fatal (@) { print STDERR "@_\n"; exit 1 } +sub _req_svn { + require SVN::Core; # use()-ing this causes segfaults for me... *shrug* + require SVN::Ra; + require SVN::Delta; + if ($SVN::Core::VERSION lt '1.1.0') { + fatal "Need SVN::Core 1.1.0 or better (got $SVN::Core::VERSION)"; + } +} +my $can_compress = eval { require Compress::Zlib; 1}; +push @Git::SVN::Ra::ISA, 'SVN::Ra'; +push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor'; +push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor'; +use Carp qw/croak/; +use Digest::MD5; +use IO::File qw//; +use File::Basename qw/dirname basename/; +use File::Path qw/mkpath/; +use File::Spec; +use File::Find; +use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/; +use IPC::Open3; +use Git; +use Memoize; # core since 5.8.0, Jul 2002 + +BEGIN { + # import functions from Git into our packages, en masse + no strict 'refs'; + foreach (qw/command command_oneline command_noisy command_output_pipe + command_input_pipe command_close_pipe + command_bidi_pipe command_close_bidi_pipe/) { + for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher + Git::SVN::Migration Git::SVN::Log Git::SVN), + __PACKAGE__) { + *{"${package}::$_"} = \&{"Git::$_"}; + } + } + Memoize::memoize 'Git::config'; + Memoize::memoize 'Git::config_bool'; +} + +my ($SVN); + +$sha1 = qr/[a-f\d]{40}/; +$sha1_short = qr/[a-f\d]{4,40}/; +my ($_stdin, $_help, $_edit, + $_message, $_file, $_branch_dest, + $_template, $_shared, + $_version, $_fetch_all, $_no_rebase, $_fetch_parent, + $_merge, $_strategy, $_dry_run, $_local, + $_prefix, $_no_checkout, $_url, $_verbose, + $_git_format, $_commit_url, $_tag, $_merge_info, $_interactive); +$Git::SVN::_follow_parent = 1; +$SVN::Git::Fetcher::_placeholder_filename = ".gitignore"; +$_q ||= 0; +my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, + 'config-dir=s' => \$Git::SVN::Ra::config_dir, + 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache, + 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex, + 'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex ); +my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent, + 'authors-file|A=s' => \$_authors, + 'authors-prog=s' => \$_authors_prog, + 'repack:i' => \$Git::SVN::_repack, + 'noMetadata' => \$Git::SVN::_no_metadata, + 'useSvmProps' => \$Git::SVN::_use_svm_props, + 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props, + 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size, + 'no-checkout' => \$_no_checkout, + 'quiet|q+' => \$_q, + 'repack-flags|repack-args|repack-opts=s' => + \$Git::SVN::_repack_flags, + 'use-log-author' => \$Git::SVN::_use_log_author, + 'add-author-from' => \$Git::SVN::_add_author_from, + 'localtime' => \$Git::SVN::_localtime, + %remote_opts ); + +my ($_trunk, @_tags, @_branches, $_stdlayout); +my %icv; +my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared, + 'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags, + 'branches|b=s@' => \@_branches, 'prefix=s' => \$_prefix, + 'stdlayout|s' => \$_stdlayout, + 'minimize-url|m!' => \$Git::SVN::_minimize_url, + 'no-metadata' => sub { $icv{noMetadata} = 1 }, + 'use-svm-props' => sub { $icv{useSvmProps} = 1 }, + 'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 }, + 'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] }, + 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] }, + %remote_opts ); +my %cmt_opts = ( 'edit|e' => \$_edit, + 'rmdir' => \$SVN::Git::Editor::_rmdir, + 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder, + 'l=i' => \$SVN::Git::Editor::_rename_limit, + 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity +); + +my %cmd = ( + fetch => [ \&cmd_fetch, "Download new revisions from SVN", + { 'revision|r=s' => \$_revision, + 'fetch-all|all' => \$_fetch_all, + 'parent|p' => \$_fetch_parent, + %fc_opts } ], + clone => [ \&cmd_clone, "Initialize and fetch revisions", + { 'revision|r=s' => \$_revision, + 'preserve-empty-dirs' => + \$SVN::Git::Fetcher::_preserve_empty_dirs, + 'placeholder-filename=s' => + \$SVN::Git::Fetcher::_placeholder_filename, + %fc_opts, %init_opts } ], + init => [ \&cmd_init, "Initialize a repo for tracking" . + " (requires URL argument)", + \%init_opts ], + 'multi-init' => [ \&cmd_multi_init, + "Deprecated alias for ". + "'$0 init -T -b -t'", + \%init_opts ], + dcommit => [ \&cmd_dcommit, + 'Commit several diffs to merge with upstream', + { 'merge|m|M' => \$_merge, + 'strategy|s=s' => \$_strategy, + 'verbose|v' => \$_verbose, + 'dry-run|n' => \$_dry_run, + 'fetch-all|all' => \$_fetch_all, + 'commit-url=s' => \$_commit_url, + 'revision|r=i' => \$_revision, + 'no-rebase' => \$_no_rebase, + 'mergeinfo=s' => \$_merge_info, + 'interactive|i' => \$_interactive, + %cmt_opts, %fc_opts } ], + branch => [ \&cmd_branch, + 'Create a branch in the SVN repository', + { 'message|m=s' => \$_message, + 'destination|d=s' => \$_branch_dest, + 'dry-run|n' => \$_dry_run, + 'tag|t' => \$_tag, + 'username=s' => \$Git::SVN::Prompt::_username, + 'commit-url=s' => \$_commit_url } ], + tag => [ sub { $_tag = 1; cmd_branch(@_) }, + 'Create a tag in the SVN repository', + { 'message|m=s' => \$_message, + 'destination|d=s' => \$_branch_dest, + 'dry-run|n' => \$_dry_run, + 'username=s' => \$Git::SVN::Prompt::_username, + 'commit-url=s' => \$_commit_url } ], + 'set-tree' => [ \&cmd_set_tree, + "Set an SVN repository to a git tree-ish", + { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ], + 'create-ignore' => [ \&cmd_create_ignore, + 'Create a .gitignore per svn:ignore', + { 'revision|r=i' => \$_revision + } ], + 'mkdirs' => [ \&cmd_mkdirs , + "recreate empty directories after a checkout", + { 'revision|r=i' => \$_revision } ], + 'propget' => [ \&cmd_propget, + 'Print the value of a property on a file or directory', + { 'revision|r=i' => \$_revision } ], + 'proplist' => [ \&cmd_proplist, + 'List all properties of a file or directory', + { 'revision|r=i' => \$_revision } ], + 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings", + { 'revision|r=i' => \$_revision + } ], + 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings", + { 'revision|r=i' => \$_revision + } ], + 'multi-fetch' => [ \&cmd_multi_fetch, + "Deprecated alias for $0 fetch --all", + { 'revision|r=s' => \$_revision, %fc_opts } ], + 'migrate' => [ sub { }, + # no-op, we automatically run this anyways, + 'Migrate configuration/metadata/layout from + previous versions of git-svn', + { 'minimize' => \$Git::SVN::Migration::_minimize, + %remote_opts } ], + 'log' => [ \&Git::SVN::Log::cmd_show_log, 'Show commit logs', + { 'limit=i' => \$Git::SVN::Log::limit, + 'revision|r=s' => \$_revision, + 'verbose|v' => \$Git::SVN::Log::verbose, + 'incremental' => \$Git::SVN::Log::incremental, + 'oneline' => \$Git::SVN::Log::oneline, + 'show-commit' => \$Git::SVN::Log::show_commit, + 'non-recursive' => \$Git::SVN::Log::non_recursive, + 'authors-file|A=s' => \$_authors, + 'color' => \$Git::SVN::Log::color, + 'pager=s' => \$Git::SVN::Log::pager + } ], + 'find-rev' => [ \&cmd_find_rev, + "Translate between SVN revision numbers and tree-ish", + {} ], + 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory", + { 'merge|m|M' => \$_merge, + 'verbose|v' => \$_verbose, + 'strategy|s=s' => \$_strategy, + 'local|l' => \$_local, + 'fetch-all|all' => \$_fetch_all, + 'dry-run|n' => \$_dry_run, + %fc_opts } ], + 'commit-diff' => [ \&cmd_commit_diff, + 'Commit a diff between two trees', + { 'message|m=s' => \$_message, + 'file|F=s' => \$_file, + 'revision|r=s' => \$_revision, + %cmt_opts } ], + 'info' => [ \&cmd_info, + "Show info about the latest SVN revision + on the current branch", + { 'url' => \$_url, } ], + 'blame' => [ \&Git::SVN::Log::cmd_blame, + "Show what revision and author last modified each line of a file", + { 'git-format' => \$_git_format } ], + 'reset' => [ \&cmd_reset, + "Undo fetches back to the specified SVN revision", + { 'revision|r=s' => \$_revision, + 'parent|p' => \$_fetch_parent } ], + 'gc' => [ \&cmd_gc, + "Compress unhandled.log files in .git/svn and remove " . + "index files in .git/svn", + {} ], +); + +use Term::ReadLine; +package FakeTerm; +sub new { + my ($class, $reason) = @_; + return bless \$reason, shift; +} +sub readline { + my $self = shift; + die "Cannot use readline on FakeTerm: $$self"; +} +package main; + +my $term = eval { + $ENV{"GIT_SVN_NOTTY"} + ? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT + : new Term::ReadLine 'git-svn'; +}; +if ($@) { + $term = new FakeTerm "$@: going non-interactive"; +} + +my $cmd; +for (my $i = 0; $i < @ARGV; $i++) { + if (defined $cmd{$ARGV[$i]}) { + $cmd = $ARGV[$i]; + splice @ARGV, $i, 1; + last; + } elsif ($ARGV[$i] eq 'help') { + $cmd = $ARGV[$i+1]; + usage(0); + } +}; + +# make sure we're always running at the top-level working directory +unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { + unless (-d $ENV{GIT_DIR}) { + if ($git_dir_user_set) { + die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ", + "but it is not a directory\n"; + } + my $git_dir = delete $ENV{GIT_DIR}; + my $cdup = undef; + git_cmd_try { + $cdup = command_oneline(qw/rev-parse --show-cdup/); + $git_dir = '.' unless ($cdup); + chomp $cdup if ($cdup); + $cdup = "." unless ($cdup && length $cdup); + } "Already at toplevel, but $git_dir not found\n"; + chdir $cdup or die "Unable to chdir up to '$cdup'\n"; + unless (-d $git_dir) { + die "$git_dir still not found after going to ", + "'$cdup'\n"; + } + $ENV{GIT_DIR} = $git_dir; + } + $_repository = Git->repository(Repository => $ENV{GIT_DIR}); +} + +my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd); + +read_git_config(\%opts); +if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) { + Getopt::Long::Configure('pass_through'); +} +my $rv = GetOptions(%opts, 'h|H' => \$_help, 'version|V' => \$_version, + 'minimize-connections' => \$Git::SVN::Migration::_minimize, + 'id|i=s' => \$Git::SVN::default_ref_id, + 'svn-remote|remote|R=s' => sub { + $Git::SVN::no_reuse_existing = 1; + $Git::SVN::default_repo_id = $_[1] }); +exit 1 if (!$rv && $cmd && $cmd ne 'log'); + +usage(0) if $_help; +version() if $_version; +usage(1) unless defined $cmd; +load_authors() if $_authors; +if (defined $_authors_prog) { + $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'"; +} + +unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) { + Git::SVN::Migration::migration_check(); +} +Git::SVN::init_vars(); +eval { + Git::SVN::verify_remotes_sanity(); + $cmd{$cmd}->[0]->(@ARGV); +}; +fatal $@ if $@; +post_fetch_checkout(); +exit 0; + +####################### primary functions ###################### +sub usage { + my $exit = shift || 0; + my $fd = $exit ? \*STDERR : \*STDOUT; + print $fd <<""; +git-svn - bidirectional operations between a single Subversion tree and git +Usage: git svn [options] [arguments]\n + + print $fd "Available commands:\n" unless $cmd; + + foreach (sort keys %cmd) { + next if $cmd && $cmd ne $_; + next if /^multi-/; # don't show deprecated commands + print $fd ' ',pack('A17',$_),$cmd{$_}->[1],"\n"; + foreach (sort keys %{$cmd{$_}->[2]}) { + # mixed-case options are for .git/config only + next if /[A-Z]/ && /^[a-z]+$/i; + # prints out arguments as they should be passed: + my $x = s#[:=]s$## ? '' : s#[:=]i$## ? '' : ''; + print $fd ' ' x 21, join(', ', map { length $_ > 1 ? + "--$_" : "-$_" } + split /\|/,$_)," $x\n"; + } + } + print $fd <<""; +\nGIT_SVN_ID may be set in the environment or via the --id/-i switch to an +arbitrary identifier if you're tracking multiple SVN branches/repositories in +one git repository and want to keep them separate. See git-svn(1) for more +information. + + exit $exit; +} + +sub version { + ::_req_svn(); + print "git-svn version $VERSION (svn $SVN::Core::VERSION)\n"; + exit 0; +} + +sub ask { + my ($prompt, %arg) = @_; + my $valid_re = $arg{valid_re}; + my $default = $arg{default}; + my $resp; + my $i = 0; + + if ( !( defined($term->IN) + && defined( fileno($term->IN) ) + && defined( $term->OUT ) + && defined( fileno($term->OUT) ) ) ){ + return defined($default) ? $default : undef; + } + + while ($i++ < 10) { + $resp = $term->readline($prompt); + if (!defined $resp) { # EOF + print "\n"; + return defined $default ? $default : undef; + } + if ($resp eq '' and defined $default) { + return $default; + } + if (!defined $valid_re or $resp =~ /$valid_re/) { + return $resp; + } + } + return undef; +} + +sub do_git_init_db { + unless (-d $ENV{GIT_DIR}) { + my @init_db = ('init'); + push @init_db, "--template=$_template" if defined $_template; + if (defined $_shared) { + if ($_shared =~ /[a-z]/) { + push @init_db, "--shared=$_shared"; + } else { + push @init_db, "--shared"; + } + } + command_noisy(@init_db); + $_repository = Git->repository(Repository => ".git"); + } + my $set; + my $pfx = "svn-remote.$Git::SVN::default_repo_id"; + foreach my $i (keys %icv) { + die "'$set' and '$i' cannot both be set\n" if $set; + next unless defined $icv{$i}; + command_noisy('config', "$pfx.$i", $icv{$i}); + $set = $i; + } + my $ignore_paths_regex = \$SVN::Git::Fetcher::_ignore_regex; + command_noisy('config', "$pfx.ignore-paths", $$ignore_paths_regex) + if defined $$ignore_paths_regex; + my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex; + command_noisy('config', "$pfx.ignore-refs", $$ignore_refs_regex) + if defined $$ignore_refs_regex; + + if (defined $SVN::Git::Fetcher::_preserve_empty_dirs) { + my $fname = \$SVN::Git::Fetcher::_placeholder_filename; + command_noisy('config', "$pfx.preserve-empty-dirs", 'true'); + command_noisy('config', "$pfx.placeholder-filename", $$fname); + } +} + +sub init_subdir { + my $repo_path = shift or return; + mkpath([$repo_path]) unless -d $repo_path; + chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n"; + $ENV{GIT_DIR} = '.git'; + $_repository = Git->repository(Repository => $ENV{GIT_DIR}); +} + +sub cmd_clone { + my ($url, $path) = @_; + if (!defined $path && + (defined $_trunk || @_branches || @_tags || + defined $_stdlayout) && + $url !~ m#^[a-z\+]+://#) { + $path = $url; + } + $path = basename($url) if !defined $path || !length $path; + my $authors_absolute = $_authors ? File::Spec->rel2abs($_authors) : ""; + cmd_init($url, $path); + command_oneline('config', 'svn.authorsfile', $authors_absolute) + if $_authors; + Git::SVN::fetch_all($Git::SVN::default_repo_id); +} + +sub cmd_init { + if (defined $_stdlayout) { + $_trunk = 'trunk' if (!defined $_trunk); + @_tags = 'tags' if (! @_tags); + @_branches = 'branches' if (! @_branches); + } + if (defined $_trunk || @_branches || @_tags) { + return cmd_multi_init(@_); + } + my $url = shift or die "SVN repository location required ", + "as a command-line argument\n"; + $url = canonicalize_url($url); + init_subdir(@_); + do_git_init_db(); + + if ($Git::SVN::_minimize_url eq 'unset') { + $Git::SVN::_minimize_url = 0; + } + + Git::SVN->init($url); +} + +sub cmd_fetch { + if (grep /^\d+=./, @_) { + die "'=' fetch arguments are ", + "no longer supported.\n"; + } + my ($remote) = @_; + if (@_ > 1) { + die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n"; + } + $Git::SVN::no_reuse_existing = undef; + if ($_fetch_parent) { + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + unless ($gs) { + die "Unable to determine upstream SVN information from ", + "working tree history\n"; + } + # just fetch, don't checkout. + $_no_checkout = 'true'; + $_fetch_all ? $gs->fetch_all : $gs->fetch; + } elsif ($_fetch_all) { + cmd_multi_fetch(); + } else { + $remote ||= $Git::SVN::default_repo_id; + Git::SVN::fetch_all($remote, Git::SVN::read_all_remotes()); + } +} + +sub cmd_set_tree { + my (@commits) = @_; + if ($_stdin || !@commits) { + print "Reading from stdin...\n"; + @commits = (); + while () { + if (/\b($sha1_short)\b/o) { + unshift @commits, $1; + } + } + } + my @revs; + foreach my $c (@commits) { + my @tmp = command('rev-parse',$c); + if (scalar @tmp == 1) { + push @revs, $tmp[0]; + } elsif (scalar @tmp > 1) { + push @revs, reverse(command('rev-list',@tmp)); + } else { + fatal "Failed to rev-parse $c"; + } + } + my $gs = Git::SVN->new; + my ($r_last, $cmt_last) = $gs->last_rev_commit; + $gs->fetch; + if (defined $gs->{last_rev} && $r_last != $gs->{last_rev}) { + fatal "There are new revisions that were fetched ", + "and need to be merged (or acknowledged) ", + "before committing.\nlast rev: $r_last\n", + " current: $gs->{last_rev}"; + } + $gs->set_tree($_) foreach @revs; + print "Done committing ",scalar @revs," revisions to SVN\n"; + unlink $gs->{index}; +} + +sub split_merge_info_range { + my ($range) = @_; + if ($range =~ /(\d+)-(\d+)/) { + return (int($1), int($2)); + } else { + return (int($range), int($range)); + } +} + +sub combine_ranges { + my ($in) = @_; + + my @fnums = (); + my @arr = split(/,/, $in); + for my $element (@arr) { + my ($start, $end) = split_merge_info_range($element); + push @fnums, $start; + } + + my @sorted = @arr [ sort { + $fnums[$a] <=> $fnums[$b] + } 0..$#arr ]; + + my @return = (); + my $last = -1; + my $first = -1; + for my $element (@sorted) { + my ($start, $end) = split_merge_info_range($element); + + if ($last == -1) { + $first = $start; + $last = $end; + next; + } + if ($start <= $last+1) { + if ($end > $last) { + $last = $end; + } + next; + } + if ($first == $last) { + push @return, "$first"; + } else { + push @return, "$first-$last"; + } + $first = $start; + $last = $end; + } + + if ($first != -1) { + if ($first == $last) { + push @return, "$first"; + } else { + push @return, "$first-$last"; + } + } + + return join(',', @return); +} + +sub merge_revs_into_hash { + my ($hash, $minfo) = @_; + my @lines = split(' ', $minfo); + + for my $line (@lines) { + my ($branchpath, $revs) = split(/:/, $line); + + if (exists($hash->{$branchpath})) { + # Merge the two revision sets + my $combined = "$hash->{$branchpath},$revs"; + $hash->{$branchpath} = combine_ranges($combined); + } else { + # Just do range combining for consolidation + $hash->{$branchpath} = combine_ranges($revs); + } + } +} + +sub merge_merge_info { + my ($mergeinfo_one, $mergeinfo_two) = @_; + my %result_hash = (); + + merge_revs_into_hash(\%result_hash, $mergeinfo_one); + merge_revs_into_hash(\%result_hash, $mergeinfo_two); + + my $result = ''; + # Sort below is for consistency's sake + for my $branchname (sort keys(%result_hash)) { + my $revlist = $result_hash{$branchname}; + $result .= "$branchname:$revlist\n" + } + return $result; +} + +sub populate_merge_info { + my ($d, $gs, $uuid, $linear_refs, $rewritten_parent) = @_; + + my %parentshash; + read_commit_parents(\%parentshash, $d); + my @parents = @{$parentshash{$d}}; + if ($#parents > 0) { + # Merge commit + my $all_parents_ok = 1; + my $aggregate_mergeinfo = ''; + my $rooturl = $gs->repos_root; + + if (defined($rewritten_parent)) { + # Replace first parent with newly-rewritten version + shift @parents; + unshift @parents, $rewritten_parent; + } + + foreach my $parent (@parents) { + my ($branchurl, $svnrev, $paruuid) = + cmt_metadata($parent); + + unless (defined($svnrev)) { + # Should have been caught be preflight check + fatal "merge commit $d has ancestor $parent, but that change " + ."does not have git-svn metadata!"; + } + unless ($branchurl =~ /^\Q$rooturl\E(.*)/) { + fatal "commit $parent git-svn metadata changed mid-run!"; + } + my $branchpath = $1; + + my $ra = Git::SVN::Ra->new($branchurl); + my (undef, undef, $props) = + $ra->get_dir(canonicalize_path("."), $svnrev); + my $par_mergeinfo = $props->{'svn:mergeinfo'}; + unless (defined $par_mergeinfo) { + $par_mergeinfo = ''; + } + # Merge previous mergeinfo values + $aggregate_mergeinfo = + merge_merge_info($aggregate_mergeinfo, + $par_mergeinfo, 0); + + next if $parent eq $parents[0]; # Skip first parent + # Add new changes being placed in tree by merge + my @cmd = (qw/rev-list --reverse/, + $parent, qw/--not/); + foreach my $par (@parents) { + unless ($par eq $parent) { + push @cmd, $par; + } + } + my @revsin = (); + my ($revlist, $ctx) = command_output_pipe(@cmd); + while (<$revlist>) { + my $irev = $_; + chomp $irev; + my (undef, $csvnrev, undef) = + cmt_metadata($irev); + unless (defined $csvnrev) { + # A child is missing SVN annotations... + # this might be OK, or might not be. + warn "W:child $irev is merged into revision " + ."$d but does not have git-svn metadata. " + ."This means git-svn cannot determine the " + ."svn revision numbers to place into the " + ."svn:mergeinfo property. You must ensure " + ."a branch is entirely committed to " + ."SVN before merging it in order for " + ."svn:mergeinfo population to function " + ."properly"; + } + push @revsin, $csvnrev; + } + command_close_pipe($revlist, $ctx); + + last unless $all_parents_ok; + + # We now have a list of all SVN revnos which are + # merged by this particular parent. Integrate them. + next if $#revsin == -1; + my $newmergeinfo = "$branchpath:" . join(',', @revsin); + $aggregate_mergeinfo = + merge_merge_info($aggregate_mergeinfo, + $newmergeinfo, 1); + } + if ($all_parents_ok and $aggregate_mergeinfo) { + return $aggregate_mergeinfo; + } + } + + return undef; +} + +sub cmd_dcommit { + my $head = shift; + command_noisy(qw/update-index --refresh/); + git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) } + 'Cannot dcommit with a dirty index. Commit your changes first, ' + . "or stash them with `git stash'.\n"; + $head ||= 'HEAD'; + + my $old_head; + if ($head ne 'HEAD') { + $old_head = eval { + command_oneline([qw/symbolic-ref -q HEAD/]) + }; + if ($old_head) { + $old_head =~ s{^refs/heads/}{}; + } else { + $old_head = eval { command_oneline(qw/rev-parse HEAD/) }; + } + command(['checkout', $head], STDERR => 0); + } + + my @refs; + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD', \@refs); + unless ($gs) { + die "Unable to determine upstream SVN information from ", + "$head history.\nPerhaps the repository is empty."; + } + + if (defined $_commit_url) { + $url = $_commit_url; + } else { + $url = eval { command_oneline('config', '--get', + "svn-remote.$gs->{repo_id}.commiturl") }; + if (!$url) { + $url = $gs->full_pushurl + } + } + + my $last_rev = $_revision if defined $_revision; + if ($url) { + print "Committing to $url ...\n"; + } + my ($linear_refs, $parents) = linearize_history($gs, \@refs); + if ($_no_rebase && scalar(@$linear_refs) > 1) { + warn "Attempting to commit more than one change while ", + "--no-rebase is enabled.\n", + "If these changes depend on each other, re-running ", + "without --no-rebase may be required." + } + + if (defined $_interactive){ + my $ask_default = "y"; + foreach my $d (@$linear_refs){ + my ($fh, $ctx) = command_output_pipe(qw(show --summary), "$d"); + while (<$fh>){ + print $_; + } + command_close_pipe($fh, $ctx); + $_ = ask("Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): ", + valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i, + default => $ask_default); + die "Commit this patch reply required" unless defined $_; + if (/^[nq]/i) { + exit(0); + } elsif (/^a/i) { + last; + } + } + } + + my $expect_url = $url; + + my $push_merge_info = eval { + command_oneline(qw/config --get svn.pushmergeinfo/) + }; + if (not defined($push_merge_info) + or $push_merge_info eq "false" + or $push_merge_info eq "no" + or $push_merge_info eq "never") { + $push_merge_info = 0; + } + + unless (defined($_merge_info) || ! $push_merge_info) { + # Preflight check of changes to ensure no issues with mergeinfo + # This includes check for uncommitted-to-SVN parents + # (other than the first parent, which we will handle), + # information from different SVN repos, and paths + # which are not underneath this repository root. + my $rooturl = $gs->repos_root; + foreach my $d (@$linear_refs) { + my %parentshash; + read_commit_parents(\%parentshash, $d); + my @realparents = @{$parentshash{$d}}; + if ($#realparents > 0) { + # Merge commit + shift @realparents; # Remove/ignore first parent + foreach my $parent (@realparents) { + my ($branchurl, $svnrev, $paruuid) = cmt_metadata($parent); + unless (defined $paruuid) { + # A parent is missing SVN annotations... + # abort the whole operation. + fatal "$parent is merged into revision $d, " + ."but does not have git-svn metadata. " + ."Either dcommit the branch or use a " + ."local cherry-pick, FF merge, or rebase " + ."instead of an explicit merge commit."; + } + + unless ($paruuid eq $uuid) { + # Parent has SVN metadata from different repository + fatal "merge parent $parent for change $d has " + ."git-svn uuid $paruuid, while current change " + ."has uuid $uuid!"; + } + + unless ($branchurl =~ /^\Q$rooturl\E(.*)/) { + # This branch is very strange indeed. + fatal "merge parent $parent for $d is on branch " + ."$branchurl, which is not under the " + ."git-svn root $rooturl!"; + } + } + } + } + } + + my $rewritten_parent; + Git::SVN::remove_username($expect_url); + if (defined($_merge_info)) { + $_merge_info =~ tr{ }{\n}; + } + while (1) { + my $d = shift @$linear_refs or last; + unless (defined $last_rev) { + (undef, $last_rev, undef) = cmt_metadata("$d~1"); + unless (defined $last_rev) { + fatal "Unable to extract revision information ", + "from commit $d~1"; + } + } + if ($_dry_run) { + print "diff-tree $d~1 $d\n"; + } else { + my $cmt_rev; + + unless (defined($_merge_info) || ! $push_merge_info) { + $_merge_info = populate_merge_info($d, $gs, + $uuid, + $linear_refs, + $rewritten_parent); + } + + my %ed_opts = ( r => $last_rev, + log => get_commit_entry($d)->{log}, + ra => Git::SVN::Ra->new($url), + config => SVN::Core::config_get_config( + $Git::SVN::Ra::config_dir + ), + tree_a => "$d~1", + tree_b => $d, + editor_cb => sub { + print "Committed r$_[0]\n"; + $cmt_rev = $_[0]; + }, + mergeinfo => $_merge_info, + svn_path => ''); + if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) { + print "No changes\n$d~1 == $d\n"; + } elsif ($parents->{$d} && @{$parents->{$d}}) { + $gs->{inject_parents_dcommit}->{$cmt_rev} = + $parents->{$d}; + } + $_fetch_all ? $gs->fetch_all : $gs->fetch; + $last_rev = $cmt_rev; + next if $_no_rebase; + + # we always want to rebase against the current HEAD, + # not any head that was passed to us + my @diff = command('diff-tree', $d, + $gs->refname, '--'); + my @finish; + if (@diff) { + @finish = rebase_cmd(); + print STDERR "W: $d and ", $gs->refname, + " differ, using @finish:\n", + join("\n", @diff), "\n"; + } else { + print "No changes between current HEAD and ", + $gs->refname, + "\nResetting to the latest ", + $gs->refname, "\n"; + @finish = qw/reset --mixed/; + } + command_noisy(@finish, $gs->refname); + + $rewritten_parent = command_oneline(qw/rev-parse HEAD/); + + if (@diff) { + @refs = (); + my ($url_, $rev_, $uuid_, $gs_) = + working_head_info('HEAD', \@refs); + my ($linear_refs_, $parents_) = + linearize_history($gs_, \@refs); + if (scalar(@$linear_refs) != + scalar(@$linear_refs_)) { + fatal "# of revisions changed ", + "\nbefore:\n", + join("\n", @$linear_refs), + "\n\nafter:\n", + join("\n", @$linear_refs_), "\n", + 'If you are attempting to commit ', + "merges, try running:\n\t", + 'git rebase --interactive', + '--preserve-merges ', + $gs->refname, + "\nBefore dcommitting"; + } + if ($url_ ne $expect_url) { + if ($url_ eq $gs->metadata_url) { + print + "Accepting rewritten URL:", + " $url_\n"; + } else { + fatal + "URL mismatch after rebase:", + " $url_ != $expect_url"; + } + } + if ($uuid_ ne $uuid) { + fatal "uuid mismatch after rebase: ", + "$uuid_ != $uuid"; + } + # remap parents + my (%p, @l, $i); + for ($i = 0; $i < scalar @$linear_refs; $i++) { + my $new = $linear_refs_->[$i] or next; + $p{$new} = + $parents->{$linear_refs->[$i]}; + push @l, $new; + } + $parents = \%p; + $linear_refs = \@l; + } + } + } + + if ($old_head) { + my $new_head = command_oneline(qw/rev-parse HEAD/); + my $new_is_symbolic = eval { + command_oneline(qw/symbolic-ref -q HEAD/); + }; + if ($new_is_symbolic) { + print "dcommitted the branch ", $head, "\n"; + } else { + print "dcommitted on a detached HEAD because you gave ", + "a revision argument.\n", + "The rewritten commit is: ", $new_head, "\n"; + } + command(['checkout', $old_head], STDERR => 0); + } + + unlink $gs->{index}; +} + +sub cmd_branch { + my ($branch_name, $head) = @_; + + unless (defined $branch_name && length $branch_name) { + die(($_tag ? "tag" : "branch") . " name required\n"); + } + $head ||= 'HEAD'; + + my (undef, $rev, undef, $gs) = working_head_info($head); + my $src = $gs->full_pushurl; + + my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}}; + my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' }; + my $glob; + if ($#{$allglobs} == 0) { + $glob = $allglobs->[0]; + } else { + unless(defined $_branch_dest) { + die "Multiple ", + $_tag ? "tag" : "branch", + " paths defined for Subversion repository.\n", + "You must specify where you want to create the ", + $_tag ? "tag" : "branch", + " with the --destination argument.\n"; + } + foreach my $g (@{$allglobs}) { + # SVN::Git::Editor could probably be moved to Git.pm.. + my $re = SVN::Git::Editor::glob2pat($g->{path}->{left}); + if ($_branch_dest =~ /$re/) { + $glob = $g; + last; + } + } + unless (defined $glob) { + my $dest_re = qr/\b\Q$_branch_dest\E\b/; + foreach my $g (@{$allglobs}) { + $g->{path}->{left} =~ /$dest_re/ or next; + if (defined $glob) { + die "Ambiguous destination: ", + $_branch_dest, "\nmatches both '", + $glob->{path}->{left}, "' and '", + $g->{path}->{left}, "'\n"; + } + $glob = $g; + } + unless (defined $glob) { + die "Unknown ", + $_tag ? "tag" : "branch", + " destination $_branch_dest\n"; + } + } + } + my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/}; + my $url; + if (defined $_commit_url) { + $url = $_commit_url; + } else { + $url = eval { command_oneline('config', '--get', + "svn-remote.$gs->{repo_id}.commiturl") }; + if (!$url) { + $url = $remote->{pushurl} || $remote->{url}; + } + } + my $dst = join '/', $url, $lft, $branch_name, ($rgt || ()); + + if ($dst =~ /^https:/ && $src =~ /^http:/) { + $src=~s/^http:/https:/; + } + + ::_req_svn(); + + my $ctx = SVN::Client->new( + auth => Git::SVN::Ra::_auth_providers(), + log_msg => sub { + ${ $_[0] } = defined $_message + ? $_message + : 'Create ' . ($_tag ? 'tag ' : 'branch ' ) + . $branch_name; + }, + ); + + eval { + $ctx->ls($dst, 'HEAD', 0); + } and die "branch ${branch_name} already exists\n"; + + print "Copying ${src} at r${rev} to ${dst}...\n"; + $ctx->copy($src, $rev, $dst) + unless $_dry_run; + + $gs->fetch_all; +} + +sub cmd_find_rev { + my $revision_or_hash = shift or die "SVN or git revision required ", + "as a command-line argument\n"; + my $result; + if ($revision_or_hash =~ /^r\d+$/) { + my $head = shift; + $head ||= 'HEAD'; + my @refs; + my (undef, undef, $uuid, $gs) = working_head_info($head, \@refs); + unless ($gs) { + die "Unable to determine upstream SVN information from ", + "$head history\n"; + } + my $desired_revision = substr($revision_or_hash, 1); + $result = $gs->rev_map_get($desired_revision, $uuid); + } else { + my (undef, $rev, undef) = cmt_metadata($revision_or_hash); + $result = $rev; + } + print "$result\n" if $result; +} + +sub auto_create_empty_directories { + my ($gs) = @_; + my $var = eval { command_oneline('config', '--get', '--bool', + "svn-remote.$gs->{repo_id}.automkdirs") }; + # By default, create empty directories by consulting the unhandled log, + # but allow setting it to 'false' to skip it. + return !($var && $var eq 'false'); +} + +sub cmd_rebase { + command_noisy(qw/update-index --refresh/); + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + unless ($gs) { + die "Unable to determine upstream SVN information from ", + "working tree history\n"; + } + if ($_dry_run) { + print "Remote Branch: " . $gs->refname . "\n"; + print "SVN URL: " . $url . "\n"; + return; + } + if (command(qw/diff-index HEAD --/)) { + print STDERR "Cannot rebase with uncommited changes:\n"; + command_noisy('status'); + exit 1; + } + unless ($_local) { + # rebase will checkout for us, so no need to do it explicitly + $_no_checkout = 'true'; + $_fetch_all ? $gs->fetch_all : $gs->fetch; + } + command_noisy(rebase_cmd(), $gs->refname); + if (auto_create_empty_directories($gs)) { + $gs->mkemptydirs; + } +} + +sub cmd_show_ignore { + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + $gs ||= Git::SVN->new; + my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum); + $gs->prop_walk($gs->{path}, $r, sub { + my ($gs, $path, $props) = @_; + print STDOUT "\n# $path\n"; + my $s = $props->{'svn:ignore'} or return; + $s =~ s/[\r\n]+/\n/g; + $s =~ s/^\n+//; + chomp $s; + $s =~ s#^#$path#gm; + print STDOUT "$s\n"; + }); +} + +sub cmd_show_externals { + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + $gs ||= Git::SVN->new; + my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum); + $gs->prop_walk($gs->{path}, $r, sub { + my ($gs, $path, $props) = @_; + print STDOUT "\n# $path\n"; + my $s = $props->{'svn:externals'} or return; + $s =~ s/[\r\n]+/\n/g; + chomp $s; + $s =~ s#^#$path#gm; + print STDOUT "$s\n"; + }); +} + +sub cmd_create_ignore { + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + $gs ||= Git::SVN->new; + my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum); + $gs->prop_walk($gs->{path}, $r, sub { + my ($gs, $path, $props) = @_; + # $path is of the form /path/to/dir/ + $path = '.' . $path; + # SVN can have attributes on empty directories, + # which git won't track + mkpath([$path]) unless -d $path; + my $ignore = $path . '.gitignore'; + my $s = $props->{'svn:ignore'} or return; + open(GITIGNORE, '>', $ignore) + or fatal("Failed to open `$ignore' for writing: $!"); + $s =~ s/[\r\n]+/\n/g; + $s =~ s/^\n+//; + chomp $s; + # Prefix all patterns so that the ignore doesn't apply + # to sub-directories. + $s =~ s#^#/#gm; + print GITIGNORE "$s\n"; + close(GITIGNORE) + or fatal("Failed to close `$ignore': $!"); + command_noisy('add', '-f', $ignore); + }); +} + +sub cmd_mkdirs { + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + $gs ||= Git::SVN->new; + $gs->mkemptydirs($_revision); +} + +sub canonicalize_path { + my ($path) = @_; + my $dot_slash_added = 0; + if (substr($path, 0, 1) ne "/") { + $path = "./" . $path; + $dot_slash_added = 1; + } + # File::Spec->canonpath doesn't collapse x/../y into y (for a + # good reason), so let's do this manually. + $path =~ s#/+#/#g; + $path =~ s#/\.(?:/|$)#/#g; + $path =~ s#/[^/]+/\.\.##g; + $path =~ s#/$##g; + $path =~ s#^\./## if $dot_slash_added; + $path =~ s#^/##; + $path =~ s#^\.$##; + return $path; +} + +sub canonicalize_url { + my ($url) = @_; + $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e; + return $url; +} + +# get_svnprops(PATH) +# ------------------ +# Helper for cmd_propget and cmd_proplist below. +sub get_svnprops { + my $path = shift; + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + $gs ||= Git::SVN->new; + + # prefix THE PATH by the sub-directory from which the user + # invoked us. + $path = $cmd_dir_prefix . $path; + fatal("No such file or directory: $path") unless -e $path; + my $is_dir = -d $path ? 1 : 0; + $path = $gs->{path} . '/' . $path; + + # canonicalize the path (otherwise libsvn will abort or fail to + # find the file) + $path = canonicalize_path($path); + + my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum); + my $props; + if ($is_dir) { + (undef, undef, $props) = $gs->ra->get_dir($path, $r); + } + else { + (undef, $props) = $gs->ra->get_file($path, $r, undef); + } + return $props; +} + +# cmd_propget (PROP, PATH) +# ------------------------ +# Print the SVN property PROP for PATH. +sub cmd_propget { + my ($prop, $path) = @_; + $path = '.' if not defined $path; + usage(1) if not defined $prop; + my $props = get_svnprops($path); + if (not defined $props->{$prop}) { + fatal("`$path' does not have a `$prop' SVN property."); + } + print $props->{$prop} . "\n"; +} + +# cmd_proplist (PATH) +# ------------------- +# Print the list of SVN properties for PATH. +sub cmd_proplist { + my $path = shift; + $path = '.' if not defined $path; + my $props = get_svnprops($path); + print "Properties on '$path':\n"; + foreach (sort keys %{$props}) { + print " $_\n"; + } +} + +sub cmd_multi_init { + my $url = shift; + unless (defined $_trunk || @_branches || @_tags) { + usage(1); + } + + $_prefix = '' unless defined $_prefix; + if (defined $url) { + $url = canonicalize_url($url); + init_subdir(@_); + } + do_git_init_db(); + if (defined $_trunk) { + $_trunk =~ s#^/+##; + my $trunk_ref = 'refs/remotes/' . $_prefix . 'trunk'; + # try both old-style and new-style lookups: + my $gs_trunk = eval { Git::SVN->new($trunk_ref) }; + unless ($gs_trunk) { + my ($trunk_url, $trunk_path) = + complete_svn_url($url, $_trunk); + $gs_trunk = Git::SVN->init($trunk_url, $trunk_path, + undef, $trunk_ref); + } + } + return unless @_branches || @_tags; + my $ra = $url ? Git::SVN::Ra->new($url) : undef; + foreach my $path (@_branches) { + complete_url_ls_init($ra, $path, '--branches/-b', $_prefix); + } + foreach my $path (@_tags) { + complete_url_ls_init($ra, $path, '--tags/-t', $_prefix.'tags/'); + } +} + +sub cmd_multi_fetch { + $Git::SVN::no_reuse_existing = undef; + my $remotes = Git::SVN::read_all_remotes(); + foreach my $repo_id (sort keys %$remotes) { + if ($remotes->{$repo_id}->{url}) { + Git::SVN::fetch_all($repo_id, $remotes); + } + } +} + +# this command is special because it requires no metadata +sub cmd_commit_diff { + my ($ta, $tb, $url) = @_; + my $usage = "Usage: $0 commit-diff -r ". + " []"; + fatal($usage) if (!defined $ta || !defined $tb); + my $svn_path = ''; + if (!defined $url) { + my $gs = eval { Git::SVN->new }; + if (!$gs) { + fatal("Needed URL or usable git-svn --id in ", + "the command-line\n", $usage); + } + $url = $gs->{url}; + $svn_path = $gs->{path}; + } + unless (defined $_revision) { + fatal("-r|--revision is a required argument\n", $usage); + } + if (defined $_message && defined $_file) { + fatal("Both --message/-m and --file/-F specified ", + "for the commit message.\n", + "I have no idea what you mean"); + } + if (defined $_file) { + $_message = file_to_s($_file); + } else { + $_message ||= get_commit_entry($tb)->{log}; + } + my $ra ||= Git::SVN::Ra->new($url); + my $r = $_revision; + if ($r eq 'HEAD') { + $r = $ra->get_latest_revnum; + } elsif ($r !~ /^\d+$/) { + die "revision argument: $r not understood by git-svn\n"; + } + my %ed_opts = ( r => $r, + log => $_message, + ra => $ra, + tree_a => $ta, + tree_b => $tb, + editor_cb => sub { print "Committed r$_[0]\n" }, + svn_path => $svn_path ); + if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) { + print "No changes\n$ta == $tb\n"; + } +} + +sub escape_uri_only { + my ($uri) = @_; + my @tmp; + foreach (split m{/}, $uri) { + s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; + push @tmp, $_; + } + join('/', @tmp); +} + +sub escape_url { + my ($url) = @_; + if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) { + my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3)); + $url = "$scheme://$domain$uri"; + } + $url; +} + +sub cmd_info { + my $path = canonicalize_path(defined($_[0]) ? $_[0] : "."); + my $fullpath = canonicalize_path($cmd_dir_prefix . $path); + if (exists $_[1]) { + die "Too many arguments specified\n"; + } + + my ($file_type, $diff_status) = find_file_type_and_diff_status($path); + + if (!$file_type && !$diff_status) { + print STDERR "svn: '$path' is not under version control\n"; + exit 1; + } + + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + unless ($gs) { + die "Unable to determine upstream SVN information from ", + "working tree history\n"; + } + + # canonicalize_path() will return "" to make libsvn 1.5.x happy, + $path = "." if $path eq ""; + + my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath"); + + if ($_url) { + print escape_url($full_url), "\n"; + return; + } + + my $result = "Path: $path\n"; + $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir"; + $result .= "URL: " . escape_url($full_url) . "\n"; + + eval { + my $repos_root = $gs->repos_root; + Git::SVN::remove_username($repos_root); + $result .= "Repository Root: " . escape_url($repos_root) . "\n"; + }; + if ($@) { + $result .= "Repository Root: (offline)\n"; + } + ::_req_svn(); + $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" && + ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir"); + $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n"; + + $result .= "Node Kind: " . + ($file_type eq "dir" ? "directory" : "file") . "\n"; + + my $schedule = $diff_status eq "A" + ? "add" + : ($diff_status eq "D" ? "delete" : "normal"); + $result .= "Schedule: $schedule\n"; + + if ($diff_status eq "A") { + print $result, "\n"; + return; + } + + my ($lc_author, $lc_rev, $lc_date_utc); + my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath); + my $log = command_output_pipe(@args); + my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; + while (<$log>) { + if (/^${esc_color}author (.+) <[^>]+> (\d+) ([\-\+]?\d+)$/o) { + $lc_author = $1; + $lc_date_utc = Git::SVN::Log::parse_git_date($2, $3); + } elsif (/^${esc_color} (git-svn-id:.+)$/o) { + (undef, $lc_rev, undef) = ::extract_metadata($1); + } + } + close $log; + + Git::SVN::Log::set_local_timezone(); + + $result .= "Last Changed Author: $lc_author\n"; + $result .= "Last Changed Rev: $lc_rev\n"; + $result .= "Last Changed Date: " . + Git::SVN::Log::format_svn_date($lc_date_utc) . "\n"; + + if ($file_type ne "dir") { + my $text_last_updated_date = + ($diff_status eq "D" ? $lc_date_utc : (stat $path)[9]); + $result .= + "Text Last Updated: " . + Git::SVN::Log::format_svn_date($text_last_updated_date) . + "\n"; + my $checksum; + if ($diff_status eq "D") { + my ($fh, $ctx) = + command_output_pipe(qw(cat-file blob), "HEAD:$path"); + if ($file_type eq "link") { + my $file_name = <$fh>; + $checksum = md5sum("link $file_name"); + } else { + $checksum = md5sum($fh); + } + command_close_pipe($fh, $ctx); + } elsif ($file_type eq "link") { + my $file_name = + command(qw(cat-file blob), "HEAD:$path"); + $checksum = + md5sum("link " . $file_name); + } else { + open FILE, "<", $path or die $!; + $checksum = md5sum(\*FILE); + close FILE or die $!; + } + $result .= "Checksum: " . $checksum . "\n"; + } + + print $result, "\n"; +} + +sub cmd_reset { + my $target = shift || $_revision or die "SVN revision required\n"; + $target = $1 if $target =~ /^r(\d+)$/; + $target =~ /^\d+$/ or die "Numeric SVN revision expected\n"; + my ($url, $rev, $uuid, $gs) = working_head_info('HEAD'); + unless ($gs) { + die "Unable to determine upstream SVN information from ". + "history\n"; + } + my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent); + die "Cannot find SVN revision $target\n" unless defined($c); + $gs->rev_map_set($r, $c, 'reset', $uuid); + print "r$r = $c ($gs->{ref_id})\n"; +} + +sub cmd_gc { + if (!$can_compress) { + warn "Compress::Zlib could not be found; unhandled.log " . + "files will not be compressed.\n"; + } + find({ wanted => \&gc_directory, no_chdir => 1}, "$ENV{GIT_DIR}/svn"); +} + +########################### utility functions ######################### + +sub rebase_cmd { + my @cmd = qw/rebase/; + push @cmd, '-v' if $_verbose; + push @cmd, qw/--merge/ if $_merge; + push @cmd, "--strategy=$_strategy" if $_strategy; + @cmd; +} + +sub post_fetch_checkout { + return if $_no_checkout; + my $gs = $Git::SVN::_head or return; + return if verify_ref('refs/heads/master^0'); + + # look for "trunk" ref if it exists + my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}}; + my $fetch = $remote->{fetch}; + if ($fetch) { + foreach my $p (keys %$fetch) { + basename($fetch->{$p}) eq 'trunk' or next; + $gs = Git::SVN->new($fetch->{$p}, $gs->{repo_id}, $p); + last; + } + } + + my $valid_head = verify_ref('HEAD^0'); + command_noisy(qw(update-ref refs/heads/master), $gs->refname); + return if ($valid_head || !verify_ref('HEAD^0')); + + return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#; + my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index"; + return if -f $index; + + return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false'; + return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true'; + command_noisy(qw/read-tree -m -u -v HEAD HEAD/); + print STDERR "Checked out HEAD:\n ", + $gs->full_url, " r", $gs->last_rev, "\n"; + if (auto_create_empty_directories($gs)) { + $gs->mkemptydirs($gs->last_rev); + } +} + +sub complete_svn_url { + my ($url, $path) = @_; + $path =~ s#/+$##; + if ($path !~ m#^[a-z\+]+://#) { + if (!defined $url || $url !~ m#^[a-z\+]+://#) { + fatal("E: '$path' is not a complete URL ", + "and a separate URL is not specified"); + } + return ($url, $path); + } + return ($path, ''); +} + +sub complete_url_ls_init { + my ($ra, $repo_path, $switch, $pfx) = @_; + unless ($repo_path) { + print STDERR "W: $switch not specified\n"; + return; + } + $repo_path =~ s#/+$##; + if ($repo_path =~ m#^[a-z\+]+://#) { + $ra = Git::SVN::Ra->new($repo_path); + $repo_path = ''; + } else { + $repo_path =~ s#^/+##; + unless ($ra) { + fatal("E: '$repo_path' is not a complete URL ", + "and a separate URL is not specified"); + } + } + my $url = $ra->{url}; + my $gs = Git::SVN->init($url, undef, undef, undef, 1); + my $k = "svn-remote.$gs->{repo_id}.url"; + my $orig_url = eval { command_oneline(qw/config --get/, $k) }; + if ($orig_url && ($orig_url ne $gs->{url})) { + die "$k already set: $orig_url\n", + "wanted to set to: $gs->{url}\n"; + } + command_oneline('config', $k, $gs->{url}) unless $orig_url; + my $remote_path = "$gs->{path}/$repo_path"; + $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg; + $remote_path =~ s#/+#/#g; + $remote_path =~ s#^/##g; + $remote_path .= "/*" if $remote_path !~ /\*/; + my ($n) = ($switch =~ /^--(\w+)/); + if (length $pfx && $pfx !~ m#/$#) { + die "--prefix='$pfx' must have a trailing slash '/'\n"; + } + command_noisy('config', + '--add', + "svn-remote.$gs->{repo_id}.$n", + "$remote_path:refs/remotes/$pfx*" . + ('/*' x (($remote_path =~ tr/*/*/) - 1)) ); +} + +sub verify_ref { + my ($ref) = @_; + eval { command_oneline([ 'rev-parse', '--verify', $ref ], + { STDERR => 0 }); }; +} + +sub get_tree_from_treeish { + my ($treeish) = @_; + # $treeish can be a symbolic ref, too: + my $type = command_oneline(qw/cat-file -t/, $treeish); + my $expected; + while ($type eq 'tag') { + ($treeish, $type) = command(qw/cat-file tag/, $treeish); + } + if ($type eq 'commit') { + $expected = (grep /^tree /, command(qw/cat-file commit/, + $treeish))[0]; + ($expected) = ($expected =~ /^tree ($sha1)$/o); + die "Unable to get tree from $treeish\n" unless $expected; + } elsif ($type eq 'tree') { + $expected = $treeish; + } else { + die "$treeish is a $type, expected tree, tag or commit\n"; + } + return $expected; +} + +sub get_commit_entry { + my ($treeish) = shift; + my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) ); + my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG"; + my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG"; + open my $log_fh, '>', $commit_editmsg or croak $!; + + my $type = command_oneline(qw/cat-file -t/, $treeish); + if ($type eq 'commit' || $type eq 'tag') { + my ($msg_fh, $ctx) = command_output_pipe('cat-file', + $type, $treeish); + my $in_msg = 0; + my $author; + my $saw_from = 0; + my $msgbuf = ""; + while (<$msg_fh>) { + if (!$in_msg) { + $in_msg = 1 if (/^\s*$/); + $author = $1 if (/^author (.*>)/); + } elsif (/^git-svn-id: /) { + # skip this for now, we regenerate the + # correct one on re-fetch anyways + # TODO: set *:merge properties or like... + } else { + if (/^From:/ || /^Signed-off-by:/) { + $saw_from = 1; + } + $msgbuf .= $_; + } + } + $msgbuf =~ s/\s+$//s; + if ($Git::SVN::_add_author_from && defined($author) + && !$saw_from) { + $msgbuf .= "\n\nFrom: $author"; + } + print $log_fh $msgbuf or croak $!; + command_close_pipe($msg_fh, $ctx); + } + close $log_fh or croak $!; + + if ($_edit || ($type eq 'tree')) { + chomp(my $editor = command_oneline(qw(var GIT_EDITOR))); + system('sh', '-c', $editor.' "$@"', $editor, $commit_editmsg); + } + rename $commit_editmsg, $commit_msg or croak $!; + { + require Encode; + # SVN requires messages to be UTF-8 when entering the repo + local $/; + open $log_fh, '<', $commit_msg or croak $!; + binmode $log_fh; + chomp($log_entry{log} = <$log_fh>); + + my $enc = Git::config('i18n.commitencoding') || 'UTF-8'; + my $msg = $log_entry{log}; + + eval { $msg = Encode::decode($enc, $msg, 1) }; + if ($@) { + die "Could not decode as $enc:\n", $msg, + "\nPerhaps you need to set i18n.commitencoding\n"; + } + + eval { $msg = Encode::encode('UTF-8', $msg, 1) }; + die "Could not encode as UTF-8:\n$msg\n" if $@; + + $log_entry{log} = $msg; + + close $log_fh or croak $!; + } + unlink $commit_msg; + \%log_entry; +} + +sub s_to_file { + my ($str, $file, $mode) = @_; + open my $fd,'>',$file or croak $!; + print $fd $str,"\n" or croak $!; + close $fd or croak $!; + chmod ($mode &~ umask, $file) if (defined $mode); +} + +sub file_to_s { + my $file = shift; + open my $fd,'<',$file or croak "$!: file: $file\n"; + local $/; + my $ret = <$fd>; + close $fd or croak $!; + $ret =~ s/\s*$//s; + return $ret; +} + +# ' = real-name ' mapping based on git-svnimport: +sub load_authors { + open my $authors, '<', $_authors or die "Can't open $_authors $!\n"; + my $log = $cmd eq 'log'; + while (<$authors>) { + chomp; + next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/; + my ($user, $name, $email) = ($1, $2, $3); + if ($log) { + $Git::SVN::Log::rusers{"$name <$email>"} = $user; + } else { + $users{$user} = [$name, $email]; + } + } + close $authors or croak $!; +} + +# convert GetOpt::Long specs for use by git-config +sub read_git_config { + my $opts = shift; + my @config_only; + foreach my $o (keys %$opts) { + # if we have mixedCase and a long option-only, then + # it's a config-only variable that we don't need for + # the command-line. + push @config_only, $o if ($o =~ /[A-Z]/ && $o =~ /^[a-z]+$/i); + my $v = $opts->{$o}; + my ($key) = ($o =~ /^([a-zA-Z\-]+)/); + $key =~ s/-//g; + my $arg = 'git config'; + $arg .= ' --int' if ($o =~ /[:=]i$/); + $arg .= ' --bool' if ($o !~ /[:=][sfi]$/); + if (ref $v eq 'ARRAY') { + chomp(my @tmp = `$arg --get-all svn.$key`); + @$v = @tmp if @tmp; + } else { + chomp(my $tmp = `$arg --get svn.$key`); + if ($tmp && !($arg =~ / --bool/ && $tmp eq 'false')) { + $$v = $tmp; + } + } + } + delete @$opts{@config_only} if @config_only; +} + +sub extract_metadata { + my $id = shift or return (undef, undef, undef); + my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+) + \s([a-f\d\-]+)$/ix); + if (!defined $rev || !$uuid || !$url) { + # some of the original repositories I made had + # identifiers like this: + ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/i); + } + return ($url, $rev, $uuid); +} + +sub cmt_metadata { + return extract_metadata((grep(/^git-svn-id: /, + command(qw/cat-file commit/, shift)))[-1]); +} + +sub cmt_sha2rev_batch { + my %s2r; + my ($pid, $in, $out, $ctx) = command_bidi_pipe(qw/cat-file --batch/); + my $list = shift; + + foreach my $sha (@{$list}) { + my $first = 1; + my $size = 0; + print $out $sha, "\n"; + + while (my $line = <$in>) { + if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) { + last; + } elsif ($first && + $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) { + $first = 0; + $size = $1; + next; + } elsif ($line =~ /^(git-svn-id: )/) { + my (undef, $rev, undef) = + extract_metadata($line); + $s2r{$sha} = $rev; + } + + $size -= length($line); + last if ($size == 0); + } + } + + command_close_bidi_pipe($pid, $in, $out, $ctx); + + return \%s2r; +} + +sub working_head_info { + my ($head, $refs) = @_; + my @args = qw/rev-list --first-parent --pretty=medium/; + my ($fh, $ctx) = command_output_pipe(@args, $head); + my $hash; + my %max; + while (<$fh>) { + if ( m{^commit ($::sha1)$} ) { + unshift @$refs, $hash if $hash and $refs; + $hash = $1; + next; + } + next unless s{^\s*(git-svn-id:)}{$1}; + my ($url, $rev, $uuid) = extract_metadata($_); + if (defined $url && defined $rev) { + next if $max{$url} and $max{$url} < $rev; + if (my $gs = Git::SVN->find_by_url($url)) { + my $c = $gs->rev_map_get($rev, $uuid); + if ($c && $c eq $hash) { + close $fh; # break the pipe + return ($url, $rev, $uuid, $gs); + } else { + $max{$url} ||= $gs->rev_map_max; + } + } + } + } + command_close_pipe($fh, $ctx); + (undef, undef, undef, undef); +} + +sub read_commit_parents { + my ($parents, $c) = @_; + chomp(my $p = command_oneline(qw/rev-list --parents -1/, $c)); + $p =~ s/^($c)\s*// or die "rev-list --parents -1 $c failed!\n"; + @{$parents->{$c}} = split(/ /, $p); +} + +sub linearize_history { + my ($gs, $refs) = @_; + my %parents; + foreach my $c (@$refs) { + read_commit_parents(\%parents, $c); + } + + my @linear_refs; + my %skip = (); + my $last_svn_commit = $gs->last_commit; + foreach my $c (reverse @$refs) { + next if $c eq $last_svn_commit; + last if $skip{$c}; + + unshift @linear_refs, $c; + $skip{$c} = 1; + + # we only want the first parent to diff against for linear + # history, we save the rest to inject when we finalize the + # svn commit + my $fp_a = verify_ref("$c~1"); + my $fp_b = shift @{$parents{$c}} if $parents{$c}; + if (!$fp_a || !$fp_b) { + die "Commit $c\n", + "has no parent commit, and therefore ", + "nothing to diff against.\n", + "You should be working from a repository ", + "originally created by git-svn\n"; + } + if ($fp_a ne $fp_b) { + die "$c~1 = $fp_a, however parsing commit $c ", + "revealed that:\n$c~1 = $fp_b\nBUG!\n"; + } + + foreach my $p (@{$parents{$c}}) { + $skip{$p} = 1; + } + } + (\@linear_refs, \%parents); +} + +sub find_file_type_and_diff_status { + my ($path) = @_; + return ('dir', '') if $path eq ''; + + my $diff_output = + command_oneline(qw(diff --cached --name-status --), $path) || ""; + my $diff_status = (split(' ', $diff_output))[0] || ""; + + my $ls_tree = command_oneline(qw(ls-tree HEAD), $path) || ""; + + return (undef, undef) if !$diff_status && !$ls_tree; + + if ($diff_status eq "A") { + return ("link", $diff_status) if -l $path; + return ("dir", $diff_status) if -d $path; + return ("file", $diff_status); + } + + my $mode = (split(' ', $ls_tree))[0] || ""; + + return ("link", $diff_status) if $mode eq "120000"; + return ("dir", $diff_status) if $mode eq "040000"; + return ("file", $diff_status); +} + +sub md5sum { + my $arg = shift; + my $ref = ref $arg; + my $md5 = Digest::MD5->new(); + if ($ref eq 'GLOB' || $ref eq 'IO::File' || $ref eq 'File::Temp') { + $md5->addfile($arg) or croak $!; + } elsif ($ref eq 'SCALAR') { + $md5->add($$arg) or croak $!; + } elsif (!$ref) { + $md5->add($arg) or croak $!; + } else { + ::fatal "Can't provide MD5 hash for unknown ref type: '", $ref, "'"; + } + return $md5->hexdigest(); +} + +sub gc_directory { + if ($can_compress && -f $_ && basename($_) eq "unhandled.log") { + my $out_filename = $_ . ".gz"; + open my $in_fh, "<", $_ or die "Unable to open $_: $!\n"; + binmode $in_fh; + my $gz = Compress::Zlib::gzopen($out_filename, "ab") or + die "Unable to open $out_filename: $!\n"; + + my $res; + while ($res = sysread($in_fh, my $str, 1024)) { + $gz->gzwrite($str) or + die "Unable to write: ".$gz->gzerror()."!\n"; + } + unlink $_ or die "unlink $File::Find::name: $!\n"; + } elsif (-f $_ && basename($_) eq "index") { + unlink $_ or die "unlink $_: $!\n"; + } +} + +package Git::SVN; +use strict; +use warnings; +use Fcntl qw/:DEFAULT :seek/; +use constant rev_map_fmt => 'NH40'; +use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent + $_repack $_repack_flags $_use_svm_props $_head + $_use_svnsync_props $no_reuse_existing $_minimize_url + $_use_log_author $_add_author_from $_localtime/; +use Carp qw/croak/; +use File::Path qw/mkpath/; +use File::Copy qw/copy/; +use IPC::Open3; +use Time::Local; +use Memoize; # core since 5.8.0, Jul 2002 +use Memoize::Storable; +my $can_use_yaml; +BEGIN { + $can_use_yaml = eval { require Git::SVN::Memoize::YAML; 1}; +} + +my ($_gc_nr, $_gc_period); + +# properties that we do not log: +my %SKIP_PROP; +BEGIN { + %SKIP_PROP = map { $_ => 1 } qw/svn:wc:ra_dav:version-url + svn:special svn:executable + svn:entry:committed-rev + svn:entry:last-author + svn:entry:uuid + svn:entry:committed-date/; + + # some options are read globally, but can be overridden locally + # per [svn-remote "..."] section. Command-line options will *NOT* + # override options set in an [svn-remote "..."] section + no strict 'refs'; + for my $option (qw/follow_parent no_metadata use_svm_props + use_svnsync_props/) { + my $key = $option; + $key =~ tr/_//d; + my $prop = "-$option"; + *$option = sub { + my ($self) = @_; + return $self->{$prop} if exists $self->{$prop}; + my $k = "svn-remote.$self->{repo_id}.$key"; + eval { command_oneline(qw/config --get/, $k) }; + if ($@) { + $self->{$prop} = ${"Git::SVN::_$option"}; + } else { + my $v = command_oneline(qw/config --bool/,$k); + $self->{$prop} = $v eq 'false' ? 0 : 1; + } + return $self->{$prop}; + } + } +} + + +my (%LOCKFILES, %INDEX_FILES); +END { + unlink keys %LOCKFILES if %LOCKFILES; + unlink keys %INDEX_FILES if %INDEX_FILES; +} + +sub resolve_local_globs { + my ($url, $fetch, $glob_spec) = @_; + return unless defined $glob_spec; + my $ref = $glob_spec->{ref}; + my $path = $glob_spec->{path}; + foreach (command(qw#for-each-ref --format=%(refname) refs/#)) { + next unless m#^$ref->{regex}$#; + my $p = $1; + my $pathname = desanitize_refname($path->full_path($p)); + my $refname = desanitize_refname($ref->full_path($p)); + if (my $existing = $fetch->{$pathname}) { + if ($existing ne $refname) { + die "Refspec conflict:\n", + "existing: $existing\n", + " globbed: $refname\n"; + } + my $u = (::cmt_metadata("$refname"))[0]; + $u =~ s!^\Q$url\E(/|$)!! or die + "$refname: '$url' not found in '$u'\n"; + if ($pathname ne $u) { + warn "W: Refspec glob conflict ", + "(ref: $refname):\n", + "expected path: $pathname\n", + " real path: $u\n", + "Continuing ahead with $u\n"; + next; + } + } else { + $fetch->{$pathname} = $refname; + } + } +} + +sub parse_revision_argument { + my ($base, $head) = @_; + if (!defined $::_revision || $::_revision eq 'BASE:HEAD') { + return ($base, $head); + } + return ($1, $2) if ($::_revision =~ /^(\d+):(\d+)$/); + return ($::_revision, $::_revision) if ($::_revision =~ /^\d+$/); + return ($head, $head) if ($::_revision eq 'HEAD'); + return ($base, $1) if ($::_revision =~ /^BASE:(\d+)$/); + return ($1, $head) if ($::_revision =~ /^(\d+):HEAD$/); + die "revision argument: $::_revision not understood by git-svn\n"; +} + +sub fetch_all { + my ($repo_id, $remotes) = @_; + if (ref $repo_id) { + my $gs = $repo_id; + $repo_id = undef; + $repo_id = $gs->{repo_id}; + } + $remotes ||= read_all_remotes(); + my $remote = $remotes->{$repo_id} or + die "[svn-remote \"$repo_id\"] unknown\n"; + my $fetch = $remote->{fetch}; + my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n"; + my (@gs, @globs); + my $ra = Git::SVN::Ra->new($url); + my $uuid = $ra->get_uuid; + my $head = $ra->get_latest_revnum; + + # ignore errors, $head revision may not even exist anymore + eval { $ra->get_log("", $head, 0, 1, 0, 1, sub { $head = $_[1] }) }; + warn "W: $@\n" if $@; + + my $base = defined $fetch ? $head : 0; + + # read the max revs for wildcard expansion (branches/*, tags/*) + foreach my $t (qw/branches tags/) { + defined $remote->{$t} or next; + push @globs, @{$remote->{$t}}; + + my $max_rev = eval { tmp_config(qw/--int --get/, + "svn-remote.$repo_id.${t}-maxRev") }; + if (defined $max_rev && ($max_rev < $base)) { + $base = $max_rev; + } elsif (!defined $max_rev) { + $base = 0; + } + } + + if ($fetch) { + foreach my $p (sort keys %$fetch) { + my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p); + my $lr = $gs->rev_map_max; + if (defined $lr) { + $base = $lr if ($lr < $base); + } + push @gs, $gs; + } + } + + ($base, $head) = parse_revision_argument($base, $head); + $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs); +} + +sub read_all_remotes { + my $r = {}; + my $use_svm_props = eval { command_oneline(qw/config --bool + svn.useSvmProps/) }; + $use_svm_props = $use_svm_props eq 'true' if $use_svm_props; + my $svn_refspec = qr{\s*(.*?)\s*:\s*(.+?)\s*}; + foreach (grep { s/^svn-remote\.// } command(qw/config -l/)) { + if (m!^(.+)\.fetch=$svn_refspec$!) { + my ($remote, $local_ref, $remote_ref) = ($1, $2, $3); + die("svn-remote.$remote: remote ref '$remote_ref' " + . "must start with 'refs/'\n") + unless $remote_ref =~ m{^refs/}; + $local_ref = uri_decode($local_ref); + $r->{$remote}->{fetch}->{$local_ref} = $remote_ref; + $r->{$remote}->{svm} = {} if $use_svm_props; + } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) { + $r->{$1}->{svm} = {}; + } elsif (m!^(.+)\.url=\s*(.*)\s*$!) { + $r->{$1}->{url} = $2; + } elsif (m!^(.+)\.pushurl=\s*(.*)\s*$!) { + $r->{$1}->{pushurl} = $2; + } elsif (m!^(.+)\.ignore-refs=\s*(.*)\s*$!) { + $r->{$1}->{ignore_refs_regex} = $2; + } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) { + my ($remote, $t, $local_ref, $remote_ref) = + ($1, $2, $3, $4); + die("svn-remote.$remote: remote ref '$remote_ref' ($t) " + . "must start with 'refs/'\n") + unless $remote_ref =~ m{^refs/}; + $local_ref = uri_decode($local_ref); + my $rs = { + t => $t, + remote => $remote, + path => Git::SVN::GlobSpec->new($local_ref, 1), + ref => Git::SVN::GlobSpec->new($remote_ref, 0) }; + if (length($rs->{ref}->{right}) != 0) { + die "The '*' glob character must be the last ", + "character of '$remote_ref'\n"; + } + push @{ $r->{$remote}->{$t} }, $rs; + } + } + + map { + if (defined $r->{$_}->{svm}) { + my $svm; + eval { + my $section = "svn-remote.$_"; + $svm = { + source => tmp_config('--get', + "$section.svm-source"), + replace => tmp_config('--get', + "$section.svm-replace"), + } + }; + $r->{$_}->{svm} = $svm; + } + } keys %$r; + + foreach my $remote (keys %$r) { + foreach ( grep { defined $_ } + map { $r->{$remote}->{$_} } qw(branches tags) ) { + foreach my $rs ( @$_ ) { + $rs->{ignore_refs_regex} = + $r->{$remote}->{ignore_refs_regex}; + } + } + } + + $r; +} + +sub init_vars { + $_gc_nr = $_gc_period = 1000; + if (defined $_repack || defined $_repack_flags) { + warn "Repack options are obsolete; they have no effect.\n"; + } +} + +sub verify_remotes_sanity { + return unless -d $ENV{GIT_DIR}; + my %seen; + foreach (command(qw/config -l/)) { + if (m!^svn-remote\.(?:.+)\.fetch=.*:refs/remotes/(\S+)\s*$!) { + if ($seen{$1}) { + die "Remote ref refs/remote/$1 is tracked by", + "\n \"$_\"\nand\n \"$seen{$1}\"\n", + "Please resolve this ambiguity in ", + "your git configuration file before ", + "continuing\n"; + } + $seen{$1} = $_; + } + } +} + +sub find_existing_remote { + my ($url, $remotes) = @_; + return undef if $no_reuse_existing; + my $existing; + foreach my $repo_id (keys %$remotes) { + my $u = $remotes->{$repo_id}->{url} or next; + next if $u ne $url; + $existing = $repo_id; + last; + } + $existing; +} + +sub init_remote_config { + my ($self, $url, $no_write) = @_; + $url =~ s!/+$!!; # strip trailing slash + my $r = read_all_remotes(); + my $existing = find_existing_remote($url, $r); + if ($existing) { + unless ($no_write) { + print STDERR "Using existing ", + "[svn-remote \"$existing\"]\n"; + } + $self->{repo_id} = $existing; + } elsif ($_minimize_url) { + my $min_url = Git::SVN::Ra->new($url)->minimize_url; + $existing = find_existing_remote($min_url, $r); + if ($existing) { + unless ($no_write) { + print STDERR "Using existing ", + "[svn-remote \"$existing\"]\n"; + } + $self->{repo_id} = $existing; + } + if ($min_url ne $url) { + unless ($no_write) { + print STDERR "Using higher level of URL: ", + "$url => $min_url\n"; + } + my $old_path = $self->path; + $url =~ s!^\Q$min_url\E(/|$)!!; + if (length $old_path) { + $url .= "/$old_path"; + } + $self->path($url); + $url = $min_url; + } + } + my $orig_url; + if (!$existing) { + # verify that we aren't overwriting anything: + $orig_url = eval { + command_oneline('config', '--get', + "svn-remote.$self->{repo_id}.url") + }; + if ($orig_url && ($orig_url ne $url)) { + die "svn-remote.$self->{repo_id}.url already set: ", + "$orig_url\nwanted to set to: $url\n"; + } + } + my ($xrepo_id, $xpath) = find_ref($self->refname); + if (!$no_write && defined $xpath) { + die "svn-remote.$xrepo_id.fetch already set to track ", + "$xpath:", $self->refname, "\n"; + } + unless ($no_write) { + command_noisy('config', + "svn-remote.$self->{repo_id}.url", $url); + my $path = $self->path; + $path =~ s{^/}{}; + $path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg; + $self->path($path); + command_noisy('config', '--add', + "svn-remote.$self->{repo_id}.fetch", + $self->path.":".$self->refname); + } + $self->{url} = $url; +} + +sub find_by_url { # repos_root and, path are optional + my ($class, $full_url, $repos_root, $path) = @_; + + return undef unless defined $full_url; + remove_username($full_url); + remove_username($repos_root) if defined $repos_root; + my $remotes = read_all_remotes(); + if (defined $full_url && defined $repos_root && !defined $path) { + $path = $full_url; + $path =~ s#^\Q$repos_root\E(?:/|$)##; + } + foreach my $repo_id (keys %$remotes) { + my $u = $remotes->{$repo_id}->{url} or next; + remove_username($u); + next if defined $repos_root && $repos_root ne $u; + + my $fetch = $remotes->{$repo_id}->{fetch} || {}; + foreach my $t (qw/branches tags/) { + foreach my $globspec (@{$remotes->{$repo_id}->{$t}}) { + resolve_local_globs($u, $fetch, $globspec); + } + } + my $p = $path; + my $rwr = rewrite_root({repo_id => $repo_id}); + my $svm = $remotes->{$repo_id}->{svm} + if defined $remotes->{$repo_id}->{svm}; + unless (defined $p) { + $p = $full_url; + my $z = $u; + my $prefix = ''; + if ($rwr) { + $z = $rwr; + remove_username($z); + } elsif (defined $svm) { + $z = $svm->{source}; + $prefix = $svm->{replace}; + $prefix =~ s#^\Q$u\E(?:/|$)##; + $prefix =~ s#/$##; + } + $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next; + } + foreach my $f (keys %$fetch) { + next if $f ne $p; + return Git::SVN->new($fetch->{$f}, $repo_id, $f); + } + } + undef; +} + +sub init { + my ($class, $url, $path, $repo_id, $ref_id, $no_write) = @_; + my $self = _new($class, $repo_id, $ref_id, $path); + if (defined $url) { + $self->init_remote_config($url, $no_write); + } + $self; +} + +sub find_ref { + my ($ref_id) = @_; + foreach (command(qw/config -l/)) { + next unless m!^svn-remote\.(.+)\.fetch= + \s*(.*?)\s*:\s*(.+?)\s*$!x; + my ($repo_id, $path, $ref) = ($1, $2, $3); + if ($ref eq $ref_id) { + $path = '' if ($path =~ m#^\./?#); + return ($repo_id, $path); + } + } + (undef, undef, undef); +} + +sub new { + my ($class, $ref_id, $repo_id, $path) = @_; + if (defined $ref_id && !defined $repo_id && !defined $path) { + ($repo_id, $path) = find_ref($ref_id); + if (!defined $repo_id) { + die "Could not find a \"svn-remote.*.fetch\" key ", + "in the repository configuration matching: ", + "$ref_id\n"; + } + } + my $self = _new($class, $repo_id, $ref_id, $path); + if (!defined $self->path || !length $self->path) { + my $fetch = command_oneline('config', '--get', + "svn-remote.$repo_id.fetch", + ":$ref_id\$") or + die "Failed to read \"svn-remote.$repo_id.fetch\" ", + "\":$ref_id\$\" in config\n"; + my($path) = split(/\s*:\s*/, $fetch); + $self->path($path); + } + { + my $path = $self->path; + $path =~ s{/+}{/}g; + $path =~ s{\A/}{}; + $path =~ s{/\z}{}; + $self->path($path); + } + $self->{url} = command_oneline('config', '--get', + "svn-remote.$repo_id.url") or + die "Failed to read \"svn-remote.$repo_id.url\" in config\n"; + $self->{pushurl} = eval { command_oneline('config', '--get', + "svn-remote.$repo_id.pushurl") }; + $self->rebuild; + $self; +} + +sub refname { + my ($refname) = $_[0]->{ref_id} ; + + # It cannot end with a slash /, we'll throw up on this because + # SVN can't have directories with a slash in their name, either: + if ($refname =~ m{/$}) { + die "ref: '$refname' ends with a trailing slash, this is ", + "not permitted by git nor Subversion\n"; + } + + # It cannot have ASCII control character space, tilde ~, caret ^, + # colon :, question-mark ?, asterisk *, space, or open bracket [ + # anywhere. + # + # Additionally, % must be escaped because it is used for escaping + # and we want our escaped refname to be reversible + $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg; + + # no slash-separated component can begin with a dot . + # /.* becomes /%2E* + $refname =~ s{/\.}{/%2E}g; + + # It cannot have two consecutive dots .. anywhere + # .. becomes %2E%2E + $refname =~ s{\.\.}{%2E%2E}g; + + # trailing dots and .lock are not allowed + # .$ becomes %2E and .lock becomes %2Elock + $refname =~ s{\.(?=$|lock$)}{%2E}; + + # the sequence @{ is used to access the reflog + # @{ becomes %40{ + $refname =~ s{\@\{}{%40\{}g; + + return $refname; +} + +sub desanitize_refname { + my ($refname) = @_; + $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg; + return $refname; +} + +sub svm_uuid { + my ($self) = @_; + return $self->{svm}->{uuid} if $self->svm; + $self->ra; + unless ($self->{svm}) { + die "SVM UUID not cached, and reading remotely failed\n"; + } + $self->{svm}->{uuid}; +} + +sub svm { + my ($self) = @_; + return $self->{svm} if $self->{svm}; + my $svm; + # see if we have it in our config, first: + eval { + my $section = "svn-remote.$self->{repo_id}"; + $svm = { + source => tmp_config('--get', "$section.svm-source"), + uuid => tmp_config('--get', "$section.svm-uuid"), + replace => tmp_config('--get', "$section.svm-replace"), + } + }; + if ($svm && $svm->{source} && $svm->{uuid} && $svm->{replace}) { + $self->{svm} = $svm; + } + $self->{svm}; +} + +sub _set_svm_vars { + my ($self, $ra) = @_; + return $ra if $self->svm; + + my @err = ( "useSvmProps set, but failed to read SVM properties\n", + "(svm:source, svm:uuid) ", + "from the following URLs:\n" ); + sub read_svm_props { + my ($self, $ra, $path, $r) = @_; + my $props = ($ra->get_dir($path, $r))[2]; + my $src = $props->{'svm:source'}; + my $uuid = $props->{'svm:uuid'}; + return undef if (!$src || !$uuid); + + chomp($src, $uuid); + + $uuid =~ m{^[0-9a-f\-]{30,}$}i + or die "doesn't look right - svm:uuid is '$uuid'\n"; + + # the '!' is used to mark the repos_root!/relative/path + $src =~ s{/?!/?}{/}; + $src =~ s{/+$}{}; # no trailing slashes please + # username is of no interest + $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1}; + + my $replace = $ra->{url}; + $replace .= "/$path" if length $path; + + my $section = "svn-remote.$self->{repo_id}"; + tmp_config("$section.svm-source", $src); + tmp_config("$section.svm-replace", $replace); + tmp_config("$section.svm-uuid", $uuid); + $self->{svm} = { + source => $src, + uuid => $uuid, + replace => $replace + }; + } + + my $r = $ra->get_latest_revnum; + my $path = $self->path; + my %tried; + while (length $path) { + unless ($tried{"$self->{url}/$path"}) { + return $ra if $self->read_svm_props($ra, $path, $r); + $tried{"$self->{url}/$path"} = 1; + } + $path =~ s#/?[^/]+$##; + } + die "Path: '$path' should be ''\n" if $path ne ''; + return $ra if $self->read_svm_props($ra, $path, $r); + $tried{"$self->{url}/$path"} = 1; + + if ($ra->{repos_root} eq $self->{url}) { + die @err, (map { " $_\n" } keys %tried), "\n"; + } + + # nope, make sure we're connected to the repository root: + my $ok; + my @tried_b; + $path = $ra->{svn_path}; + $ra = Git::SVN::Ra->new($ra->{repos_root}); + while (length $path) { + unless ($tried{"$ra->{url}/$path"}) { + $ok = $self->read_svm_props($ra, $path, $r); + last if $ok; + $tried{"$ra->{url}/$path"} = 1; + } + $path =~ s#/?[^/]+$##; + } + die "Path: '$path' should be ''\n" if $path ne ''; + $ok ||= $self->read_svm_props($ra, $path, $r); + $tried{"$ra->{url}/$path"} = 1; + if (!$ok) { + die @err, (map { " $_\n" } keys %tried), "\n"; + } + Git::SVN::Ra->new($self->{url}); +} + +sub svnsync { + my ($self) = @_; + return $self->{svnsync} if $self->{svnsync}; + + if ($self->no_metadata) { + die "Can't have both 'noMetadata' and ", + "'useSvnsyncProps' options set!\n"; + } + if ($self->rewrite_root) { + die "Can't have both 'useSvnsyncProps' and 'rewriteRoot' ", + "options set!\n"; + } + if ($self->rewrite_uuid) { + die "Can't have both 'useSvnsyncProps' and 'rewriteUUID' ", + "options set!\n"; + } + + my $svnsync; + # see if we have it in our config, first: + eval { + my $section = "svn-remote.$self->{repo_id}"; + + my $url = tmp_config('--get', "$section.svnsync-url"); + ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or + die "doesn't look right - svn:sync-from-url is '$url'\n"; + + my $uuid = tmp_config('--get', "$section.svnsync-uuid"); + ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or + die "doesn't look right - svn:sync-from-uuid is '$uuid'\n"; + + $svnsync = { url => $url, uuid => $uuid } + }; + if ($svnsync && $svnsync->{url} && $svnsync->{uuid}) { + return $self->{svnsync} = $svnsync; + } + + my $err = "useSvnsyncProps set, but failed to read " . + "svnsync property: svn:sync-from-"; + my $rp = $self->ra->rev_proplist(0); + + my $url = $rp->{'svn:sync-from-url'} or die $err . "url\n"; + ($url) = ($url =~ m{^([a-z\+]+://\S+)$}) or + die "doesn't look right - svn:sync-from-url is '$url'\n"; + + my $uuid = $rp->{'svn:sync-from-uuid'} or die $err . "uuid\n"; + ($uuid) = ($uuid =~ m{^([0-9a-f\-]{30,})$}i) or + die "doesn't look right - svn:sync-from-uuid is '$uuid'\n"; + + my $section = "svn-remote.$self->{repo_id}"; + tmp_config('--add', "$section.svnsync-uuid", $uuid); + tmp_config('--add', "$section.svnsync-url", $url); + return $self->{svnsync} = { url => $url, uuid => $uuid }; +} + +# this allows us to memoize our SVN::Ra UUID locally and avoid a +# remote lookup (useful for 'git svn log'). +sub ra_uuid { + my ($self) = @_; + unless ($self->{ra_uuid}) { + my $key = "svn-remote.$self->{repo_id}.uuid"; + my $uuid = eval { tmp_config('--get', $key) }; + if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) { + $self->{ra_uuid} = $uuid; + } else { + die "ra_uuid called without URL\n" unless $self->{url}; + $self->{ra_uuid} = $self->ra->get_uuid; + tmp_config('--add', $key, $self->{ra_uuid}); + } + } + $self->{ra_uuid}; +} + +sub _set_repos_root { + my ($self, $repos_root) = @_; + my $k = "svn-remote.$self->{repo_id}.reposRoot"; + $repos_root ||= $self->ra->{repos_root}; + tmp_config($k, $repos_root); + $repos_root; +} + +sub repos_root { + my ($self) = @_; + my $k = "svn-remote.$self->{repo_id}.reposRoot"; + eval { tmp_config('--get', $k) } || $self->_set_repos_root; +} + +sub ra { + my ($self) = shift; + my $ra = Git::SVN::Ra->new($self->{url}); + $self->_set_repos_root($ra->{repos_root}); + if ($self->use_svm_props && !$self->{svm}) { + if ($self->no_metadata) { + die "Can't have both 'noMetadata' and ", + "'useSvmProps' options set!\n"; + } elsif ($self->use_svnsync_props) { + die "Can't have both 'useSvnsyncProps' and ", + "'useSvmProps' options set!\n"; + } + $ra = $self->_set_svm_vars($ra); + $self->{-want_revprops} = 1; + } + $ra; +} + +# prop_walk(PATH, REV, SUB) +# ------------------------- +# Recursively traverse PATH at revision REV and invoke SUB for each +# directory that contains a SVN property. SUB will be invoked as +# follows: &SUB(gs, path, props); where `gs' is this instance of +# Git::SVN, `path' the path to the directory where the properties +# `props' were found. The `path' will be relative to point of checkout, +# that is, if url://repo/trunk is the current Git branch, and that +# directory contains a sub-directory `d', SUB will be invoked with `/d/' +# as `path' (note the trailing `/'). +sub prop_walk { + my ($self, $path, $rev, $sub) = @_; + + $path =~ s#^/##; + my ($dirent, undef, $props) = $self->ra->get_dir($path, $rev); + $path =~ s#^/*#/#g; + my $p = $path; + # Strip the irrelevant part of the path. + $p =~ s#^/+\Q@{[$self->path]}\E(/|$)#/#; + # Ensure the path is terminated by a `/'. + $p =~ s#/*$#/#; + + # The properties contain all the internal SVN stuff nobody + # (usually) cares about. + my $interesting_props = 0; + foreach (keys %{$props}) { + # If it doesn't start with `svn:', it must be a + # user-defined property. + ++$interesting_props and next if $_ !~ /^svn:/; + # FIXME: Fragile, if SVN adds new public properties, + # this needs to be updated. + ++$interesting_props if /^svn:(?:ignore|keywords|executable + |eol-style|mime-type + |externals|needs-lock)$/x; + } + &$sub($self, $p, $props) if $interesting_props; + + foreach (sort keys %$dirent) { + next if $dirent->{$_}->{kind} != $SVN::Node::dir; + $self->prop_walk($self->path . $p . $_, $rev, $sub); + } +} + +sub last_rev { ($_[0]->last_rev_commit)[0] } +sub last_commit { ($_[0]->last_rev_commit)[1] } + +# returns the newest SVN revision number and newest commit SHA1 +sub last_rev_commit { + my ($self) = @_; + if (defined $self->{last_rev} && defined $self->{last_commit}) { + return ($self->{last_rev}, $self->{last_commit}); + } + my $c = ::verify_ref($self->refname.'^0'); + if ($c && !$self->use_svm_props && !$self->no_metadata) { + my $rev = (::cmt_metadata($c))[1]; + if (defined $rev) { + ($self->{last_rev}, $self->{last_commit}) = ($rev, $c); + return ($rev, $c); + } + } + my $map_path = $self->map_path; + unless (-e $map_path) { + ($self->{last_rev}, $self->{last_commit}) = (undef, undef); + return (undef, undef); + } + my ($rev, $commit) = $self->rev_map_max(1); + ($self->{last_rev}, $self->{last_commit}) = ($rev, $commit); + return ($rev, $commit); +} + +sub get_fetch_range { + my ($self, $min, $max) = @_; + $max ||= $self->ra->get_latest_revnum; + $min ||= $self->rev_map_max; + (++$min, $max); +} + +sub tmp_config { + my (@args) = @_; + my $old_def_config = "$ENV{GIT_DIR}/svn/config"; + my $config = "$ENV{GIT_DIR}/svn/.metadata"; + if (! -f $config && -f $old_def_config) { + rename $old_def_config, $config or + die "Failed rename $old_def_config => $config: $!\n"; + } + my $old_config = $ENV{GIT_CONFIG}; + $ENV{GIT_CONFIG} = $config; + $@ = undef; + my @ret = eval { + unless (-f $config) { + mkfile($config); + open my $fh, '>', $config or + die "Can't open $config: $!\n"; + print $fh "; This file is used internally by ", + "git-svn\n" or die + "Couldn't write to $config: $!\n"; + print $fh "; You should not have to edit it\n" or + die "Couldn't write to $config: $!\n"; + close $fh or die "Couldn't close $config: $!\n"; + } + command('config', @args); + }; + my $err = $@; + if (defined $old_config) { + $ENV{GIT_CONFIG} = $old_config; + } else { + delete $ENV{GIT_CONFIG}; + } + die $err if $err; + wantarray ? @ret : $ret[0]; +} + +sub tmp_index_do { + my ($self, $sub) = @_; + my $old_index = $ENV{GIT_INDEX_FILE}; + $ENV{GIT_INDEX_FILE} = $self->{index}; + $@ = undef; + my @ret = eval { + my ($dir, $base) = ($self->{index} =~ m#^(.*?)/?([^/]+)$#); + mkpath([$dir]) unless -d $dir; + &$sub; + }; + my $err = $@; + if (defined $old_index) { + $ENV{GIT_INDEX_FILE} = $old_index; + } else { + delete $ENV{GIT_INDEX_FILE}; + } + die $err if $err; + wantarray ? @ret : $ret[0]; +} + +sub assert_index_clean { + my ($self, $treeish) = @_; + + $self->tmp_index_do(sub { + command_noisy('read-tree', $treeish) unless -e $self->{index}; + my $x = command_oneline('write-tree'); + my ($y) = (command(qw/cat-file commit/, $treeish) =~ + /^tree ($::sha1)/mo); + return if $y eq $x; + + warn "Index mismatch: $y != $x\nrereading $treeish\n"; + unlink $self->{index} or die "unlink $self->{index}: $!\n"; + command_noisy('read-tree', $treeish); + $x = command_oneline('write-tree'); + if ($y ne $x) { + ::fatal "trees ($treeish) $y != $x\n", + "Something is seriously wrong..."; + } + }); +} + +sub get_commit_parents { + my ($self, $log_entry) = @_; + my (%seen, @ret, @tmp); + # legacy support for 'set-tree'; this is only used by set_tree_cb: + if (my $ip = $self->{inject_parents}) { + if (my $commit = delete $ip->{$log_entry->{revision}}) { + push @tmp, $commit; + } + } + if (my $cur = ::verify_ref($self->refname.'^0')) { + push @tmp, $cur; + } + if (my $ipd = $self->{inject_parents_dcommit}) { + if (my $commit = delete $ipd->{$log_entry->{revision}}) { + push @tmp, @$commit; + } + } + push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp); + while (my $p = shift @tmp) { + next if $seen{$p}; + $seen{$p} = 1; + push @ret, $p; + } + @ret; +} + +sub rewrite_root { + my ($self) = @_; + return $self->{-rewrite_root} if exists $self->{-rewrite_root}; + my $k = "svn-remote.$self->{repo_id}.rewriteRoot"; + my $rwr = eval { command_oneline(qw/config --get/, $k) }; + if ($rwr) { + $rwr =~ s#/+$##; + if ($rwr !~ m#^[a-z\+]+://#) { + die "$rwr is not a valid URL (key: $k)\n"; + } + } + $self->{-rewrite_root} = $rwr; +} + +sub rewrite_uuid { + my ($self) = @_; + return $self->{-rewrite_uuid} if exists $self->{-rewrite_uuid}; + my $k = "svn-remote.$self->{repo_id}.rewriteUUID"; + my $rwid = eval { command_oneline(qw/config --get/, $k) }; + if ($rwid) { + $rwid =~ s#/+$##; + if ($rwid !~ m#^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$#) { + die "$rwid is not a valid UUID (key: $k)\n"; + } + } + $self->{-rewrite_uuid} = $rwid; +} + +sub metadata_url { + my ($self) = @_; + ($self->rewrite_root || $self->{url}) . + (length $self->path ? '/' . $self->path : ''); +} + +sub full_url { + my ($self) = @_; + $self->{url} . (length $self->path ? '/' . $self->path : ''); +} + +sub full_pushurl { + my ($self) = @_; + if ($self->{pushurl}) { + return $self->{pushurl} . (length $self->path ? '/' . + $self->path : ''); + } else { + return $self->full_url; + } +} + +sub set_commit_header_env { + my ($log_entry) = @_; + my %env; + foreach my $ned (qw/NAME EMAIL DATE/) { + foreach my $ac (qw/AUTHOR COMMITTER/) { + $env{"GIT_${ac}_${ned}"} = $ENV{"GIT_${ac}_${ned}"}; + } + } + + $ENV{GIT_AUTHOR_NAME} = $log_entry->{name}; + $ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email}; + $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date}; + + $ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name}) + ? $log_entry->{commit_name} + : $log_entry->{name}; + $ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email}) + ? $log_entry->{commit_email} + : $log_entry->{email}; + \%env; +} + +sub restore_commit_header_env { + my ($env) = @_; + foreach my $ned (qw/NAME EMAIL DATE/) { + foreach my $ac (qw/AUTHOR COMMITTER/) { + my $k = "GIT_${ac}_${ned}"; + if (defined $env->{$k}) { + $ENV{$k} = $env->{$k}; + } else { + delete $ENV{$k}; + } + } + } +} + +sub gc { + command_noisy('gc', '--auto'); +}; + +sub do_git_commit { + my ($self, $log_entry) = @_; + my $lr = $self->last_rev; + if (defined $lr && $lr >= $log_entry->{revision}) { + die "Last fetched revision of ", $self->refname, + " was r$lr, but we are about to fetch: ", + "r$log_entry->{revision}!\n"; + } + if (my $c = $self->rev_map_get($log_entry->{revision})) { + croak "$log_entry->{revision} = $c already exists! ", + "Why are we refetching it?\n"; + } + my $old_env = set_commit_header_env($log_entry); + my $tree = $log_entry->{tree}; + if (!defined $tree) { + $tree = $self->tmp_index_do(sub { + command_oneline('write-tree') }); + } + die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o; + + my @exec = ('git', 'commit-tree', $tree); + foreach ($self->get_commit_parents($log_entry)) { + push @exec, '-p', $_; + } + defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec)) + or croak $!; + binmode $msg_fh; + + # we always get UTF-8 from SVN, but we may want our commits in + # a different encoding. + if (my $enc = Git::config('i18n.commitencoding')) { + require Encode; + Encode::from_to($log_entry->{log}, 'UTF-8', $enc); + } + print $msg_fh $log_entry->{log} or croak $!; + restore_commit_header_env($old_env); + unless ($self->no_metadata) { + print $msg_fh "\ngit-svn-id: $log_entry->{metadata}\n" + or croak $!; + } + $msg_fh->flush == 0 or croak $!; + close $msg_fh or croak $!; + chomp(my $commit = do { local $/; <$out_fh> }); + close $out_fh or croak $!; + waitpid $pid, 0; + croak $? if $?; + if ($commit !~ /^$::sha1$/o) { + die "Failed to commit, invalid sha1: $commit\n"; + } + + $self->rev_map_set($log_entry->{revision}, $commit, 1); + + $self->{last_rev} = $log_entry->{revision}; + $self->{last_commit} = $commit; + print "r$log_entry->{revision}" unless $::_q > 1; + if (defined $log_entry->{svm_revision}) { + print " (\@$log_entry->{svm_revision})" unless $::_q > 1; + $self->rev_map_set($log_entry->{svm_revision}, $commit, + 0, $self->svm_uuid); + } + print " = $commit ($self->{ref_id})\n" unless $::_q > 1; + if (--$_gc_nr == 0) { + $_gc_nr = $_gc_period; + gc(); + } + return $commit; +} + +sub match_paths { + my ($self, $paths, $r) = @_; + return 1 if $self->path eq ''; + if (my $path = $paths->{"/".$self->path}) { + return ($path->{action} eq 'D') ? 0 : 1; + } + $self->{path_regex} ||= qr{^/\Q@{[$self->path]}\E/}; + if (grep /$self->{path_regex}/, keys %$paths) { + return 1; + } + my $c = ''; + foreach (split m#/#, $self->path) { + $c .= "/$_"; + next unless ($paths->{$c} && + ($paths->{$c}->{action} =~ /^[AR]$/)); + if ($self->ra->check_path($self->path, $r) == + $SVN::Node::dir) { + return 1; + } + } + return 0; +} + +sub find_parent_branch { + my ($self, $paths, $rev) = @_; + return undef unless $self->follow_parent; + unless (defined $paths) { + my $err_handler = $SVN::Error::handler; + $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs; + $self->ra->get_log([$self->path], $rev, $rev, 0, 1, 1, + sub { $paths = $_[0] }); + $SVN::Error::handler = $err_handler; + } + return undef unless defined $paths; + + # look for a parent from another branch: + my @b_path_components = split m#/#, $self->path; + my @a_path_components; + my $i; + while (@b_path_components) { + $i = $paths->{'/'.join('/', @b_path_components)}; + last if $i && defined $i->{copyfrom_path}; + unshift(@a_path_components, pop(@b_path_components)); + } + return undef unless defined $i && defined $i->{copyfrom_path}; + my $branch_from = $i->{copyfrom_path}; + if (@a_path_components) { + print STDERR "branch_from: $branch_from => "; + $branch_from .= '/'.join('/', @a_path_components); + print STDERR $branch_from, "\n"; + } + my $r = $i->{copyfrom_rev}; + my $repos_root = $self->ra->{repos_root}; + my $url = $self->ra->{url}; + my $new_url = $url . $branch_from; + print STDERR "Found possible branch point: ", + "$new_url => ", $self->full_url, ", $r\n" + unless $::_q > 1; + $branch_from =~ s#^/##; + my $gs = $self->other_gs($new_url, $url, + $branch_from, $r, $self->{ref_id}); + my ($r0, $parent) = $gs->find_rev_before($r, 1); + { + my ($base, $head); + if (!defined $r0 || !defined $parent) { + ($base, $head) = parse_revision_argument(0, $r); + } else { + if ($r0 < $r) { + $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1, + 0, 1, sub { $base = $_[1] - 1 }); + } + } + if (defined $base && $base <= $r) { + $gs->fetch($base, $r); + } + ($r0, $parent) = $gs->find_rev_before($r, 1); + } + if (defined $r0 && defined $parent) { + print STDERR "Found branch parent: ($self->{ref_id}) $parent\n" + unless $::_q > 1; + my $ed; + if ($self->ra->can_do_switch) { + $self->assert_index_clean($parent); + print STDERR "Following parent with do_switch\n" + unless $::_q > 1; + # do_switch works with svn/trunk >= r22312, but that + # is not included with SVN 1.4.3 (the latest version + # at the moment), so we can't rely on it + $self->{last_rev} = $r0; + $self->{last_commit} = $parent; + $ed = SVN::Git::Fetcher->new($self, $gs->{path}); + $gs->ra->gs_do_switch($r0, $rev, $gs, + $self->full_url, $ed) + or die "SVN connection failed somewhere...\n"; + } elsif ($self->ra->trees_match($new_url, $r0, + $self->full_url, $rev)) { + print STDERR "Trees match:\n", + " $new_url\@$r0\n", + " ${\$self->full_url}\@$rev\n", + "Following parent with no changes\n" + unless $::_q > 1; + $self->tmp_index_do(sub { + command_noisy('read-tree', $parent); + }); + $self->{last_commit} = $parent; + } else { + print STDERR "Following parent with do_update\n" + unless $::_q > 1; + $ed = SVN::Git::Fetcher->new($self); + $self->ra->gs_do_update($rev, $rev, $self, $ed) + or die "SVN connection failed somewhere...\n"; + } + print STDERR "Successfully followed parent\n" unless $::_q > 1; + return $self->make_log_entry($rev, [$parent], $ed); + } + return undef; +} + +sub do_fetch { + my ($self, $paths, $rev) = @_; + my $ed; + my ($last_rev, @parents); + if (my $lc = $self->last_commit) { + # we can have a branch that was deleted, then re-added + # under the same name but copied from another path, in + # which case we'll have multiple parents (we don't + # want to break the original ref, nor lose copypath info): + if (my $log_entry = $self->find_parent_branch($paths, $rev)) { + push @{$log_entry->{parents}}, $lc; + return $log_entry; + } + $ed = SVN::Git::Fetcher->new($self); + $last_rev = $self->{last_rev}; + $ed->{c} = $lc; + @parents = ($lc); + } else { + $last_rev = $rev; + if (my $log_entry = $self->find_parent_branch($paths, $rev)) { + return $log_entry; + } + $ed = SVN::Git::Fetcher->new($self); + } + unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) { + die "SVN connection failed somewhere...\n"; + } + $self->make_log_entry($rev, \@parents, $ed); +} + +sub mkemptydirs { + my ($self, $r) = @_; + + sub scan { + my ($r, $empty_dirs, $line) = @_; + if (defined $r && $line =~ /^r(\d+)$/) { + return 0 if $1 > $r; + } elsif ($line =~ /^ \+empty_dir: (.+)$/) { + $empty_dirs->{$1} = 1; + } elsif ($line =~ /^ \-empty_dir: (.+)$/) { + my @d = grep {m[^\Q$1\E(/|$)]} (keys %$empty_dirs); + delete @$empty_dirs{@d}; + } + 1; # continue + }; + + my %empty_dirs = (); + my $gz_file = "$self->{dir}/unhandled.log.gz"; + if (-f $gz_file) { + if (!$can_compress) { + warn "Compress::Zlib could not be found; ", + "empty directories in $gz_file will not be read\n"; + } else { + my $gz = Compress::Zlib::gzopen($gz_file, "rb") or + die "Unable to open $gz_file: $!\n"; + my $line; + while ($gz->gzreadline($line) > 0) { + scan($r, \%empty_dirs, $line) or last; + } + $gz->gzclose; + } + } + + if (open my $fh, '<', "$self->{dir}/unhandled.log") { + binmode $fh or croak "binmode: $!"; + while (<$fh>) { + scan($r, \%empty_dirs, $_) or last; + } + close $fh; + } + + my $strip = qr/\A\Q@{[$self->path]}\E(?:\/|$)/; + foreach my $d (sort keys %empty_dirs) { + $d = uri_decode($d); + $d =~ s/$strip//; + next unless length($d); + next if -d $d; + if (-e $d) { + warn "$d exists but is not a directory\n"; + } else { + print "creating empty directory: $d\n"; + mkpath([$d]); + } + } +} + +sub get_untracked { + my ($self, $ed) = @_; + my @out; + my $h = $ed->{empty}; + foreach (sort keys %$h) { + my $act = $h->{$_} ? '+empty_dir' : '-empty_dir'; + push @out, " $act: " . uri_encode($_); + warn "W: $act: $_\n"; + } + foreach my $t (qw/dir_prop file_prop/) { + $h = $ed->{$t} or next; + foreach my $path (sort keys %$h) { + my $ppath = $path eq '' ? '.' : $path; + foreach my $prop (sort keys %{$h->{$path}}) { + next if $SKIP_PROP{$prop}; + my $v = $h->{$path}->{$prop}; + my $t_ppath_prop = "$t: " . + uri_encode($ppath) . ' ' . + uri_encode($prop); + if (defined $v) { + push @out, " +$t_ppath_prop " . + uri_encode($v); + } else { + push @out, " -$t_ppath_prop"; + } + } + } + } + foreach my $t (qw/absent_file absent_directory/) { + $h = $ed->{$t} or next; + foreach my $parent (sort keys %$h) { + foreach my $path (sort @{$h->{$parent}}) { + push @out, " $t: " . + uri_encode("$parent/$path"); + warn "W: $t: $parent/$path ", + "Insufficient permissions?\n"; + } + } + } + \@out; +} + +sub get_tz { + # some systmes don't handle or mishandle %z, so be creative. + my $t = shift || time; + my $gm = timelocal(gmtime($t)); + my $sign = qw( + + - )[ $t <=> $gm ]; + return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]); +} + +# parse_svn_date(DATE) +# -------------------- +# Given a date (in UTC) from Subversion, return a string in the format +# " " that Git will use. +# +# By default the parsed date will be in UTC; if $Git::SVN::_localtime +# is true we'll convert it to the local timezone instead. +sub parse_svn_date { + my $date = shift || return '+0000 1970-01-01 00:00:00'; + my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T + (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or + croak "Unable to parse date: $date\n"; + my $parsed_date; # Set next. + + if ($Git::SVN::_localtime) { + # Translate the Subversion datetime to an epoch time. + # Begin by switching ourselves to $date's timezone, UTC. + my $old_env_TZ = $ENV{TZ}; + $ENV{TZ} = 'UTC'; + + my $epoch_in_UTC = + POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900); + + # Determine our local timezone (including DST) at the + # time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the + # value of TZ, if any, at the time we were run. + if (defined $Git::SVN::Log::TZ) { + $ENV{TZ} = $Git::SVN::Log::TZ; + } else { + delete $ENV{TZ}; + } + + my $our_TZ = get_tz(); + + # This converts $epoch_in_UTC into our local timezone. + my ($sec, $min, $hour, $mday, $mon, $year, + $wday, $yday, $isdst) = localtime($epoch_in_UTC); + + $parsed_date = sprintf('%s %04d-%02d-%02d %02d:%02d:%02d', + $our_TZ, $year + 1900, $mon + 1, + $mday, $hour, $min, $sec); + + # Reset us to the timezone in effect when we entered + # this routine. + if (defined $old_env_TZ) { + $ENV{TZ} = $old_env_TZ; + } else { + delete $ENV{TZ}; + } + } else { + $parsed_date = "+0000 $Y-$m-$d $H:$M:$S"; + } + + return $parsed_date; +} + +sub other_gs { + my ($self, $new_url, $url, + $branch_from, $r, $old_ref_id) = @_; + my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from); + unless ($gs) { + my $ref_id = $old_ref_id; + $ref_id =~ s/\@\d+-*$//; + $ref_id .= "\@$r"; + # just grow a tail if we're not unique enough :x + $ref_id .= '-' while find_ref($ref_id); + my ($u, $p, $repo_id) = ($new_url, '', $ref_id); + if ($u =~ s#^\Q$url\E(/|$)##) { + $p = $u; + $u = $url; + $repo_id = $self->{repo_id}; + } + while (1) { + # It is possible to tag two different subdirectories at + # the same revision. If the url for an existing ref + # does not match, we must either find a ref with a + # matching url or create a new ref by growing a tail. + $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1); + my (undef, $max_commit) = $gs->rev_map_max(1); + last if (!$max_commit); + my ($url) = ::cmt_metadata($max_commit); + last if ($url eq $gs->metadata_url); + $ref_id .= '-'; + } + print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1; + } + $gs +} + +sub call_authors_prog { + my ($orig_author) = @_; + $orig_author = command_oneline('rev-parse', '--sq-quote', $orig_author); + my $author = `$::_authors_prog $orig_author`; + if ($? != 0) { + die "$::_authors_prog failed with exit code $?\n" + } + if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) { + my ($name, $email) = ($1, $2); + $email = undef if length $2 == 0; + return [$name, $email]; + } else { + die "Author: $orig_author: $::_authors_prog returned " + . "invalid author format: $author\n"; + } +} + +sub check_author { + my ($author) = @_; + if (!defined $author || length $author == 0) { + $author = '(no author)'; + } + if (!defined $::users{$author}) { + if (defined $::_authors_prog) { + $::users{$author} = call_authors_prog($author); + } elsif (defined $::_authors) { + die "Author: $author not defined in $::_authors file\n"; + } + } + $author; +} + +sub find_extra_svk_parents { + my ($self, $ed, $tickets, $parents) = @_; + # aha! svk:merge property changed... + my @tickets = split "\n", $tickets; + my @known_parents; + for my $ticket ( @tickets ) { + my ($uuid, $path, $rev) = split /:/, $ticket; + if ( $uuid eq $self->ra_uuid ) { + my $url = $self->{url}; + my $repos_root = $url; + my $branch_from = $path; + $branch_from =~ s{^/}{}; + my $gs = $self->other_gs($repos_root."/".$branch_from, + $url, + $branch_from, + $rev, + $self->{ref_id}); + if ( my $commit = $gs->rev_map_get($rev, $uuid) ) { + # wahey! we found it, but it might be + # an old one (!) + push @known_parents, [ $rev, $commit ]; + } + } + } + # Ordering matters; highest-numbered commit merge tickets + # first, as they may account for later merge ticket additions + # or changes. + @known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents; + for my $parent ( @known_parents ) { + my @cmd = ('rev-list', $parent, map { "^$_" } @$parents ); + my ($msg_fh, $ctx) = command_output_pipe(@cmd); + my $new; + while ( <$msg_fh> ) { + $new=1;last; + } + command_close_pipe($msg_fh, $ctx); + if ( $new ) { + print STDERR + "Found merge parent (svk:merge ticket): $parent\n"; + push @$parents, $parent; + } + } +} + +sub lookup_svn_merge { + my $uuid = shift; + my $url = shift; + my $merge = shift; + + my ($source, $revs) = split ":", $merge; + my $path = $source; + $path =~ s{^/}{}; + my $gs = Git::SVN->find_by_url($url.$source, $url, $path); + if ( !$gs ) { + warn "Couldn't find revmap for $url$source\n"; + return; + } + my @ranges = split ",", $revs; + my ($tip, $tip_commit); + my @merged_commit_ranges; + # find the tip + for my $range ( @ranges ) { + my ($bottom, $top) = split "-", $range; + $top ||= $bottom; + my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top ); + my $top_commit = $gs->find_rev_before( $top, 1, $bottom ); + + unless ($top_commit and $bottom_commit) { + warn "W:unknown path/rev in svn:mergeinfo " + ."dirprop: $source:$range\n"; + next; + } + + if (scalar(command('rev-parse', "$bottom_commit^@"))) { + push @merged_commit_ranges, + "$bottom_commit^..$top_commit"; + } else { + push @merged_commit_ranges, "$top_commit"; + } + + if ( !defined $tip or $top > $tip ) { + $tip = $top; + $tip_commit = $top_commit; + } + } + return ($tip_commit, @merged_commit_ranges); +} + +sub _rev_list { + my ($msg_fh, $ctx) = command_output_pipe( + "rev-list", @_, + ); + my @rv; + while ( <$msg_fh> ) { + chomp; + push @rv, $_; + } + command_close_pipe($msg_fh, $ctx); + @rv; +} + +sub check_cherry_pick { + my $base = shift; + my $tip = shift; + my $parents = shift; + my @ranges = @_; + my %commits = map { $_ => 1 } + _rev_list("--no-merges", $tip, "--not", $base, @$parents, "--"); + for my $range ( @ranges ) { + delete @commits{_rev_list($range, "--")}; + } + for my $commit (keys %commits) { + if (has_no_changes($commit)) { + delete $commits{$commit}; + } + } + return (keys %commits); +} + +sub has_no_changes { + my $commit = shift; + + my @revs = split / /, command_oneline( + qw(rev-list --parents -1 -m), $commit); + + # Commits with no parents, e.g. the start of a partial branch, + # have changes by definition. + return 1 if (@revs < 2); + + # Commits with multiple parents, e.g a merge, have no changes + # by definition. + return 0 if (@revs > 2); + + return (command_oneline("rev-parse", "$commit^{tree}") eq + command_oneline("rev-parse", "$commit~1^{tree}")); +} + +sub tie_for_persistent_memoization { + my $hash = shift; + my $path = shift; + + if ($can_use_yaml) { + tie %$hash => 'Git::SVN::Memoize::YAML', "$path.yaml"; + } else { + tie %$hash => 'Memoize::Storable', "$path.db", 'nstore'; + } +} + +# The GIT_DIR environment variable is not always set until after the command +# line arguments are processed, so we can't memoize in a BEGIN block. +{ + my $memoized = 0; + + sub memoize_svn_mergeinfo_functions { + return if $memoized; + $memoized = 1; + + my $cache_path = "$ENV{GIT_DIR}/svn/.caches/"; + mkpath([$cache_path]) unless -d $cache_path; + + my %lookup_svn_merge_cache; + my %check_cherry_pick_cache; + my %has_no_changes_cache; + + tie_for_persistent_memoization(\%lookup_svn_merge_cache, + "$cache_path/lookup_svn_merge"); + memoize 'lookup_svn_merge', + SCALAR_CACHE => 'FAULT', + LIST_CACHE => ['HASH' => \%lookup_svn_merge_cache], + ; + + tie_for_persistent_memoization(\%check_cherry_pick_cache, + "$cache_path/check_cherry_pick"); + memoize 'check_cherry_pick', + SCALAR_CACHE => 'FAULT', + LIST_CACHE => ['HASH' => \%check_cherry_pick_cache], + ; + + tie_for_persistent_memoization(\%has_no_changes_cache, + "$cache_path/has_no_changes"); + memoize 'has_no_changes', + SCALAR_CACHE => ['HASH' => \%has_no_changes_cache], + LIST_CACHE => 'FAULT', + ; + } + + sub unmemoize_svn_mergeinfo_functions { + return if not $memoized; + $memoized = 0; + + Memoize::unmemoize 'lookup_svn_merge'; + Memoize::unmemoize 'check_cherry_pick'; + Memoize::unmemoize 'has_no_changes'; + } + + Memoize::memoize 'Git::SVN::repos_root'; +} + +END { + # Force cache writeout explicitly instead of waiting for + # global destruction to avoid segfault in Storable: + # http://rt.cpan.org/Public/Bug/Display.html?id=36087 + unmemoize_svn_mergeinfo_functions(); +} + +sub parents_exclude { + my $parents = shift; + my @commits = @_; + return unless @commits; + + my @excluded; + my $excluded; + do { + my @cmd = ('rev-list', "-1", @commits, "--not", @$parents ); + $excluded = command_oneline(@cmd); + if ( $excluded ) { + my @new; + my $found; + for my $commit ( @commits ) { + if ( $commit eq $excluded ) { + push @excluded, $commit; + $found++; + last; + } + else { + push @new, $commit; + } + } + die "saw commit '$excluded' in rev-list output, " + ."but we didn't ask for that commit (wanted: @commits --not @$parents)" + unless $found; + @commits = @new; + } + } + while ($excluded and @commits); + + return @excluded; +} + + +# note: this function should only be called if the various dirprops +# have actually changed +sub find_extra_svn_parents { + my ($self, $ed, $mergeinfo, $parents) = @_; + # aha! svk:merge property changed... + + memoize_svn_mergeinfo_functions(); + + # We first search for merged tips which are not in our + # history. Then, we figure out which git revisions are in + # that tip, but not this revision. If all of those revisions + # are now marked as merge, we can add the tip as a parent. + my @merges = split "\n", $mergeinfo; + my @merge_tips; + my $url = $self->{url}; + my $uuid = $self->ra_uuid; + my %ranges; + for my $merge ( @merges ) { + my ($tip_commit, @ranges) = + lookup_svn_merge( $uuid, $url, $merge ); + unless (!$tip_commit or + grep { $_ eq $tip_commit } @$parents ) { + push @merge_tips, $tip_commit; + $ranges{$tip_commit} = \@ranges; + } else { + push @merge_tips, undef; + } + } + + my %excluded = map { $_ => 1 } + parents_exclude($parents, grep { defined } @merge_tips); + + # check merge tips for new parents + my @new_parents; + for my $merge_tip ( @merge_tips ) { + my $spec = shift @merges; + next unless $merge_tip and $excluded{$merge_tip}; + + my $ranges = $ranges{$merge_tip}; + + # check out 'new' tips + my $merge_base; + eval { + $merge_base = command_oneline( + "merge-base", + @$parents, $merge_tip, + ); + }; + if ($@) { + die "An error occurred during merge-base" + unless $@->isa("Git::Error::Command"); + + warn "W: Cannot find common ancestor between ". + "@$parents and $merge_tip. Ignoring merge info.\n"; + next; + } + + # double check that there are no missing non-merge commits + my (@incomplete) = check_cherry_pick( + $merge_base, $merge_tip, + $parents, + @$ranges, + ); + + if ( @incomplete ) { + warn "W:svn cherry-pick ignored ($spec) - missing " + .@incomplete." commit(s) (eg $incomplete[0])\n"; + } else { + warn + "Found merge parent (svn:mergeinfo prop): ", + $merge_tip, "\n"; + push @new_parents, $merge_tip; + } + } + + # cater for merges which merge commits from multiple branches + if ( @new_parents > 1 ) { + for ( my $i = 0; $i <= $#new_parents; $i++ ) { + for ( my $j = 0; $j <= $#new_parents; $j++ ) { + next if $i == $j; + next unless $new_parents[$i]; + next unless $new_parents[$j]; + my $revs = command_oneline( + "rev-list", "-1", + "$new_parents[$i]..$new_parents[$j]", + ); + if ( !$revs ) { + undef($new_parents[$j]); + } + } + } + } + push @$parents, grep { defined } @new_parents; +} + +sub make_log_entry { + my ($self, $rev, $parents, $ed) = @_; + my $untracked = $self->get_untracked($ed); + + my @parents = @$parents; + my $ps = $ed->{path_strip} || ""; + for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) { + my $props = $ed->{dir_prop}{$path}; + if ( $props->{"svk:merge"} ) { + $self->find_extra_svk_parents + ($ed, $props->{"svk:merge"}, \@parents); + } + if ( $props->{"svn:mergeinfo"} ) { + $self->find_extra_svn_parents + ($ed, + $props->{"svn:mergeinfo"}, + \@parents); + } + } + + open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!; + print $un "r$rev\n" or croak $!; + print $un $_, "\n" foreach @$untracked; + my %log_entry = ( parents => \@parents, revision => $rev, + log => ''); + + my $headrev; + my $logged = delete $self->{logged_rev_props}; + if (!$logged || $self->{-want_revprops}) { + my $rp = $self->ra->rev_proplist($rev); + foreach (sort keys %$rp) { + my $v = $rp->{$_}; + if (/^svn:(author|date|log)$/) { + $log_entry{$1} = $v; + } elsif ($_ eq 'svm:headrev') { + $headrev = $v; + } else { + print $un " rev_prop: ", uri_encode($_), ' ', + uri_encode($v), "\n"; + } + } + } else { + map { $log_entry{$_} = $logged->{$_} } keys %$logged; + } + close $un or croak $!; + + $log_entry{date} = parse_svn_date($log_entry{date}); + $log_entry{log} .= "\n"; + my $author = $log_entry{author} = check_author($log_entry{author}); + my ($name, $email) = defined $::users{$author} ? @{$::users{$author}} + : ($author, undef); + + my ($commit_name, $commit_email) = ($name, $email); + if ($_use_log_author) { + my $name_field; + if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) { + $name_field = $1; + } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) { + $name_field = $1; + } + if (!defined $name_field) { + if (!defined $email) { + $email = $name; + } + } elsif ($name_field =~ /(.*?)\s+<(.*)>/) { + ($name, $email) = ($1, $2); + } elsif ($name_field =~ /(.*)@/) { + ($name, $email) = ($1, $name_field); + } else { + ($name, $email) = ($name_field, $name_field); + } + } + if (defined $headrev && $self->use_svm_props) { + if ($self->rewrite_root) { + die "Can't have both 'useSvmProps' and 'rewriteRoot' ", + "options set!\n"; + } + if ($self->rewrite_uuid) { + die "Can't have both 'useSvmProps' and 'rewriteUUID' ", + "options set!\n"; + } + my ($uuid, $r) = $headrev =~ m{^([a-f\d\-]{30,}):(\d+)$}i; + # we don't want "SVM: initializing mirror for junk" ... + return undef if $r == 0; + my $svm = $self->svm; + if ($uuid ne $svm->{uuid}) { + die "UUID mismatch on SVM path:\n", + "expected: $svm->{uuid}\n", + " got: $uuid\n"; + } + my $full_url = $self->full_url; + $full_url =~ s#^\Q$svm->{replace}\E(/|$)#$svm->{source}$1# or + die "Failed to replace '$svm->{replace}' with ", + "'$svm->{source}' in $full_url\n"; + # throw away username for storing in records + remove_username($full_url); + $log_entry{metadata} = "$full_url\@$r $uuid"; + $log_entry{svm_revision} = $r; + $email ||= "$author\@$uuid"; + $commit_email ||= "$author\@$uuid"; + } elsif ($self->use_svnsync_props) { + my $full_url = $self->svnsync->{url}; + $full_url .= "/".$self->path if length $self->path; + remove_username($full_url); + my $uuid = $self->svnsync->{uuid}; + $log_entry{metadata} = "$full_url\@$rev $uuid"; + $email ||= "$author\@$uuid"; + $commit_email ||= "$author\@$uuid"; + } else { + my $url = $self->metadata_url; + remove_username($url); + my $uuid = $self->rewrite_uuid || $self->ra->get_uuid; + $log_entry{metadata} = "$url\@$rev " . $uuid; + $email ||= "$author\@" . $uuid; + $commit_email ||= "$author\@" . $uuid; + } + $log_entry{name} = $name; + $log_entry{email} = $email; + $log_entry{commit_name} = $commit_name; + $log_entry{commit_email} = $commit_email; + \%log_entry; +} + +sub fetch { + my ($self, $min_rev, $max_rev, @parents) = @_; + my ($last_rev, $last_commit) = $self->last_rev_commit; + my ($base, $head) = $self->get_fetch_range($min_rev, $max_rev); + $self->ra->gs_fetch_loop_common($base, $head, [$self]); +} + +sub set_tree_cb { + my ($self, $log_entry, $tree, $rev, $date, $author) = @_; + $self->{inject_parents} = { $rev => $tree }; + $self->fetch(undef, undef); +} + +sub set_tree { + my ($self, $tree) = (shift, shift); + my $log_entry = ::get_commit_entry($tree); + unless ($self->{last_rev}) { + ::fatal("Must have an existing revision to commit"); + } + my %ed_opts = ( r => $self->{last_rev}, + log => $log_entry->{log}, + ra => $self->ra, + tree_a => $self->{last_commit}, + tree_b => $tree, + editor_cb => sub { + $self->set_tree_cb($log_entry, $tree, @_) }, + svn_path => $self->path ); + if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) { + print "No changes\nr$self->{last_rev} = $tree\n"; + } +} + +sub rebuild_from_rev_db { + my ($self, $path) = @_; + my $r = -1; + open my $fh, '<', $path or croak "open: $!"; + binmode $fh or croak "binmode: $!"; + while (<$fh>) { + length($_) == 41 or croak "inconsistent size in ($_) != 41"; + chomp($_); + ++$r; + next if $_ eq ('0' x 40); + $self->rev_map_set($r, $_); + print "r$r = $_\n"; + } + close $fh or croak "close: $!"; + unlink $path or croak "unlink: $!"; +} + +sub rebuild { + my ($self) = @_; + my $map_path = $self->map_path; + my $partial = (-e $map_path && ! -z $map_path); + return unless ::verify_ref($self->refname.'^0'); + if (!$partial && ($self->use_svm_props || $self->no_metadata)) { + my $rev_db = $self->rev_db_path; + $self->rebuild_from_rev_db($rev_db); + if ($self->use_svm_props) { + my $svm_rev_db = $self->rev_db_path($self->svm_uuid); + $self->rebuild_from_rev_db($svm_rev_db); + } + $self->unlink_rev_db_symlink; + return; + } + print "Rebuilding $map_path ...\n" if (!$partial); + my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) : + (undef, undef)); + my ($log, $ctx) = + command_output_pipe(qw/rev-list --pretty=raw --reverse/, + ($head ? "$head.." : "") . $self->refname, + '--'); + my $metadata_url = $self->metadata_url; + remove_username($metadata_url); + my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid; + my $c; + while (<$log>) { + if ( m{^commit ($::sha1)$} ) { + $c = $1; + next; + } + next unless s{^\s*(git-svn-id:)}{$1}; + my ($url, $rev, $uuid) = ::extract_metadata($_); + remove_username($url); + + # ignore merges (from set-tree) + next if (!defined $rev || !$uuid); + + # if we merged or otherwise started elsewhere, this is + # how we break out of it + if (($uuid ne $svn_uuid) || + ($metadata_url && $url && ($url ne $metadata_url))) { + next; + } + if ($partial && $head) { + print "Partial-rebuilding $map_path ...\n"; + print "Currently at $base_rev = $head\n"; + $head = undef; + } + + $self->rev_map_set($rev, $c); + print "r$rev = $c\n"; + } + command_close_pipe($log, $ctx); + print "Done rebuilding $map_path\n" if (!$partial || !$head); + my $rev_db_path = $self->rev_db_path; + if (-f $self->rev_db_path) { + unlink $self->rev_db_path or croak "unlink: $!"; + } + $self->unlink_rev_db_symlink; +} + +# rev_map: +# Tie::File seems to be prone to offset errors if revisions get sparse, +# it's not that fast, either. Tie::File is also not in Perl 5.6. So +# one of my favorite modules is out :< Next up would be one of the DBM +# modules, but I'm not sure which is most portable... +# +# This is the replacement for the rev_db format, which was too big +# and inefficient for large repositories with a lot of sparse history +# (mainly tags) +# +# The format is this: +# - 24 bytes for every record, +# * 4 bytes for the integer representing an SVN revision number +# * 20 bytes representing the sha1 of a git commit +# - No empty padding records like the old format +# (except the last record, which can be overwritten) +# - new records are written append-only since SVN revision numbers +# increase monotonically +# - lookups on SVN revision number are done via a binary search +# - Piping the file to xxd -c24 is a good way of dumping it for +# viewing or editing (piped back through xxd -r), should the need +# ever arise. +# - The last record can be padding revision with an all-zero sha1 +# This is used to optimize fetch performance when using multiple +# "fetch" directives in .git/config +# +# These files are disposable unless noMetadata or useSvmProps is set + +sub _rev_map_set { + my ($fh, $rev, $commit) = @_; + + binmode $fh or croak "binmode: $!"; + my $size = (stat($fh))[7]; + ($size % 24) == 0 or croak "inconsistent size: $size"; + + my $wr_offset = 0; + if ($size > 0) { + sysseek($fh, -24, SEEK_END) or croak "seek: $!"; + my $read = sysread($fh, my $buf, 24) or croak "read: $!"; + $read == 24 or croak "read only $read bytes (!= 24)"; + my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf); + if ($last_commit eq ('0' x40)) { + if ($size >= 48) { + sysseek($fh, -48, SEEK_END) or croak "seek: $!"; + $read = sysread($fh, $buf, 24) or + croak "read: $!"; + $read == 24 or + croak "read only $read bytes (!= 24)"; + ($last_rev, $last_commit) = + unpack(rev_map_fmt, $buf); + if ($last_commit eq ('0' x40)) { + croak "inconsistent .rev_map\n"; + } + } + if ($last_rev >= $rev) { + croak "last_rev is higher!: $last_rev >= $rev"; + } + $wr_offset = -24; + } + } + sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!"; + syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or + croak "write: $!"; +} + +sub _rev_map_reset { + my ($fh, $rev, $commit) = @_; + my $c = _rev_map_get($fh, $rev); + $c eq $commit or die "_rev_map_reset(@_) commit $c does not match!\n"; + my $offset = sysseek($fh, 0, SEEK_CUR) or croak "seek: $!"; + truncate $fh, $offset or croak "truncate: $!"; +} + +sub mkfile { + my ($path) = @_; + unless (-e $path) { + my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#); + mkpath([$dir]) unless -d $dir; + open my $fh, '>>', $path or die "Couldn't create $path: $!\n"; + close $fh or die "Couldn't close (create) $path: $!\n"; + } +} + +sub rev_map_set { + my ($self, $rev, $commit, $update_ref, $uuid) = @_; + defined $commit or die "missing arg3\n"; + length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n"; + my $db = $self->map_path($uuid); + my $db_lock = "$db.lock"; + my $sig; + $update_ref ||= 0; + if ($update_ref) { + $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} = + $SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] }; + } + mkfile($db); + + $LOCKFILES{$db_lock} = 1; + my $sync; + # both of these options make our .rev_db file very, very important + # and we can't afford to lose it because rebuild() won't work + if ($self->use_svm_props || $self->no_metadata) { + $sync = 1; + copy($db, $db_lock) or die "rev_map_set(@_): ", + "Failed to copy: ", + "$db => $db_lock ($!)\n"; + } else { + rename $db, $db_lock or die "rev_map_set(@_): ", + "Failed to rename: ", + "$db => $db_lock ($!)\n"; + } + + sysopen(my $fh, $db_lock, O_RDWR | O_CREAT) + or croak "Couldn't open $db_lock: $!\n"; + $update_ref eq 'reset' ? _rev_map_reset($fh, $rev, $commit) : + _rev_map_set($fh, $rev, $commit); + if ($sync) { + $fh->flush or die "Couldn't flush $db_lock: $!\n"; + $fh->sync or die "Couldn't sync $db_lock: $!\n"; + } + close $fh or croak $!; + if ($update_ref) { + $_head = $self; + my $note = ""; + $note = " ($update_ref)" if ($update_ref !~ /^\d*$/); + command_noisy('update-ref', '-m', "r$rev$note", + $self->refname, $commit); + } + rename $db_lock, $db or die "rev_map_set(@_): ", "Failed to rename: ", + "$db_lock => $db ($!)\n"; + delete $LOCKFILES{$db_lock}; + if ($update_ref) { + $SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} = + $SIG{USR1} = $SIG{USR2} = 'DEFAULT'; + kill $sig, $$ if defined $sig; + } +} + +# If want_commit, this will return an array of (rev, commit) where +# commit _must_ be a valid commit in the archive. +# Otherwise, it'll return the max revision (whether or not the +# commit is valid or just a 0x40 placeholder). +sub rev_map_max { + my ($self, $want_commit) = @_; + $self->rebuild; + my ($r, $c) = $self->rev_map_max_norebuild($want_commit); + $want_commit ? ($r, $c) : $r; +} + +sub rev_map_max_norebuild { + my ($self, $want_commit) = @_; + my $map_path = $self->map_path; + stat $map_path or return $want_commit ? (0, undef) : 0; + sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!"; + binmode $fh or croak "binmode: $!"; + my $size = (stat($fh))[7]; + ($size % 24) == 0 or croak "inconsistent size: $size"; + + if ($size == 0) { + close $fh or croak "close: $!"; + return $want_commit ? (0, undef) : 0; + } + + sysseek($fh, -24, SEEK_END) or croak "seek: $!"; + sysread($fh, my $buf, 24) == 24 or croak "read: $!"; + my ($r, $c) = unpack(rev_map_fmt, $buf); + if ($want_commit && $c eq ('0' x40)) { + if ($size < 48) { + return $want_commit ? (0, undef) : 0; + } + sysseek($fh, -48, SEEK_END) or croak "seek: $!"; + sysread($fh, $buf, 24) == 24 or croak "read: $!"; + ($r, $c) = unpack(rev_map_fmt, $buf); + if ($c eq ('0'x40)) { + croak "Penultimate record is all-zeroes in $map_path"; + } + } + close $fh or croak "close: $!"; + $want_commit ? ($r, $c) : $r; +} + +sub rev_map_get { + my ($self, $rev, $uuid) = @_; + my $map_path = $self->map_path($uuid); + return undef unless -e $map_path; + + sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!"; + my $c = _rev_map_get($fh, $rev); + close($fh) or croak "close: $!"; + $c +} + +sub _rev_map_get { + my ($fh, $rev) = @_; + + binmode $fh or croak "binmode: $!"; + my $size = (stat($fh))[7]; + ($size % 24) == 0 or croak "inconsistent size: $size"; + + if ($size == 0) { + return undef; + } + + my ($l, $u) = (0, $size - 24); + my ($r, $c, $buf); + + while ($l <= $u) { + my $i = int(($l/24 + $u/24) / 2) * 24; + sysseek($fh, $i, SEEK_SET) or croak "seek: $!"; + sysread($fh, my $buf, 24) == 24 or croak "read: $!"; + my ($r, $c) = unpack(rev_map_fmt, $buf); + + if ($r < $rev) { + $l = $i + 24; + } elsif ($r > $rev) { + $u = $i - 24; + } else { # $r == $rev + return $c eq ('0' x 40) ? undef : $c; + } + } + undef; +} + +# Finds the first svn revision that exists on (if $eq_ok is true) or +# before $rev for the current branch. It will not search any lower +# than $min_rev. Returns the git commit hash and svn revision number +# if found, else (undef, undef). +sub find_rev_before { + my ($self, $rev, $eq_ok, $min_rev) = @_; + --$rev unless $eq_ok; + $min_rev ||= 1; + my $max_rev = $self->rev_map_max; + $rev = $max_rev if ($rev > $max_rev); + while ($rev >= $min_rev) { + if (my $c = $self->rev_map_get($rev)) { + return ($rev, $c); + } + --$rev; + } + return (undef, undef); +} + +# Finds the first svn revision that exists on (if $eq_ok is true) or +# after $rev for the current branch. It will not search any higher +# than $max_rev. Returns the git commit hash and svn revision number +# if found, else (undef, undef). +sub find_rev_after { + my ($self, $rev, $eq_ok, $max_rev) = @_; + ++$rev unless $eq_ok; + $max_rev ||= $self->rev_map_max; + while ($rev <= $max_rev) { + if (my $c = $self->rev_map_get($rev)) { + return ($rev, $c); + } + ++$rev; + } + return (undef, undef); +} + +sub _new { + my ($class, $repo_id, $ref_id, $path) = @_; + unless (defined $repo_id && length $repo_id) { + $repo_id = $Git::SVN::default_repo_id; + } + unless (defined $ref_id && length $ref_id) { + $_prefix = '' unless defined($_prefix); + $_[2] = $ref_id = + "refs/remotes/$_prefix$Git::SVN::default_ref_id"; + } + $_[1] = $repo_id; + my $dir = "$ENV{GIT_DIR}/svn/$ref_id"; + + # Older repos imported by us used $GIT_DIR/svn/foo instead of + # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo + if ($ref_id =~ m{^refs/remotes/(.*)}) { + my $old_dir = "$ENV{GIT_DIR}/svn/$1"; + if (-d $old_dir && ! -d $dir) { + $dir = $old_dir; + } + } + + $_[3] = $path = '' unless (defined $path); + mkpath([$dir]); + my $obj = bless { + ref_id => $ref_id, dir => $dir, index => "$dir/index", + config => "$ENV{GIT_DIR}/svn/config", + map_root => "$dir/.rev_map", repo_id => $repo_id }, $class; + + # Ensure it gets canonicalized + $obj->path($path); + + return $obj; +} + +sub path { + my $self = shift; + + if (@_) { + my $path = shift; + $self->{path} = $path; + return; + } + + return $self->{path}; +} + +# for read-only access of old .rev_db formats +sub unlink_rev_db_symlink { + my ($self) = @_; + my $link = $self->rev_db_path; + $link =~ s/\.[\w-]+$// or croak "missing UUID at the end of $link"; + if (-l $link) { + unlink $link or croak "unlink: $link failed!"; + } +} + +sub rev_db_path { + my ($self, $uuid) = @_; + my $db_path = $self->map_path($uuid); + $db_path =~ s{/\.rev_map\.}{/\.rev_db\.} + or croak "map_path: $db_path does not contain '/.rev_map.' !"; + $db_path; +} + +# the new replacement for .rev_db +sub map_path { + my ($self, $uuid) = @_; + $uuid ||= $self->ra_uuid; + "$self->{map_root}.$uuid"; +} + +sub uri_encode { + my ($f) = @_; + $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg; + $f +} + +sub uri_decode { + my ($f) = @_; + $f =~ s#%([0-9a-fA-F]{2})#chr(hex($1))#eg; + $f +} + +sub remove_username { + $_[0] =~ s{^([^:]*://)[^@]+@}{$1}; +} + +package Git::SVN::Prompt; +use strict; +use warnings; +require SVN::Core; +use vars qw/$_no_auth_cache $_username/; + +sub simple { + my ($cred, $realm, $default_username, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + $default_username = $_username if defined $_username; + if (defined $default_username && length $default_username) { + if (defined $realm && length $realm) { + print STDERR "Authentication realm: $realm\n"; + STDERR->flush; + } + $cred->username($default_username); + } else { + username($cred, $realm, $may_save, $pool); + } + $cred->password(_read_password("Password for '" . + $cred->username . "': ", $realm)); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub ssl_server_trust { + my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + print STDERR "Error validating server certificate for '$realm':\n"; + { + no warnings 'once'; + # All variables SVN::Auth::SSL::* are used only once, + # so we're shutting up Perl warnings about this. + if ($failures & $SVN::Auth::SSL::UNKNOWNCA) { + print STDERR " - The certificate is not issued ", + "by a trusted authority. Use the\n", + " fingerprint to validate ", + "the certificate manually!\n"; + } + if ($failures & $SVN::Auth::SSL::CNMISMATCH) { + print STDERR " - The certificate hostname ", + "does not match.\n"; + } + if ($failures & $SVN::Auth::SSL::NOTYETVALID) { + print STDERR " - The certificate is not yet valid.\n"; + } + if ($failures & $SVN::Auth::SSL::EXPIRED) { + print STDERR " - The certificate has expired.\n"; + } + if ($failures & $SVN::Auth::SSL::OTHER) { + print STDERR " - The certificate has ", + "an unknown error.\n"; + } + } # no warnings 'once' + printf STDERR + "Certificate information:\n". + " - Hostname: %s\n". + " - Valid: from %s until %s\n". + " - Issuer: %s\n". + " - Fingerprint: %s\n", + map $cert_info->$_, qw(hostname valid_from valid_until + issuer_dname fingerprint); + my $choice; +prompt: + print STDERR $may_save ? + "(R)eject, accept (t)emporarily or accept (p)ermanently? " : + "(R)eject or accept (t)emporarily? "; + STDERR->flush; + $choice = lc(substr( || 'R', 0, 1)); + if ($choice =~ /^t$/i) { + $cred->may_save(undef); + } elsif ($choice =~ /^r$/i) { + return -1; + } elsif ($may_save && $choice =~ /^p$/i) { + $cred->may_save($may_save); + } else { + goto prompt; + } + $cred->accepted_failures($failures); + $SVN::_Core::SVN_NO_ERROR; +} + +sub ssl_client_cert { + my ($cred, $realm, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + print STDERR "Client certificate filename: "; + STDERR->flush; + chomp(my $filename = ); + $cred->cert_file($filename); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub ssl_client_cert_pw { + my ($cred, $realm, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + $cred->password(_read_password("Password: ", $realm)); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub username { + my ($cred, $realm, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + if (defined $realm && length $realm) { + print STDERR "Authentication realm: $realm\n"; + } + my $username; + if (defined $_username) { + $username = $_username; + } else { + print STDERR "Username: "; + STDERR->flush; + chomp($username = ); + } + $cred->username($username); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub _read_password { + my ($prompt, $realm) = @_; + my $password = ''; + if (exists $ENV{GIT_ASKPASS}) { + open(PH, "-|", $ENV{GIT_ASKPASS}, $prompt); + $password = ; + $password =~ s/[\012\015]//; # \n\r + close(PH); + } else { + print STDERR $prompt; + STDERR->flush; + require Term::ReadKey; + Term::ReadKey::ReadMode('noecho'); + while (defined(my $key = Term::ReadKey::ReadKey(0))) { + last if $key =~ /[\012\015]/; # \n\r + $password .= $key; + } + Term::ReadKey::ReadMode('restore'); + print STDERR "\n"; + STDERR->flush; + } + $password; +} + +package SVN::Git::Fetcher; +use vars qw/@ISA $_ignore_regex $_preserve_empty_dirs $_placeholder_filename + @deleted_gpath %added_placeholder $repo_id/; +use strict; +use warnings; +use Carp qw/croak/; +use File::Basename qw/dirname/; +use IO::File qw//; + +# file baton members: path, mode_a, mode_b, pool, fh, blob, base +sub new { + my ($class, $git_svn, $switch_path) = @_; + my $self = SVN::Delta::Editor->new; + bless $self, $class; + if (exists $git_svn->{last_commit}) { + $self->{c} = $git_svn->{last_commit}; + $self->{empty_symlinks} = + _mark_empty_symlinks($git_svn, $switch_path); + } + + # some options are read globally, but can be overridden locally + # per [svn-remote "..."] section. Command-line options will *NOT* + # override options set in an [svn-remote "..."] section + $repo_id = $git_svn->{repo_id}; + my $k = "svn-remote.$repo_id.ignore-paths"; + my $v = eval { command_oneline('config', '--get', $k) }; + $self->{ignore_regex} = $v; + + $k = "svn-remote.$repo_id.preserve-empty-dirs"; + $v = eval { command_oneline('config', '--get', '--bool', $k) }; + if ($v && $v eq 'true') { + $_preserve_empty_dirs = 1; + $k = "svn-remote.$repo_id.placeholder-filename"; + $v = eval { command_oneline('config', '--get', $k) }; + $_placeholder_filename = $v; + } + + # Load the list of placeholder files added during previous invocations. + $k = "svn-remote.$repo_id.added-placeholder"; + $v = eval { command_oneline('config', '--get-all', $k) }; + if ($_preserve_empty_dirs && $v) { + # command() prints errors to stderr, so we only call it if + # command_oneline() succeeded. + my @v = command('config', '--get-all', $k); + $added_placeholder{ dirname($_) } = $_ foreach @v; + } + + $self->{empty} = {}; + $self->{dir_prop} = {}; + $self->{file_prop} = {}; + $self->{absent_dir} = {}; + $self->{absent_file} = {}; + $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new }); + $self->{pathnameencoding} = Git::config('svn.pathnameencoding'); + $self; +} + +# this uses the Ra object, so it must be called before do_{switch,update}, +# not inside them (when the Git::SVN::Fetcher object is passed) to +# do_{switch,update} +sub _mark_empty_symlinks { + my ($git_svn, $switch_path) = @_; + my $bool = Git::config_bool('svn.brokenSymlinkWorkaround'); + return {} if (!defined($bool)) || (defined($bool) && ! $bool); + + my %ret; + my ($rev, $cmt) = $git_svn->last_rev_commit; + return {} unless ($rev && $cmt); + + # allow the warning to be printed for each revision we fetch to + # ensure the user sees it. The user can also disable the workaround + # on the repository even while git svn is running and the next + # revision fetched will skip this expensive function. + my $printed_warning; + chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`); + my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt); + local $/ = "\0"; + my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path}; + $pfx .= '/' if length($pfx); + while (<$ls>) { + chomp; + s/\A100644 blob $empty_blob\t//o or next; + unless ($printed_warning) { + print STDERR "Scanning for empty symlinks, ", + "this may take a while if you have ", + "many empty files\n", + "You may disable this with `", + "git config svn.brokenSymlinkWorkaround ", + "false'.\n", + "This may be done in a different ", + "terminal without restarting ", + "git svn\n"; + $printed_warning = 1; + } + my $path = $_; + my (undef, $props) = + $git_svn->ra->get_file($pfx.$path, $rev, undef); + if ($props->{'svn:special'}) { + $ret{$path} = 1; + } + } + command_close_pipe($ls, $ctx); + \%ret; +} + +# returns true if a given path is inside a ".git" directory +sub in_dot_git { + $_[0] =~ m{(?:^|/)\.git(?:/|$)}; +} + +# return value: 0 -- don't ignore, 1 -- ignore +sub is_path_ignored { + my ($self, $path) = @_; + return 1 if in_dot_git($path); + return 1 if defined($self->{ignore_regex}) && + $path =~ m!$self->{ignore_regex}!; + return 0 unless defined($_ignore_regex); + return 1 if $path =~ m!$_ignore_regex!o; + return 0; +} + +sub set_path_strip { + my ($self, $path) = @_; + $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path; +} + +sub open_root { + { path => '' }; +} + +sub open_directory { + my ($self, $path, $pb, $rev) = @_; + { path => $path }; +} + +sub git_path { + my ($self, $path) = @_; + if (my $enc = $self->{pathnameencoding}) { + require Encode; + Encode::from_to($path, 'UTF-8', $enc); + } + if ($self->{path_strip}) { + $path =~ s!$self->{path_strip}!! or + die "Failed to strip path '$path' ($self->{path_strip})\n"; + } + $path; +} + +sub delete_entry { + my ($self, $path, $rev, $pb) = @_; + return undef if $self->is_path_ignored($path); + + my $gpath = $self->git_path($path); + return undef if ($gpath eq ''); + + # remove entire directories. + my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath") + =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/); + if ($tree) { + my ($ls, $ctx) = command_output_pipe(qw/ls-tree + -r --name-only -z/, + $tree); + local $/ = "\0"; + while (<$ls>) { + chomp; + my $rmpath = "$gpath/$_"; + $self->{gii}->remove($rmpath); + print "\tD\t$rmpath\n" unless $::_q; + } + print "\tD\t$gpath/\n" unless $::_q; + command_close_pipe($ls, $ctx); + } else { + $self->{gii}->remove($gpath); + print "\tD\t$gpath\n" unless $::_q; + } + # Don't add to @deleted_gpath if we're deleting a placeholder file. + push @deleted_gpath, $gpath unless $added_placeholder{dirname($path)}; + $self->{empty}->{$path} = 0; + undef; +} + +sub open_file { + my ($self, $path, $pb, $rev) = @_; + my ($mode, $blob); + + goto out if $self->is_path_ignored($path); + + my $gpath = $self->git_path($path); + ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath") + =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/); + unless (defined $mode && defined $blob) { + die "$path was not found in commit $self->{c} (r$rev)\n"; + } + if ($mode eq '100644' && $self->{empty_symlinks}->{$path}) { + $mode = '120000'; + } +out: + { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob, + pool => SVN::Pool->new, action => 'M' }; +} + +sub add_file { + my ($self, $path, $pb, $cp_path, $cp_rev) = @_; + my $mode; + + if (!$self->is_path_ignored($path)) { + my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#); + delete $self->{empty}->{$dir}; + $mode = '100644'; + + if ($added_placeholder{$dir}) { + # Remove our placeholder file, if we created one. + delete_entry($self, $added_placeholder{$dir}) + unless $path eq $added_placeholder{$dir}; + delete $added_placeholder{$dir} + } + } + + { path => $path, mode_a => $mode, mode_b => $mode, + pool => SVN::Pool->new, action => 'A' }; +} + +sub add_directory { + my ($self, $path, $cp_path, $cp_rev) = @_; + goto out if $self->is_path_ignored($path); + my $gpath = $self->git_path($path); + if ($gpath eq '') { + my ($ls, $ctx) = command_output_pipe(qw/ls-tree + -r --name-only -z/, + $self->{c}); + local $/ = "\0"; + while (<$ls>) { + chomp; + $self->{gii}->remove($_); + print "\tD\t$_\n" unless $::_q; + push @deleted_gpath, $gpath; + } + command_close_pipe($ls, $ctx); + $self->{empty}->{$path} = 0; + } + my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#); + delete $self->{empty}->{$dir}; + $self->{empty}->{$path} = 1; + + if ($added_placeholder{$dir}) { + # Remove our placeholder file, if we created one. + delete_entry($self, $added_placeholder{$dir}); + delete $added_placeholder{$dir} + } + +out: + { path => $path }; +} + +sub change_dir_prop { + my ($self, $db, $prop, $value) = @_; + return undef if $self->is_path_ignored($db->{path}); + $self->{dir_prop}->{$db->{path}} ||= {}; + $self->{dir_prop}->{$db->{path}}->{$prop} = $value; + undef; +} + +sub absent_directory { + my ($self, $path, $pb) = @_; + return undef if $self->is_path_ignored($path); + $self->{absent_dir}->{$pb->{path}} ||= []; + push @{$self->{absent_dir}->{$pb->{path}}}, $path; + undef; +} + +sub absent_file { + my ($self, $path, $pb) = @_; + return undef if $self->is_path_ignored($path); + $self->{absent_file}->{$pb->{path}} ||= []; + push @{$self->{absent_file}->{$pb->{path}}}, $path; + undef; +} + +sub change_file_prop { + my ($self, $fb, $prop, $value) = @_; + return undef if $self->is_path_ignored($fb->{path}); + if ($prop eq 'svn:executable') { + if ($fb->{mode_b} != 120000) { + $fb->{mode_b} = defined $value ? 100755 : 100644; + } + } elsif ($prop eq 'svn:special') { + $fb->{mode_b} = defined $value ? 120000 : 100644; + } else { + $self->{file_prop}->{$fb->{path}} ||= {}; + $self->{file_prop}->{$fb->{path}}->{$prop} = $value; + } + undef; +} + +sub apply_textdelta { + my ($self, $fb, $exp) = @_; + return undef if $self->is_path_ignored($fb->{path}); + my $fh = $::_repository->temp_acquire('svn_delta'); + # $fh gets auto-closed() by SVN::TxDelta::apply(), + # (but $base does not,) so dup() it for reading in close_file + open my $dup, '<&', $fh or croak $!; + my $base = $::_repository->temp_acquire('git_blob'); + + if ($fb->{blob}) { + my ($base_is_link, $size); + + if ($fb->{mode_a} eq '120000' && + ! $self->{empty_symlinks}->{$fb->{path}}) { + print $base 'link ' or die "print $!\n"; + $base_is_link = 1; + } + retry: + $size = $::_repository->cat_blob($fb->{blob}, $base); + die "Failed to read object $fb->{blob}" if ($size < 0); + + if (defined $exp) { + seek $base, 0, 0 or croak $!; + my $got = ::md5sum($base); + if ($got ne $exp) { + my $err = "Checksum mismatch: ". + "$fb->{path} $fb->{blob}\n" . + "expected: $exp\n" . + " got: $got\n"; + if ($base_is_link) { + warn $err, + "Retrying... (possibly ", + "a bad symlink from SVN)\n"; + $::_repository->temp_reset($base); + $base_is_link = 0; + goto retry; + } + die $err; + } + } + } + seek $base, 0, 0 or croak $!; + $fb->{fh} = $fh; + $fb->{base} = $base; + [ SVN::TxDelta::apply($base, $dup, undef, $fb->{path}, $fb->{pool}) ]; +} + +sub close_file { + my ($self, $fb, $exp) = @_; + return undef if $self->is_path_ignored($fb->{path}); + + my $hash; + my $path = $self->git_path($fb->{path}); + if (my $fh = $fb->{fh}) { + if (defined $exp) { + seek($fh, 0, 0) or croak $!; + my $got = ::md5sum($fh); + if ($got ne $exp) { + die "Checksum mismatch: $path\n", + "expected: $exp\n got: $got\n"; + } + } + if ($fb->{mode_b} == 120000) { + sysseek($fh, 0, 0) or croak $!; + my $rd = sysread($fh, my $buf, 5); + + if (!defined $rd) { + croak "sysread: $!\n"; + } elsif ($rd == 0) { + warn "$path has mode 120000", + " but it points to nothing\n", + "converting to an empty file with mode", + " 100644\n"; + $fb->{mode_b} = '100644'; + } elsif ($buf ne 'link ') { + warn "$path has mode 120000", + " but is not a link\n"; + } else { + my $tmp_fh = $::_repository->temp_acquire( + 'svn_hash'); + my $res; + while ($res = sysread($fh, my $str, 1024)) { + my $out = syswrite($tmp_fh, $str, $res); + defined($out) && $out == $res + or croak("write ", + Git::temp_path($tmp_fh), + ": $!\n"); + } + defined $res or croak $!; + + ($fh, $tmp_fh) = ($tmp_fh, $fh); + Git::temp_release($tmp_fh, 1); + } + } + + $hash = $::_repository->hash_and_insert_object( + Git::temp_path($fh)); + $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n"; + + Git::temp_release($fb->{base}, 1); + Git::temp_release($fh, 1); + } else { + $hash = $fb->{blob} or die "no blob information\n"; + } + $fb->{pool}->clear; + $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!; + print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q; + undef; +} + +sub abort_edit { + my $self = shift; + $self->{nr} = $self->{gii}->{nr}; + delete $self->{gii}; + $self->SUPER::abort_edit(@_); +} + +sub close_edit { + my $self = shift; + + if ($_preserve_empty_dirs) { + my @empty_dirs; + + # Any entry flagged as empty that also has an associated + # dir_prop represents a newly created empty directory. + foreach my $i (keys %{$self->{empty}}) { + push @empty_dirs, $i if exists $self->{dir_prop}->{$i}; + } + + # Search for directories that have become empty due subsequent + # file deletes. + push @empty_dirs, $self->find_empty_directories(); + + # Finally, add a placeholder file to each empty directory. + $self->add_placeholder_file($_) foreach (@empty_dirs); + + $self->stash_placeholder_list(); + } + + $self->{git_commit_ok} = 1; + $self->{nr} = $self->{gii}->{nr}; + delete $self->{gii}; + $self->SUPER::close_edit(@_); +} + +sub find_empty_directories { + my ($self) = @_; + my @empty_dirs; + my %dirs = map { dirname($_) => 1 } @deleted_gpath; + + foreach my $dir (sort keys %dirs) { + next if $dir eq "."; + + # If there have been any additions to this directory, there is + # no reason to check if it is empty. + my $skip_added = 0; + foreach my $t (qw/dir_prop file_prop/) { + foreach my $path (keys %{ $self->{$t} }) { + if (exists $self->{$t}->{dirname($path)}) { + $skip_added = 1; + last; + } + } + last if $skip_added; + } + next if $skip_added; + + # Use `git ls-tree` to get the filenames of this directory + # that existed prior to this particular commit. + my $ls = command('ls-tree', '-z', '--name-only', + $self->{c}, "$dir/"); + my %files = map { $_ => 1 } split(/\0/, $ls); + + # Remove the filenames that were deleted during this commit. + delete $files{$_} foreach (@deleted_gpath); + + # Report the directory if there are no filenames left. + push @empty_dirs, $dir unless (scalar %files); + } + @empty_dirs; +} + +sub add_placeholder_file { + my ($self, $dir) = @_; + my $path = "$dir/$_placeholder_filename"; + my $gpath = $self->git_path($path); + + my $fh = $::_repository->temp_acquire($gpath); + my $hash = $::_repository->hash_and_insert_object(Git::temp_path($fh)); + Git::temp_release($fh, 1); + $self->{gii}->update('100644', $hash, $gpath) or croak $!; + + # The directory should no longer be considered empty. + delete $self->{empty}->{$dir} if exists $self->{empty}->{$dir}; + + # Keep track of any placeholder files we create. + $added_placeholder{$dir} = $path; +} + +sub stash_placeholder_list { + my ($self) = @_; + my $k = "svn-remote.$repo_id.added-placeholder"; + my $v = eval { command_oneline('config', '--get-all', $k) }; + command_noisy('config', '--unset-all', $k) if $v; + foreach (values %added_placeholder) { + command_noisy('config', '--add', $k, $_); + } +} + +package SVN::Git::Editor; +use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/; +use strict; +use warnings; +use Carp qw/croak/; +use IO::File; + +sub new { + my ($class, $opts) = @_; + foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) { + die "$_ required!\n" unless (defined $opts->{$_}); + } + + my $pool = SVN::Pool->new; + my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b}); + my $types = check_diff_paths($opts->{ra}, $opts->{svn_path}, + $opts->{r}, $mods); + + # $opts->{ra} functions should not be used after this: + my @ce = $opts->{ra}->get_commit_editor($opts->{log}, + $opts->{editor_cb}, $pool); + my $self = SVN::Delta::Editor->new(@ce, $pool); + bless $self, $class; + foreach (qw/svn_path r tree_a tree_b/) { + $self->{$_} = $opts->{$_}; + } + $self->{url} = $opts->{ra}->{url}; + $self->{mods} = $mods; + $self->{types} = $types; + $self->{pool} = $pool; + $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) }; + $self->{rm} = { }; + $self->{path_prefix} = length $self->{svn_path} ? + "$self->{svn_path}/" : ''; + $self->{config} = $opts->{config}; + $self->{mergeinfo} = $opts->{mergeinfo}; + return $self; +} + +sub generate_diff { + my ($tree_a, $tree_b) = @_; + my @diff_tree = qw(diff-tree -z -r); + if ($_cp_similarity) { + push @diff_tree, "-C$_cp_similarity"; + } else { + push @diff_tree, '-C'; + } + push @diff_tree, '--find-copies-harder' if $_find_copies_harder; + push @diff_tree, "-l$_rename_limit" if defined $_rename_limit; + push @diff_tree, $tree_a, $tree_b; + my ($diff_fh, $ctx) = command_output_pipe(@diff_tree); + local $/ = "\0"; + my $state = 'meta'; + my @mods; + while (<$diff_fh>) { + chomp $_; # this gets rid of the trailing "\0" + if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s + ($::sha1)\s($::sha1)\s + ([MTCRAD])\d*$/xo) { + push @mods, { mode_a => $1, mode_b => $2, + sha1_a => $3, sha1_b => $4, + chg => $5 }; + if ($5 =~ /^(?:C|R)$/) { + $state = 'file_a'; + } else { + $state = 'file_b'; + } + } elsif ($state eq 'file_a') { + my $x = $mods[$#mods] or croak "Empty array\n"; + if ($x->{chg} !~ /^(?:C|R)$/) { + croak "Error parsing $_, $x->{chg}\n"; + } + $x->{file_a} = $_; + $state = 'file_b'; + } elsif ($state eq 'file_b') { + my $x = $mods[$#mods] or croak "Empty array\n"; + if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) { + croak "Error parsing $_, $x->{chg}\n"; + } + if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) { + croak "Error parsing $_, $x->{chg}\n"; + } + $x->{file_b} = $_; + $state = 'meta'; + } else { + croak "Error parsing $_\n"; + } + } + command_close_pipe($diff_fh, $ctx); + \@mods; +} + +sub check_diff_paths { + my ($ra, $pfx, $rev, $mods) = @_; + my %types; + $pfx .= '/' if length $pfx; + + sub type_diff_paths { + my ($ra, $types, $path, $rev) = @_; + my @p = split m#/+#, $path; + my $c = shift @p; + unless (defined $types->{$c}) { + $types->{$c} = $ra->check_path($c, $rev); + } + while (@p) { + $c .= '/' . shift @p; + next if defined $types->{$c}; + $types->{$c} = $ra->check_path($c, $rev); + } + } + + foreach my $m (@$mods) { + foreach my $f (qw/file_a file_b/) { + next unless defined $m->{$f}; + my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#); + if (length $pfx.$dir && ! defined $types{$dir}) { + type_diff_paths($ra, \%types, $pfx.$dir, $rev); + } + } + } + \%types; +} + +sub split_path { + return ($_[0] =~ m#^(.*?)/?([^/]+)$#); +} + +sub repo_path { + my ($self, $path) = @_; + if (my $enc = $self->{pathnameencoding}) { + require Encode; + Encode::from_to($path, $enc, 'UTF-8'); + } + $self->{path_prefix}.(defined $path ? $path : ''); +} + +sub url_path { + my ($self, $path) = @_; + if ($self->{url} =~ m#^https?://#) { + $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg; + } + $self->{url} . '/' . $self->repo_path($path); +} + +sub rmdirs { + my ($self) = @_; + my $rm = $self->{rm}; + delete $rm->{''}; # we never delete the url we're tracking + return unless %$rm; + + foreach (keys %$rm) { + my @d = split m#/#, $_; + my $c = shift @d; + $rm->{$c} = 1; + while (@d) { + $c .= '/' . shift @d; + $rm->{$c} = 1; + } + } + delete $rm->{$self->{svn_path}}; + delete $rm->{''}; # we never delete the url we're tracking + return unless %$rm; + + my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/, + $self->{tree_b}); + local $/ = "\0"; + while (<$fh>) { + chomp; + my @dn = split m#/#, $_; + while (pop @dn) { + delete $rm->{join '/', @dn}; + } + unless (%$rm) { + close $fh; + return; + } + } + command_close_pipe($fh, $ctx); + + my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat}); + foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) { + $self->close_directory($bat->{$d}, $p); + my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#); + print "\tD+\t$d/\n" unless $::_q; + $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p); + delete $bat->{$d}; + } +} + +sub open_or_add_dir { + my ($self, $full_path, $baton, $deletions) = @_; + my $t = $self->{types}->{$full_path}; + if (!defined $t) { + die "$full_path not known in r$self->{r} or we have a bug!\n"; + } + { + no warnings 'once'; + # SVN::Node::none and SVN::Node::file are used only once, + # so we're shutting up Perl's warnings about them. + if ($t == $SVN::Node::none || defined($deletions->{$full_path})) { + return $self->add_directory($full_path, $baton, + undef, -1, $self->{pool}); + } elsif ($t == $SVN::Node::dir) { + return $self->open_directory($full_path, $baton, + $self->{r}, $self->{pool}); + } # no warnings 'once' + print STDERR "$full_path already exists in repository at ", + "r$self->{r} and it is not a directory (", + ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n"; + } # no warnings 'once' + exit 1; +} + +sub ensure_path { + my ($self, $path, $deletions) = @_; + my $bat = $self->{bat}; + my $repo_path = $self->repo_path($path); + return $bat->{''} unless (length $repo_path); + + my @p = split m#/+#, $repo_path; + my $c = shift @p; + $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''}, $deletions); + while (@p) { + my $c0 = $c; + $c .= '/' . shift @p; + $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0}, $deletions); + } + return $bat->{$c}; +} + +# Subroutine to convert a globbing pattern to a regular expression. +# From perl cookbook. +sub glob2pat { + my $globstr = shift; + my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']'); + $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge; + return '^' . $globstr . '$'; +} + +sub check_autoprop { + my ($self, $pattern, $properties, $file, $fbat) = @_; + # Convert the globbing pattern to a regular expression. + my $regex = glob2pat($pattern); + # Check if the pattern matches the file name. + if($file =~ m/($regex)/) { + # Parse the list of properties to set. + my @props = split(/;/, $properties); + foreach my $prop (@props) { + # Parse 'name=value' syntax and set the property. + if ($prop =~ /([^=]+)=(.*)/) { + my ($n,$v) = ($1,$2); + for ($n, $v) { + s/^\s+//; s/\s+$//; + } + $self->change_file_prop($fbat, $n, $v); + } + } + } +} + +sub apply_autoprops { + my ($self, $file, $fbat) = @_; + my $conf_t = ${$self->{config}}{'config'}; + no warnings 'once'; + # Check [miscellany]/enable-auto-props in svn configuration. + if (SVN::_Core::svn_config_get_bool( + $conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_MISCELLANY, + $SVN::_Core::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS, + 0)) { + # Auto-props are enabled. Enumerate them to look for matches. + my $callback = sub { + $self->check_autoprop($_[0], $_[1], $file, $fbat); + }; + SVN::_Core::svn_config_enumerate( + $conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_AUTO_PROPS, + $callback); + } +} + +sub A { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, + undef, -1); + print "\tA\t$m->{file_b}\n" unless $::_q; + $self->apply_autoprops($file, $fbat); + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); +} + +sub C { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, + $self->url_path($m->{file_a}), $self->{r}); + print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q; + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); +} + +sub delete_entry { + my ($self, $path, $pbat) = @_; + my $rpath = $self->repo_path($path); + my ($dir, $file) = split_path($rpath); + $self->{rm}->{$dir} = 1; + $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool}); +} + +sub R { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, + $self->url_path($m->{file_a}), $self->{r}); + print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q; + $self->apply_autoprops($file, $fbat); + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); + + ($dir, $file) = split_path($m->{file_a}); + $pbat = $self->ensure_path($dir, $deletions); + $self->delete_entry($m->{file_a}, $pbat); +} + +sub M { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->open_file($self->repo_path($m->{file_b}), + $pbat,$self->{r},$self->{pool}); + print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q; + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); +} + +sub T { shift->M(@_) } + +sub change_file_prop { + my ($self, $fbat, $pname, $pval) = @_; + $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool}); +} + +sub change_dir_prop { + my ($self, $pbat, $pname, $pval) = @_; + $self->SUPER::change_dir_prop($pbat, $pname, $pval, $self->{pool}); +} + +sub _chg_file_get_blob ($$$$) { + my ($self, $fbat, $m, $which) = @_; + my $fh = $::_repository->temp_acquire("git_blob_$which"); + if ($m->{"mode_$which"} =~ /^120/) { + print $fh 'link ' or croak $!; + $self->change_file_prop($fbat,'svn:special','*'); + } elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) { + $self->change_file_prop($fbat,'svn:special',undef); + } + my $blob = $m->{"sha1_$which"}; + return ($fh,) if ($blob =~ /^0{40}$/); + my $size = $::_repository->cat_blob($blob, $fh); + croak "Failed to read object $blob" if ($size < 0); + $fh->flush == 0 or croak $!; + seek $fh, 0, 0 or croak $!; + + my $exp = ::md5sum($fh); + seek $fh, 0, 0 or croak $!; + return ($fh, $exp); +} + +sub chg_file { + my ($self, $fbat, $m) = @_; + if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) { + $self->change_file_prop($fbat,'svn:executable','*'); + } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) { + $self->change_file_prop($fbat,'svn:executable',undef); + } + my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a'; + my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b'; + my $pool = SVN::Pool->new; + my $atd = $self->apply_textdelta($fbat, $exp_a, $pool); + if (-s $fh_a) { + my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool); + my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool); + if (defined $res) { + die "Unexpected result from send_txstream: $res\n", + "(SVN::Core::VERSION: $SVN::Core::VERSION)\n"; + } + } else { + my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool); + die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n" + if ($got ne $exp_b); + } + Git::temp_release($fh_b, 1); + Git::temp_release($fh_a, 1); + $pool->clear; +} + +sub D { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + print "\tD\t$m->{file_b}\n" unless $::_q; + $self->delete_entry($m->{file_b}, $pbat); +} + +sub close_edit { + my ($self) = @_; + my ($p,$bat) = ($self->{pool}, $self->{bat}); + foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) { + next if $_ eq ''; + $self->close_directory($bat->{$_}, $p); + } + $self->close_directory($bat->{''}, $p); + $self->SUPER::close_edit($p); + $p->clear; +} + +sub abort_edit { + my ($self) = @_; + $self->SUPER::abort_edit($self->{pool}); +} + +sub DESTROY { + my $self = shift; + $self->SUPER::DESTROY(@_); + $self->{pool}->clear; +} + +# this drives the editor +sub apply_diff { + my ($self) = @_; + my $mods = $self->{mods}; + my %o = ( D => 0, C => 1, R => 2, A => 3, M => 4, T => 5 ); + my %deletions; + + foreach my $m (@$mods) { + if ($m->{chg} eq "D") { + $deletions{$m->{file_b}} = 1; + } + } + + foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) { + my $f = $m->{chg}; + if (defined $o{$f}) { + $self->$f($m, \%deletions); + } else { + fatal("Invalid change type: $f"); + } + } + + if (defined($self->{mergeinfo})) { + $self->change_dir_prop($self->{bat}{''}, "svn:mergeinfo", + $self->{mergeinfo}); + } + $self->rmdirs if $_rmdir; + if (@$mods == 0 && !defined($self->{mergeinfo})) { + $self->abort_edit; + } else { + $self->close_edit; + } + return scalar @$mods; +} + +package Git::SVN::Ra; +use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/; +use strict; +use warnings; +my ($ra_invalid, $can_do_switch, %ignored_err, $RA); + +BEGIN { + # enforce temporary pool usage for some simple functions + no strict 'refs'; + for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root + get_file/) { + my $SUPER = "SUPER::$f"; + *$f = sub { + my $self = shift; + my $pool = SVN::Pool->new; + my @ret = $self->$SUPER(@_,$pool); + $pool->clear; + wantarray ? @ret : $ret[0]; + }; + } +} + +sub _auth_providers () { + [ + SVN::Client::get_simple_provider(), + SVN::Client::get_ssl_server_trust_file_provider(), + SVN::Client::get_simple_prompt_provider( + \&Git::SVN::Prompt::simple, 2), + SVN::Client::get_ssl_client_cert_file_provider(), + SVN::Client::get_ssl_client_cert_prompt_provider( + \&Git::SVN::Prompt::ssl_client_cert, 2), + SVN::Client::get_ssl_client_cert_pw_file_provider(), + SVN::Client::get_ssl_client_cert_pw_prompt_provider( + \&Git::SVN::Prompt::ssl_client_cert_pw, 2), + SVN::Client::get_username_provider(), + SVN::Client::get_ssl_server_trust_prompt_provider( + \&Git::SVN::Prompt::ssl_server_trust), + SVN::Client::get_username_prompt_provider( + \&Git::SVN::Prompt::username, 2) + ] +} + +sub escape_uri_only { + my ($uri) = @_; + my @tmp; + foreach (split m{/}, $uri) { + s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; + push @tmp, $_; + } + join('/', @tmp); +} + +sub escape_url { + my ($url) = @_; + if ($url =~ m#^(https?)://([^/]+)(.*)$#) { + my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3)); + $url = "$scheme://$domain$uri"; + } + $url; +} + +sub new { + my ($class, $url) = @_; + $url =~ s!/+$!!; + return $RA if ($RA && $RA->{url} eq $url); + + ::_req_svn(); + + SVN::_Core::svn_config_ensure($config_dir, undef); + my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers); + my $config = SVN::Core::config_get_config($config_dir); + $RA = undef; + my $dont_store_passwords = 1; + my $conf_t = ${$config}{'config'}; + { + no warnings 'once'; + # The usage of $SVN::_Core::SVN_CONFIG_* variables + # produces warnings that variables are used only once. + # I had not found the better way to shut them up, so + # the warnings of type 'once' are disabled in this block. + if (SVN::_Core::svn_config_get_bool($conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_AUTH, + $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS, + 1) == 0) { + SVN::_Core::svn_auth_set_parameter($baton, + $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, + bless (\$dont_store_passwords, "_p_void")); + } + if (SVN::_Core::svn_config_get_bool($conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_AUTH, + $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS, + 1) == 0) { + $Git::SVN::Prompt::_no_auth_cache = 1; + } + } # no warnings 'once' + my $self = SVN::Ra->new(url => escape_url($url), auth => $baton, + config => $config, + pool => SVN::Pool->new, + auth_provider_callbacks => $callbacks); + $self->{url} = $url; + $self->{svn_path} = $url; + $self->{repos_root} = $self->get_repos_root; + $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##; + $self->{cache} = { check_path => { r => 0, data => {} }, + get_dir => { r => 0, data => {} } }; + $RA = bless $self, $class; +} + +sub check_path { + my ($self, $path, $r) = @_; + my $cache = $self->{cache}->{check_path}; + if ($r == $cache->{r} && exists $cache->{data}->{$path}) { + return $cache->{data}->{$path}; + } + my $pool = SVN::Pool->new; + my $t = $self->SUPER::check_path($path, $r, $pool); + $pool->clear; + if ($r != $cache->{r}) { + %{$cache->{data}} = (); + $cache->{r} = $r; + } + $cache->{data}->{$path} = $t; +} + +sub get_dir { + my ($self, $dir, $r) = @_; + my $cache = $self->{cache}->{get_dir}; + if ($r == $cache->{r}) { + if (my $x = $cache->{data}->{$dir}) { + return wantarray ? @$x : $x->[0]; + } + } + my $pool = SVN::Pool->new; + my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool); + my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d; + $pool->clear; + if ($r != $cache->{r}) { + %{$cache->{data}} = (); + $cache->{r} = $r; + } + $cache->{data}->{$dir} = [ \%dirents, $r, $props ]; + wantarray ? (\%dirents, $r, $props) : \%dirents; +} + +sub DESTROY { + # do not call the real DESTROY since we store ourselves in $RA +} + +# get_log(paths, start, end, limit, +# discover_changed_paths, strict_node_history, receiver) +sub get_log { + my ($self, @args) = @_; + my $pool = SVN::Pool->new; + + # svn_log_changed_path_t objects passed to get_log are likely to be + # overwritten even if only the refs are copied to an external variable, + # so we should dup the structures in their entirety. Using an + # externally passed pool (instead of our temporary and quickly cleared + # pool in Git::SVN::Ra) does not help matters at all... + my $receiver = pop @args; + my $prefix = "/".$self->{svn_path}; + $prefix =~ s#/+($)##; + my $prefix_regex = qr#^\Q$prefix\E#; + push(@args, sub { + my ($paths) = $_[0]; + return &$receiver(@_) unless $paths; + $_[0] = (); + foreach my $p (keys %$paths) { + my $i = $paths->{$p}; + # Make path relative to our url, not repos_root + $p =~ s/$prefix_regex//; + my %s = map { $_ => $i->$_; } + qw/copyfrom_path copyfrom_rev action/; + if ($s{'copyfrom_path'}) { + $s{'copyfrom_path'} =~ s/$prefix_regex//; + } + $_[0]{$p} = \%s; + } + &$receiver(@_); + }); + + + # the limit parameter was not supported in SVN 1.1.x, so we + # drop it. Therefore, the receiver callback passed to it + # is made aware of this limitation by being wrapped if + # the limit passed to is being wrapped. + if ($SVN::Core::VERSION le '1.2.0') { + my $limit = splice(@args, 3, 1); + if ($limit > 0) { + my $receiver = pop @args; + push(@args, sub { &$receiver(@_) if (--$limit >= 0) }); + } + } + my $ret = $self->SUPER::get_log(@args, $pool); + $pool->clear; + $ret; +} + +sub trees_match { + my ($self, $url1, $rev1, $url2, $rev2) = @_; + my $ctx = SVN::Client->new(auth => _auth_providers); + my $out = IO::File->new_tmpfile; + + # older SVN (1.1.x) doesn't take $pool as the last parameter for + # $ctx->diff(), so we'll create a default one + my $pool = SVN::Pool->new_default_sub; + + $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1 + $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out); + $out->flush; + my $ret = (($out->stat)[7] == 0); + close $out or croak $!; + + $ret; +} + +sub get_commit_editor { + my ($self, $log, $cb, $pool) = @_; + my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : (); + $self->SUPER::get_commit_editor($log, $cb, @lock, $pool); +} + +sub gs_do_update { + my ($self, $rev_a, $rev_b, $gs, $editor) = @_; + my $new = ($rev_a == $rev_b); + my $path = $gs->{path}; + + if ($new && -e $gs->{index}) { + unlink $gs->{index} or die + "Couldn't unlink index: $gs->{index}: $!\n"; + } + my $pool = SVN::Pool->new; + $editor->set_path_strip($path); + my (@pc) = split m#/#, $path; + my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''), + 1, $editor, $pool); + my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : (); + + # Since we can't rely on svn_ra_reparent being available, we'll + # just have to do some magic with set_path to make it so + # we only want a partial path. + my $sp = ''; + my $final = join('/', @pc); + while (@pc) { + $reporter->set_path($sp, $rev_b, 0, @lock, $pool); + $sp .= '/' if length $sp; + $sp .= shift @pc; + } + die "BUG: '$sp' != '$final'\n" if ($sp ne $final); + + $reporter->set_path($sp, $rev_a, $new, @lock, $pool); + + $reporter->finish_report($pool); + $pool->clear; + $editor->{git_commit_ok}; +} + +# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and +# svn_ra_reparent didn't work before 1.4) +sub gs_do_switch { + my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_; + my $path = $gs->{path}; + my $pool = SVN::Pool->new; + + my $full_url = $self->{url}; + my $old_url = $full_url; + $full_url .= '/' . $path if length $path; + my ($ra, $reparented); + + if ($old_url =~ m#^svn(\+ssh)?://# || + ($full_url =~ m#^https?://# && + escape_url($full_url) ne $full_url)) { + $_[0] = undef; + $self = undef; + $RA = undef; + $ra = Git::SVN::Ra->new($full_url); + $ra_invalid = 1; + } elsif ($old_url ne $full_url) { + SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool); + $self->{url} = $full_url; + $reparented = 1; + } + + $ra ||= $self; + $url_b = escape_url($url_b); + my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool); + my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : (); + $reporter->set_path('', $rev_a, 0, @lock, $pool); + $reporter->finish_report($pool); + + if ($reparented) { + SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool); + $self->{url} = $old_url; + } + + $pool->clear; + $editor->{git_commit_ok}; +} + +sub longest_common_path { + my ($gsv, $globs) = @_; + my %common; + my $common_max = scalar @$gsv; + + foreach my $gs (@$gsv) { + my @tmp = split m#/#, $gs->{path}; + my $p = ''; + foreach (@tmp) { + $p .= length($p) ? "/$_" : $_; + $common{$p} ||= 0; + $common{$p}++; + } + } + $globs ||= []; + $common_max += scalar @$globs; + foreach my $glob (@$globs) { + my @tmp = split m#/#, $glob->{path}->{left}; + my $p = ''; + foreach (@tmp) { + $p .= length($p) ? "/$_" : $_; + $common{$p} ||= 0; + $common{$p}++; + } + } + + my $longest_path = ''; + foreach (sort {length $b <=> length $a} keys %common) { + if ($common{$_} == $common_max) { + $longest_path = $_; + last; + } + } + $longest_path; +} + +sub gs_fetch_loop_common { + my ($self, $base, $head, $gsv, $globs) = @_; + return if ($base > $head); + my $inc = $_log_window_size; + my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc); + my $longest_path = longest_common_path($gsv, $globs); + my $ra_url = $self->{url}; + my $find_trailing_edge; + while (1) { + my %revs; + my $err; + my $err_handler = $SVN::Error::handler; + $SVN::Error::handler = sub { + ($err) = @_; + skip_unknown_revs($err); + }; + sub _cb { + my ($paths, $r, $author, $date, $log) = @_; + [ $paths, + { author => $author, date => $date, log => $log } ]; + } + $self->get_log([$longest_path], $min, $max, 0, 1, 1, + sub { $revs{$_[1]} = _cb(@_) }); + if ($err) { + print "Checked through r$max\r"; + } else { + $find_trailing_edge = 1; + } + if ($err and $find_trailing_edge) { + print STDERR "Path '$longest_path' ", + "was probably deleted:\n", + $err->expanded_message, + "\nWill attempt to follow ", + "revisions r$min .. r$max ", + "committed before the deletion\n"; + my $hi = $max; + while (--$hi >= $min) { + my $ok; + $self->get_log([$longest_path], $min, $hi, + 0, 1, 1, sub { + $ok = $_[1]; + $revs{$_[1]} = _cb(@_) }); + if ($ok) { + print STDERR "r$min .. r$ok OK\n"; + last; + } + } + $find_trailing_edge = 0; + } + $SVN::Error::handler = $err_handler; + + my %exists = map { $_->{path} => $_ } @$gsv; + foreach my $r (sort {$a <=> $b} keys %revs) { + my ($paths, $logged) = @{$revs{$r}}; + + foreach my $gs ($self->match_globs(\%exists, $paths, + $globs, $r)) { + if ($gs->rev_map_max >= $r) { + next; + } + next unless $gs->match_paths($paths, $r); + $gs->{logged_rev_props} = $logged; + if (my $last_commit = $gs->last_commit) { + $gs->assert_index_clean($last_commit); + } + my $log_entry = $gs->do_fetch($paths, $r); + if ($log_entry) { + $gs->do_git_commit($log_entry); + } + $INDEX_FILES{$gs->{index}} = 1; + } + foreach my $g (@$globs) { + my $k = "svn-remote.$g->{remote}." . + "$g->{t}-maxRev"; + Git::SVN::tmp_config($k, $r); + } + if ($ra_invalid) { + $_[0] = undef; + $self = undef; + $RA = undef; + $self = Git::SVN::Ra->new($ra_url); + $ra_invalid = undef; + } + } + # pre-fill the .rev_db since it'll eventually get filled in + # with '0' x40 if something new gets committed + foreach my $gs (@$gsv) { + next if $gs->rev_map_max >= $max; + next if defined $gs->rev_map_get($max); + $gs->rev_map_set($max, 0 x40); + } + foreach my $g (@$globs) { + my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev"; + Git::SVN::tmp_config($k, $max); + } + last if $max >= $head; + $min = $max + 1; + $max += $inc; + $max = $head if ($max > $head); + } + Git::SVN::gc(); +} + +sub get_dir_globbed { + my ($self, $left, $depth, $r) = @_; + + my @x = eval { $self->get_dir($left, $r) }; + return unless scalar @x == 3; + my $dirents = $x[0]; + my @finalents; + foreach my $de (keys %$dirents) { + next if $dirents->{$de}->{kind} != $SVN::Node::dir; + if ($depth > 1) { + my @args = ("$left/$de", $depth - 1, $r); + foreach my $dir ($self->get_dir_globbed(@args)) { + push @finalents, "$de/$dir"; + } + } else { + push @finalents, $de; + } + } + @finalents; +} + +# return value: 0 -- don't ignore, 1 -- ignore +sub is_ref_ignored { + my ($g, $p) = @_; + my $refname = $g->{ref}->full_path($p); + return 1 if defined($g->{ignore_refs_regex}) && + $refname =~ m!$g->{ignore_refs_regex}!; + return 0 unless defined($_ignore_refs_regex); + return 1 if $refname =~ m!$_ignore_refs_regex!o; + return 0; +} + +sub match_globs { + my ($self, $exists, $paths, $globs, $r) = @_; + + sub get_dir_check { + my ($self, $exists, $g, $r) = @_; + + my @dirs = $self->get_dir_globbed($g->{path}->{left}, + $g->{path}->{depth}, + $r); + + foreach my $de (@dirs) { + my $p = $g->{path}->full_path($de); + next if $exists->{$p}; + next if (length $g->{path}->{right} && + ($self->check_path($p, $r) != + $SVN::Node::dir)); + next unless $p =~ /$g->{path}->{regex}/; + $exists->{$p} = Git::SVN->init($self->{url}, $p, undef, + $g->{ref}->full_path($de), 1); + } + } + foreach my $g (@$globs) { + if (my $path = $paths->{"/$g->{path}->{left}"}) { + if ($path->{action} =~ /^[AR]$/) { + get_dir_check($self, $exists, $g, $r); + } + } + foreach (keys %$paths) { + if (/$g->{path}->{left_regex}/ && + !/$g->{path}->{regex}/) { + next if $paths->{$_}->{action} !~ /^[AR]$/; + get_dir_check($self, $exists, $g, $r); + } + next unless /$g->{path}->{regex}/; + my $p = $1; + my $pathname = $g->{path}->full_path($p); + next if is_ref_ignored($g, $p); + next if $exists->{$pathname}; + next if ($self->check_path($pathname, $r) != + $SVN::Node::dir); + $exists->{$pathname} = Git::SVN->init( + $self->{url}, $pathname, undef, + $g->{ref}->full_path($p), 1); + } + my $c = ''; + foreach (split m#/#, $g->{path}->{left}) { + $c .= "/$_"; + next unless ($paths->{$c} && + ($paths->{$c}->{action} =~ /^[AR]$/)); + get_dir_check($self, $exists, $g, $r); + } + } + values %$exists; +} + +sub minimize_url { + my ($self) = @_; + return $self->{url} if ($self->{url} eq $self->{repos_root}); + my $url = $self->{repos_root}; + my @components = split(m!/!, $self->{svn_path}); + my $c = ''; + do { + $url .= "/$c" if length $c; + eval { + my $ra = (ref $self)->new($url); + my $latest = $ra->get_latest_revnum; + $ra->get_log("", $latest, 0, 1, 0, 1, sub {}); + }; + } while ($@ && ($c = shift @components)); + $url; +} + +sub can_do_switch { + my $self = shift; + unless (defined $can_do_switch) { + my $pool = SVN::Pool->new; + my $rep = eval { + $self->do_switch(1, '', 0, $self->{url}, + SVN::Delta::Editor->new, $pool); + }; + if ($@) { + $can_do_switch = 0; + } else { + $rep->abort_report($pool); + $can_do_switch = 1; + } + $pool->clear; + } + $can_do_switch; +} + +sub skip_unknown_revs { + my ($err) = @_; + my $errno = $err->apr_err(); + # Maybe the branch we're tracking didn't + # exist when the repo started, so it's + # not an error if it doesn't, just continue + # + # Wonderfully consistent library, eh? + # 160013 - svn:// and file:// + # 175002 - http(s):// + # 175007 - http(s):// (this repo required authorization, too...) + # More codes may be discovered later... + if ($errno == 175007 || $errno == 175002 || $errno == 160013) { + my $err_key = $err->expanded_message; + # revision numbers change every time, filter them out + $err_key =~ s/\d+/\0/g; + $err_key = "$errno\0$err_key"; + unless ($ignored_err{$err_key}) { + warn "W: Ignoring error from SVN, path probably ", + "does not exist: ($errno): ", + $err->expanded_message,"\n"; + warn "W: Do not be alarmed at the above message ", + "git-svn is just searching aggressively for ", + "old history.\n", + "This may take a while on large repositories\n"; + $ignored_err{$err_key} = 1; + } + return; + } + die "Error from SVN, ($errno): ", $err->expanded_message,"\n"; +} + +package Git::SVN::Log; +use strict; +use warnings; +use POSIX qw/strftime/; +use constant commit_log_separator => ('-' x 72) . "\n"; +use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline + %rusers $show_commit $incremental/; +my $l_fmt; + +sub cmt_showable { + my ($c) = @_; + return 1 if defined $c->{r}; + + # big commit message got truncated by the 16k pretty buffer in rev-list + if ($c->{l} && $c->{l}->[-1] eq "...\n" && + $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) { + @{$c->{l}} = (); + my @log = command(qw/cat-file commit/, $c->{c}); + + # shift off the headers + shift @log while ($log[0] ne ''); + shift @log; + + # TODO: make $c->{l} not have a trailing newline in the future + @{$c->{l}} = map { "$_\n" } grep !/^git-svn-id: /, @log; + + (undef, $c->{r}, undef) = ::extract_metadata( + (grep(/^git-svn-id: /, @log))[-1]); + } + return defined $c->{r}; +} + +sub log_use_color { + return $color || Git->repository->get_colorbool('color.diff'); +} + +sub git_svn_log_cmd { + my ($r_min, $r_max, @args) = @_; + my $head = 'HEAD'; + my (@files, @log_opts); + foreach my $x (@args) { + if ($x eq '--' || @files) { + push @files, $x; + } else { + if (::verify_ref("$x^0")) { + $head = $x; + } else { + push @log_opts, $x; + } + } + } + + my ($url, $rev, $uuid, $gs) = ::working_head_info($head); + $gs ||= Git::SVN->_new; + my @cmd = (qw/log --abbrev-commit --pretty=raw --default/, + $gs->refname); + push @cmd, '-r' unless $non_recursive; + push @cmd, qw/--raw --name-status/ if $verbose; + push @cmd, '--color' if log_use_color(); + push @cmd, @log_opts; + if (defined $r_max && $r_max == $r_min) { + push @cmd, '--max-count=1'; + if (my $c = $gs->rev_map_get($r_max)) { + push @cmd, $c; + } + } elsif (defined $r_max) { + if ($r_max < $r_min) { + ($r_min, $r_max) = ($r_max, $r_min); + } + my (undef, $c_max) = $gs->find_rev_before($r_max, 1, $r_min); + my (undef, $c_min) = $gs->find_rev_after($r_min, 1, $r_max); + # If there are no commits in the range, both $c_max and $c_min + # will be undefined. If there is at least 1 commit in the + # range, both will be defined. + return () if !defined $c_min || !defined $c_max; + if ($c_min eq $c_max) { + push @cmd, '--max-count=1', $c_min; + } else { + push @cmd, '--boundary', "$c_min..$c_max"; + } + } + return (@cmd, @files); +} + +# adapted from pager.c +sub config_pager { + if (! -t *STDOUT) { + $ENV{GIT_PAGER_IN_USE} = 'false'; + $pager = undef; + return; + } + chomp($pager = command_oneline(qw(var GIT_PAGER))); + if ($pager eq 'cat') { + $pager = undef; + } + $ENV{GIT_PAGER_IN_USE} = defined($pager); +} + +sub run_pager { + return unless defined $pager; + pipe my ($rfd, $wfd) or return; + defined(my $pid = fork) or ::fatal "Can't fork: $!"; + if (!$pid) { + open STDOUT, '>&', $wfd or + ::fatal "Can't redirect to stdout: $!"; + return; + } + open STDIN, '<&', $rfd or ::fatal "Can't redirect stdin: $!"; + $ENV{LESS} ||= 'FRSX'; + exec $pager or ::fatal "Can't run pager: $! ($pager)"; +} + +sub format_svn_date { + my $t = shift || time; + my $gmoff = Git::SVN::get_tz($t); + return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t)); +} + +sub parse_git_date { + my ($t, $tz) = @_; + # Date::Parse isn't in the standard Perl distro :( + if ($tz =~ s/^\+//) { + $t += tz_to_s_offset($tz); + } elsif ($tz =~ s/^\-//) { + $t -= tz_to_s_offset($tz); + } + return $t; +} + +sub set_local_timezone { + if (defined $TZ) { + $ENV{TZ} = $TZ; + } else { + delete $ENV{TZ}; + } +} + +sub tz_to_s_offset { + my ($tz) = @_; + $tz =~ s/(\d\d)$//; + return ($1 * 60) + ($tz * 3600); +} + +sub get_author_info { + my ($dest, $author, $t, $tz) = @_; + $author =~ s/(?:^\s*|\s*$)//g; + $dest->{a_raw} = $author; + my $au; + if ($::_authors) { + $au = $rusers{$author} || undef; + } + if (!$au) { + ($au) = ($author =~ /<([^>]+)\@[^>]+>$/); + } + $dest->{t} = $t; + $dest->{tz} = $tz; + $dest->{a} = $au; + $dest->{t_utc} = parse_git_date($t, $tz); +} + +sub process_commit { + my ($c, $r_min, $r_max, $defer) = @_; + if (defined $r_min && defined $r_max) { + if ($r_min == $c->{r} && $r_min == $r_max) { + show_commit($c); + return 0; + } + return 1 if $r_min == $r_max; + if ($r_min < $r_max) { + # we need to reverse the print order + return 0 if (defined $limit && --$limit < 0); + push @$defer, $c; + return 1; + } + if ($r_min != $r_max) { + return 1 if ($r_min < $c->{r}); + return 1 if ($r_max > $c->{r}); + } + } + return 0 if (defined $limit && --$limit < 0); + show_commit($c); + return 1; +} + +sub show_commit { + my $c = shift; + if ($oneline) { + my $x = "\n"; + if (my $l = $c->{l}) { + while ($l->[0] =~ /^\s*$/) { shift @$l } + $x = $l->[0]; + } + $l_fmt ||= 'A' . length($c->{r}); + print 'r',pack($l_fmt, $c->{r}),' | '; + print "$c->{c} | " if $show_commit; + print $x; + } else { + show_commit_normal($c); + } +} + +sub show_commit_changed_paths { + my ($c) = @_; + return unless $c->{changed}; + print "Changed paths:\n", @{$c->{changed}}; +} + +sub show_commit_normal { + my ($c) = @_; + print commit_log_separator, "r$c->{r} | "; + print "$c->{c} | " if $show_commit; + print "$c->{a} | ", format_svn_date($c->{t_utc}), ' | '; + my $nr_line = 0; + + if (my $l = $c->{l}) { + while ($l->[$#$l] eq "\n" && $#$l > 0 + && $l->[($#$l - 1)] eq "\n") { + pop @$l; + } + $nr_line = scalar @$l; + if (!$nr_line) { + print "1 line\n\n\n"; + } else { + if ($nr_line == 1) { + $nr_line = '1 line'; + } else { + $nr_line .= ' lines'; + } + print $nr_line, "\n"; + show_commit_changed_paths($c); + print "\n"; + print $_ foreach @$l; + } + } else { + print "1 line\n"; + show_commit_changed_paths($c); + print "\n"; + + } + foreach my $x (qw/raw stat diff/) { + if ($c->{$x}) { + print "\n"; + print $_ foreach @{$c->{$x}} + } + } +} + +sub cmd_show_log { + my (@args) = @_; + my ($r_min, $r_max); + my $r_last = -1; # prevent dupes + set_local_timezone(); + if (defined $::_revision) { + if ($::_revision =~ /^(\d+):(\d+)$/) { + ($r_min, $r_max) = ($1, $2); + } elsif ($::_revision =~ /^\d+$/) { + $r_min = $r_max = $::_revision; + } else { + ::fatal "-r$::_revision is not supported, use ", + "standard 'git log' arguments instead"; + } + } + + config_pager(); + @args = git_svn_log_cmd($r_min, $r_max, @args); + if (!@args) { + print commit_log_separator unless $incremental || $oneline; + return; + } + my $log = command_output_pipe(@args); + run_pager(); + my (@k, $c, $d, $stat); + my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; + while (<$log>) { + if (/^${esc_color}commit (?:- )?($::sha1_short)/o) { + my $cmt = $1; + if ($c && cmt_showable($c) && $c->{r} != $r_last) { + $r_last = $c->{r}; + process_commit($c, $r_min, $r_max, \@k) or + goto out; + } + $d = undef; + $c = { c => $cmt }; + } elsif (/^${esc_color}author (.+) (\d+) ([\-\+]?\d+)$/o) { + get_author_info($c, $1, $2, $3); + } elsif (/^${esc_color}(?:tree|parent|committer) /o) { + # ignore + } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) { + push @{$c->{raw}}, $_; + } elsif (/^${esc_color}[ACRMDT]\t/) { + # we could add $SVN->{svn_path} here, but that requires + # remote access at the moment (repo_path_split)... + s#^(${esc_color})([ACRMDT])\t#$1 $2 #o; + push @{$c->{changed}}, $_; + } elsif (/^${esc_color}diff /o) { + $d = 1; + push @{$c->{diff}}, $_; + } elsif ($d) { + push @{$c->{diff}}, $_; + } elsif (/^\ .+\ \|\s*\d+\ $esc_color[\+\-]* + $esc_color*[\+\-]*$esc_color$/x) { + $stat = 1; + push @{$c->{stat}}, $_; + } elsif ($stat && /^ \d+ files changed, \d+ insertions/) { + push @{$c->{stat}}, $_; + $stat = undef; + } elsif (/^${esc_color} (git-svn-id:.+)$/o) { + ($c->{url}, $c->{r}, undef) = ::extract_metadata($1); + } elsif (s/^${esc_color} //o) { + push @{$c->{l}}, $_; + } + } + if ($c && defined $c->{r} && $c->{r} != $r_last) { + $r_last = $c->{r}; + process_commit($c, $r_min, $r_max, \@k); + } + if (@k) { + ($r_min, $r_max) = ($r_max, $r_min); + process_commit($_, $r_min, $r_max) foreach reverse @k; + } +out: + close $log; + print commit_log_separator unless $incremental || $oneline; +} + +sub cmd_blame { + my $path = pop; + + config_pager(); + run_pager(); + + my ($fh, $ctx, $rev); + + if ($_git_format) { + ($fh, $ctx) = command_output_pipe('blame', @_, $path); + while (my $line = <$fh>) { + if ($line =~ /^\^?([[:xdigit:]]+)\s/) { + # Uncommitted edits show up as a rev ID of + # all zeros, which we can't look up with + # cmt_metadata + if ($1 !~ /^0+$/) { + (undef, $rev, undef) = + ::cmt_metadata($1); + $rev = '0' if (!$rev); + } else { + $rev = '0'; + } + $rev = sprintf('%-10s', $rev); + $line =~ s/^\^?[[:xdigit:]]+(\s)/$rev$1/; + } + print $line; + } + } else { + ($fh, $ctx) = command_output_pipe('blame', '-p', @_, 'HEAD', + '--', $path); + my ($sha1); + my %authors; + my @buffer; + my %dsha; #distinct sha keys + + while (my $line = <$fh>) { + push @buffer, $line; + if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) { + $dsha{$1} = 1; + } + } + + my $s2r = ::cmt_sha2rev_batch([keys %dsha]); + + foreach my $line (@buffer) { + if ($line =~ /^([[:xdigit:]]{40})\s\d+\s\d+/) { + $rev = $s2r->{$1}; + $rev = '0' if (!$rev) + } + elsif ($line =~ /^author (.*)/) { + $authors{$rev} = $1; + $authors{$rev} =~ s/\s/_/g; + } + elsif ($line =~ /^\t(.*)$/) { + printf("%6s %10s %s\n", $rev, $authors{$rev}, $1); + } + } + } + command_close_pipe($fh, $ctx); +} + +package Git::SVN::Migration; +# these version numbers do NOT correspond to actual version numbers +# of git nor git-svn. They are just relative. +# +# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD +# +# v1 layout: .git/$id/info/url, refs/remotes/$id +# +# v2 layout: .git/svn/$id/info/url, refs/remotes/$id +# +# v3 layout: .git/svn/$id, refs/remotes/$id +# - info/url may remain for backwards compatibility +# - this is what we migrate up to this layout automatically, +# - this will be used by git svn init on single branches +# v3.1 layout (auto migrated): +# - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink +# for backwards compatibility +# +# v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id +# - this is only created for newly multi-init-ed +# repositories. Similar in spirit to the +# --use-separate-remotes option in git-clone (now default) +# - we do not automatically migrate to this (following +# the example set by core git) +# +# v5 layout: .rev_db.$UUID => .rev_map.$UUID +# - newer, more-efficient format that uses 24-bytes per record +# with no filler space. +# - use xxd -c24 < .rev_map.$UUID to view and debug +# - This is a one-way migration, repositories updated to the +# new format will not be able to use old git-svn without +# rebuilding the .rev_db. Rebuilding the rev_db is not +# possible if noMetadata or useSvmProps are set; but should +# be no problem for users that use the (sensible) defaults. +use strict; +use warnings; +use Carp qw/croak/; +use File::Path qw/mkpath/; +use File::Basename qw/dirname basename/; +use vars qw/$_minimize/; + +sub migrate_from_v0 { + my $git_dir = $ENV{GIT_DIR}; + return undef unless -d $git_dir; + my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/); + my $migrated = 0; + while (<$fh>) { + chomp; + my ($id, $orig_ref) = ($_, $_); + next unless $id =~ s#^refs/heads/(.+)-HEAD$#$1#; + next unless -f "$git_dir/$id/info/url"; + my $new_ref = "refs/remotes/$id"; + if (::verify_ref("$new_ref^0")) { + print STDERR "W: $orig_ref is probably an old ", + "branch used by an ancient version of ", + "git-svn.\n", + "However, $new_ref also exists.\n", + "We will not be able ", + "to use this branch until this ", + "ambiguity is resolved.\n"; + next; + } + print STDERR "Migrating from v0 layout...\n" if !$migrated; + print STDERR "Renaming ref: $orig_ref => $new_ref\n"; + command_noisy('update-ref', $new_ref, $orig_ref); + command_noisy('update-ref', '-d', $orig_ref, $orig_ref); + $migrated++; + } + command_close_pipe($fh, $ctx); + print STDERR "Done migrating from v0 layout...\n" if $migrated; + $migrated; +} + +sub migrate_from_v1 { + my $git_dir = $ENV{GIT_DIR}; + my $migrated = 0; + return $migrated unless -d $git_dir; + my $svn_dir = "$git_dir/svn"; + + # just in case somebody used 'svn' as their $id at some point... + return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url"; + + print STDERR "Migrating from a git-svn v1 layout...\n"; + mkpath([$svn_dir]); + print STDERR "Data from a previous version of git-svn exists, but\n\t", + "$svn_dir\n\t(required for this version ", + "($::VERSION) of git-svn) does not exist.\n"; + my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/); + while (<$fh>) { + my $x = $_; + next unless $x =~ s#^refs/remotes/##; + chomp $x; + next unless -f "$git_dir/$x/info/url"; + my $u = eval { ::file_to_s("$git_dir/$x/info/url") }; + next unless $u; + my $dn = dirname("$git_dir/svn/$x"); + mkpath([$dn]) unless -d $dn; + if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID: + mkpath(["$git_dir/svn/svn"]); + print STDERR " - $git_dir/$x/info => ", + "$git_dir/svn/$x/info\n"; + rename "$git_dir/$x/info", "$git_dir/svn/$x/info" or + croak "$!: $x"; + # don't worry too much about these, they probably + # don't exist with repos this old (save for index, + # and we can easily regenerate that) + foreach my $f (qw/unhandled.log index .rev_db/) { + rename "$git_dir/$x/$f", "$git_dir/svn/$x/$f"; + } + } else { + print STDERR " - $git_dir/$x => $git_dir/svn/$x\n"; + rename "$git_dir/$x", "$git_dir/svn/$x" or + croak "$!: $x"; + } + $migrated++; + } + command_close_pipe($fh, $ctx); + print STDERR "Done migrating from a git-svn v1 layout\n"; + $migrated; +} + +sub read_old_urls { + my ($l_map, $pfx, $path) = @_; + my @dir; + foreach (<$path/*>) { + if (-r "$_/info/url") { + $pfx .= '/' if $pfx && $pfx !~ m!/$!; + my $ref_id = $pfx . basename $_; + my $url = ::file_to_s("$_/info/url"); + $l_map->{$ref_id} = $url; + } elsif (-d $_) { + push @dir, $_; + } + } + foreach (@dir) { + my $x = $_; + $x =~ s!^\Q$ENV{GIT_DIR}\E/svn/!!o; + read_old_urls($l_map, $x, $_); + } +} + +sub migrate_from_v2 { + my @cfg = command(qw/config -l/); + return if grep /^svn-remote\..+\.url=/, @cfg; + my %l_map; + read_old_urls(\%l_map, '', "$ENV{GIT_DIR}/svn"); + my $migrated = 0; + + foreach my $ref_id (sort keys %l_map) { + eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) }; + if ($@) { + Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id); + } + $migrated++; + } + $migrated; +} + +sub minimize_connections { + my $r = Git::SVN::read_all_remotes(); + my $new_urls = {}; + my $root_repos = {}; + foreach my $repo_id (keys %$r) { + my $url = $r->{$repo_id}->{url} or next; + my $fetch = $r->{$repo_id}->{fetch} or next; + my $ra = Git::SVN::Ra->new($url); + + # skip existing cases where we already connect to the root + if (($ra->{url} eq $ra->{repos_root}) || + ($ra->{repos_root} eq $repo_id)) { + $root_repos->{$ra->{url}} = $repo_id; + next; + } + + my $root_ra = Git::SVN::Ra->new($ra->{repos_root}); + my $root_path = $ra->{url}; + $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##; + foreach my $path (keys %$fetch) { + my $ref_id = $fetch->{$path}; + my $gs = Git::SVN->new($ref_id, $repo_id, $path); + + # make sure we can read when connecting to + # a higher level of a repository + my ($last_rev, undef) = $gs->last_rev_commit; + if (!defined $last_rev) { + $last_rev = eval { + $root_ra->get_latest_revnum; + }; + next if $@; + } + my $new = $root_path; + $new .= length $path ? "/$path" : ''; + eval { + $root_ra->get_log([$new], $last_rev, $last_rev, + 0, 0, 1, sub { }); + }; + next if $@; + $new_urls->{$ra->{repos_root}}->{$new} = + { ref_id => $ref_id, + old_repo_id => $repo_id, + old_path => $path }; + } + } + + my @emptied; + foreach my $url (keys %$new_urls) { + # see if we can re-use an existing [svn-remote "repo_id"] + # instead of creating a(n ugly) new section: + my $repo_id = $root_repos->{$url} || $url; + + my $fetch = $new_urls->{$url}; + foreach my $path (keys %$fetch) { + my $x = $fetch->{$path}; + Git::SVN->init($url, $path, $repo_id, $x->{ref_id}); + my $pfx = "svn-remote.$x->{old_repo_id}"; + + my $old_fetch = quotemeta("$x->{old_path}:". + "$x->{ref_id}"); + command_noisy(qw/config --unset/, + "$pfx.fetch", '^'. $old_fetch . '$'); + delete $r->{$x->{old_repo_id}}-> + {fetch}->{$x->{old_path}}; + if (!keys %{$r->{$x->{old_repo_id}}->{fetch}}) { + command_noisy(qw/config --unset/, + "$pfx.url"); + push @emptied, $x->{old_repo_id} + } + } + } + if (@emptied) { + my $file = $ENV{GIT_CONFIG} || "$ENV{GIT_DIR}/config"; + print STDERR < $gui, ctx => $ctx, nr => 0}, $class; +} + +sub remove { + my ($self, $path) = @_; + if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") { + return ++$self->{nr}; + } + undef; +} + +sub update { + my ($self, $mode, $hash, $path) = @_; + if (print { $self->{gui} } $mode, ' ', $hash, "\t", $path, "\0") { + return ++$self->{nr}; + } + undef; +} + +sub DESTROY { + my ($self) = @_; + command_close_pipe($self->{gui}, $self->{ctx}); +} + +package Git::SVN::GlobSpec; +use strict; +use warnings; + +sub new { + my ($class, $glob, $pattern_ok) = @_; + my $re = $glob; + $re =~ s!/+$!!g; # no need for trailing slashes + my (@left, @right, @patterns); + my $state = "left"; + my $die_msg = "Only one set of wildcard directories " . + "(e.g. '*' or '*/*/*') is supported: '$glob'\n"; + for my $part (split(m|/|, $glob)) { + if ($part =~ /\*/ && $part ne "*") { + die "Invalid pattern in '$glob': $part\n"; + } elsif ($pattern_ok && $part =~ /[{}]/ && + $part !~ /^\{[^{}]+\}/) { + die "Invalid pattern in '$glob': $part\n"; + } + if ($part eq "*") { + die $die_msg if $state eq "right"; + $state = "pattern"; + push(@patterns, "[^/]*"); + } elsif ($pattern_ok && $part =~ /^\{(.*)\}$/) { + die $die_msg if $state eq "right"; + $state = "pattern"; + my $p = quotemeta($1); + $p =~ s/\\,/|/g; + push(@patterns, "(?:$p)"); + } else { + if ($state eq "left") { + push(@left, $part); + } else { + push(@right, $part); + $state = "right"; + } + } + } + my $depth = @patterns; + if ($depth == 0) { + die "One '*' is needed in glob: '$glob'\n"; + } + my $left = join('/', @left); + my $right = join('/', @right); + $re = join('/', @patterns); + $re = join('\/', + grep(length, quotemeta($left), "($re)", quotemeta($right))); + my $left_re = qr/^\/\Q$left\E(\/|$)/; + bless { left => $left, right => $right, left_regex => $left_re, + regex => qr/$re/, glob => $glob, depth => $depth }, $class; +} + +sub full_path { + my ($self, $path) = @_; + return (length $self->{left} ? "$self->{left}/" : '') . + $path . (length $self->{right} ? "/$self->{right}" : ''); +} + +__END__ + +Data structures: + + +$remotes = { # returned by read_all_remotes() + 'svn' => { + # svn-remote.svn.url=https://svn.musicpd.org + url => 'https://svn.musicpd.org', + # svn-remote.svn.fetch=mpd/trunk:trunk + fetch => { + 'mpd/trunk' => 'trunk', + }, + # svn-remote.svn.tags=mpd/tags/*:tags/* + tags => { + path => { + left => 'mpd/tags', + right => '', + regex => qr!mpd/tags/([^/]+)$!, + glob => 'tags/*', + }, + ref => { + left => 'tags', + right => '', + regex => qr!tags/([^/]+)$!, + glob => 'tags/*', + }, + } + } +}; + +$log_entry hashref as returned by libsvn_log_entry() +{ + log => 'whitespace-formatted log entry +', # trailing newline is preserved + revision => '8', # integer + date => '2004-02-24T17:01:44.108345Z', # commit date + author => 'committer name' +}; + + +# this is generated by generate_diff(); +@mods = array of diff-index line hashes, each element represents one line + of diff-index output + +diff-index line ($m hash) +{ + mode_a => first column of diff-index output, no leading ':', + mode_b => second column of diff-index output, + sha1_b => sha1sum of the final blob, + chg => change type [MCRADT], + file_a => original file name of a file (iff chg is 'C' or 'R') + file_b => new/current file name of a file (any chg) +} +; + +# retval of read_url_paths{,_all}(); +$l_map = { + # repository root url + 'https://svn.musicpd.org' => { + # repository path # GIT_SVN_ID + 'mpd/trunk' => 'trunk', + 'mpd/tags/0.11.5' => 'tags/0.11.5', + }, +} + +Notes: + I don't trust the each() function on unless I created %hash myself + because the internal iterator may not have started at base. --- git-1.7.10.4.orig/debian/changelog +++ git-1.7.10.4/debian/changelog @@ -0,0 +1,2776 @@ +git (1:1.7.10.4-1+wheezy6+rpi1) wheezy-staging; urgency=medium + + [changes brought forward from 1:1.7.10.4-1+wheezy1+rpi1 by Peter Michael Green at Sun, 25 Nov 2012 13:13:58 +0000] + * Disable testsuite + + [changes brought forward from 1:1.7.10.4-1+wheezy1+rpi2 by Peter Michael Green at Sun, 14 Apr 2013 13:54:01 +0000] + * Adopt patches from sid version 1:1.7.10.4-2 for new subversion, renumber + them to high numbers so they stay at the end of the list in the face of + future wheezy changes. + * 0113...0130: new from the upstream 'master' branch: git svn: + adapt to svn 1.7 changes: + * normalize paths and URLs passed to Subversion (thx Michael G. + Schwern; closes: #678137) + * use correct "svn cp" syntax when checking git svn's mangling + of @-signs in branch names (svn became stricter). + * commit filetype changes between a regular file and symlink as + replacement (deletion followed by addition) instead of + modification of files. Otherwise, clients pulling the change + with "svn update" hit an assertion failure (svn issue 4091). + * Renable testsuite + + -- Raspbian forward porter Tue, 03 Oct 2017 01:50:14 +0000 + +git (1:1.7.10.4-1+wheezy6) wheezy-security; urgency=high + + * Non-maintainer upload by the LTS Security Team. + * Fix CVE-2017-14867: Git uses unsafe Perl scripts to support + subcommands such as cvsserver, which allows attackers to execute + arbitrary OS commands via shell metacharacters in a module name. The + vulnerable code is reachable via git-shell even without CVS + support. (Closes: #876854) + + -- Antoine Beaupré Mon, 02 Oct 2017 15:47:26 -0400 + +git (1:1.7.10.4-1+wheezy5) wheezy-security; urgency=high + + * Non-maintainer upload by the LTS team. + * Fix CVE-2017-1000117, arbitrary code execution issues via URLs: + - reject ssh hostname that begins with a dash + - factor out "looks like command line option" check + - reject dashed arguments to $GIT_PROXY_COMMAND + - ssh:// and local URLs: reject path to repositories that look like + command line options + + -- Markus Koschany Sun, 27 Aug 2017 15:51:22 +0200 + +git (1:1.7.10.4-1+wheezy4) wheezy-security; urgency=high + + * Non-maintainer upload by the LTS team. + * Fix CVE-2017-8386: + Timo Schmid of ERNW GmbH discovered that the Git git-shell, a restricted + login shell for Git-only SSH access, allows a user to run an interactive + pager by causing it to spawn "git upload-pack --help". + + -- Markus Koschany Wed, 10 May 2017 18:40:45 +0200 + +git (1:1.7.10.4-1+wheezy3) wheezy-security; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix remote code execution via buffer overflows (CVE-2016-2315, + CVE-2016-2324) (Closes: #818318) + + -- Salvatore Bonaccorso Thu, 17 Mar 2016 21:48:34 +0100 + +git (1:1.7.10.4-1+wheezy2) wheezy-security; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix CVE-2015-7545, arbitrary code execution issues via URLs with: + - 0016-CVE-2015-7545-backport1.patch: add function + string_list_append_nodup() + - 0017-CVE-2015-7545-backport2.patch: add two new functions for splitting + strings + - 0018-CVE-2015-7545-1.patch: add a protocol-whitelist environment + variable + - 0019-CVE-2015-7545-2.patch: allow only certain protocols for submodule + fetches + - 0020-CVE-2015-7545-3.patch: refactor protocol whitelist code + - 0021-CVE-2015-7545-4.patch: limit redirection to protocol-whitelist + - 0022-CVE-2015-7545-5.patch: limit redirection depth + * Make new tests executable. + + -- Laszlo Boszormenyi (GCS) Thu, 17 Dec 2015 20:19:24 +0100 + +git (1:1.7.10.4-1+wheezy1) testing; urgency=low + + * debian/diff/0013-git-svn-use-YAML-format-...diff: new from 1.7.11: + git svn: use YAML format for mergeinfo cache when possible. + * debian/control: git-svn: Depends: libyaml-perl for platform- and + version-independent .git/svn/.caches format; Build-Depends: + libyaml-perl for tests (thx Tim Retout for the analysis; closes: + #587650). + + -- Jonathan Nieder Sun, 18 Nov 2012 11:45:41 -0800 + +git (1:1.7.10.4-1) unstable; urgency=low + + * new upstream point release (thx Jonathan Nieder). + + -- Gerrit Pape Fri, 08 Jun 2012 00:04:11 +0000 + +git (1:1.7.10.2-1) unstable; urgency=low + + * new upstream point release. + * merge-recursive: don't detect renames of empty files. + * fast-import: tighten parsing of datarefs. + * diff -c -U0: fix segfault showing start of file. + * debian/rules: do not install preliminary German translation. + + -- Jonathan Nieder Fri, 11 May 2012 20:20:15 -0500 + +git (1:1.7.10-1) unstable; urgency=low + + * new upstream release. + * merge: use editor by default in interactive sessions + * submodules: use relative paths to git dir and worktree. + * fast-import: reject "ls" of path with empty components. + * cli: add Chinese, Dutch, Portuguese, and Swedish translations. + * am: officially deprecate -b/--binary option. + * debian/diff: + * 0005-gitk-use-symbolic-font-names-sans-and-monospace-when-.diff, + 0006-gitk-Skip-over-AUTHOR-COMMIT_DATE-when-searching-all-.diff: + remove; applied upstream. + * 0007...0014: rename to 0005-*, ... 0012-*. + * debian/git.README.Debian: make paths in inetd(8) hint + consistent with git-daemon-run and git-daemon-sysvinit setup. + * debian/control: package git: Suggests: gettext-base for translated + output in shell scripts. + + -- Jonathan Nieder Fri, 06 Apr 2012 22:28:18 -0500 + +git (1:1.7.9.5-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-daemon-sysvinit: Priority: extra (thx Jonathan + Nieder; closes: #661317). + + -- Gerrit Pape Wed, 28 Mar 2012 12:30:35 +0000 + +git (1:1.7.9.4-1) unstable; urgency=low + + * new upstream point release. + * commit: skip intent-to-add entries instead of erroring out. + * grep -I: let diff attribute override binary file detection. + * clone, daemon, http-backend, transport: look for .../foo before + .../foo.git in response to requests for .../foo. + * rev-list: enable or disable --verify-objects behavior based on + the command line instead of uninitialized memory. + * checkout -b: allow switching out of an unborn branch (closes: + #506480). + * debian/diff: clean up patches for upstream. + * 0001-hooks-post-receive-email-set-encoding-to-utf-8.diff: + hooks/post-receive-email: set content-transfer-encoding as well. + * 0002-post-receive-email-defend-against-non-utf8-...diff: new; + hooks/post-receive-email: avoid mixed-encoding messages when + i18n.logoutputencoding is not utf8 (thx Alexey Shumkin). + * 0002-remove-shebang-...diff: rename to 0003-remove-...diff; + remove #! line from sh-i18n and rebase--* shell libraries, too + (lintian); fix tests' --valgrind support to detect shell + libraries without the #! line (thx Jeff King). + * 0003-pre-rebase-hook-capture-...diff: simplify (thx Junio C + Hamano); rename to 0004-*. + * 0004-gitk-use-symbolic-font-names-...diff: rename to 0005-*; use + non-symbolic font names on platforms like Mac OS X, Windows, and + tk <= 8.4 that lack fontconfig support. + * 0005...0008, 0010: rename to 0006-*, ..., 0009-*, 0011-*; + clarify descriptions. + * 0009-tcp-unify-ipv4-and-ipv6-code-paths.diff, 0011-*: combine; + rename to 0010-*. + * 0012-transport-optionally-honor-DNS-SRV-records.diff, 0013-*: + combine; rename to 0011-*. + * 0014, 0015: rename to 0013-*, 0014-*. + * debian/git-daemon.init: respect GIT_DAEMON_ENABLE in restart and + reload actions (thx Jonathan McCrohan; closes: #663522). + * debian/control: git-gui: point to aspell for spell checking support + in the package description; Suggests: aspell (thx Jonathan Ballet, + closes: #656061). + * debian/control: add Vcs-Browser: http://repo.or.cz/w/git/debian.git + (thx Jonathan McCrohan; closes: #663451). + * debian/control: Standards-Version: 3.9.3.1. + * debian/copyright: adopt copyright-format 1.0. + + -- Jonathan Nieder Wed, 14 Mar 2012 02:40:00 -0500 + +git (1:1.7.9.1-1) unstable; urgency=low + + * new upstream point release. + * merge: do not launch an editor on "--no-edit $tag" (thx Guido + Günther; closes: #659255). + + -- Jonathan Nieder Tue, 14 Feb 2012 15:32:48 -0600 + +git (1:1.7.9-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release (closes: #657262). + * debian/diff/0016-unix-socket-handle-long-socket-...diff: remove; + applied upstream. + * debian/changelog: add missing parenthesis to 1:1.7.9~rc1-1 entry. + + -- Jonathan Nieder Fri, 27 Jan 2012 21:23:27 -0600 + +git (1:1.7.9~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff: + * 0014-Makefile-add-a-knob-to-...diff: rename to 0015-*. + * 0014-srv-be-more-tolerant-of-broken-DNS-replies.diff: new; srv: + convert some error conditions to warnings (closes: #649781). + * 0016-unix-socket-handle-long-socket-pathnames.diff: new from + upstream; credential-cache: handle long socket pathnames (closes: + #655288). + + -- Jonathan Nieder Fri, 13 Jan 2012 16:10:44 -0600 + +git (1:1.7.9~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * update debian/copyright. + + -- Jonathan Nieder Fri, 06 Jan 2012 17:06:55 -0600 + +git (1:1.7.8.3-1) unstable; urgency=medium + + * new upstream point release. + * debian/git.preinst: on upgrade from git <= 1:1.7.7-1, replace + /usr/lib/git-core/git with a copy of itself. This prevents "are the + same file" errors when replacing hard links to the old copy with + symlinks using "mv" (thx Jon Dowland and Anders Kaseorg; closes: + #654596). + + -- Jonathan Nieder Fri, 06 Jan 2012 16:45:46 -0600 + +git (1:1.7.8.2-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + + -- Jonathan Nieder Thu, 29 Dec 2011 01:30:43 -0600 + +git (1:1.7.8~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Fri, 18 Nov 2011 04:09:51 -0600 + +git (1:1.7.8~rc2-1) experimental; urgency=low + + [ Jonathan Nieder ] + * new upstream release candidate. + * merge branch debian-sid. + * update debian/copyright. + * debian/git.preinst: replace hard links to /usr/lib/git-core/git with + symlinks before upgrading from git <= 1:1.7.7-1 (thx Antti Kultanen; + closes: #645009). + + [ Gerrit Pape ] + * merge branch debian-sid. + + -- Gerrit Pape Wed, 16 Nov 2011 09:55:47 +0000 + +git (1:1.7.7.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 14 Nov 2011 10:22:34 +0000 + +git (1:1.7.7.2-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: add separate build-arch and build-indep targets + (thx Roger Leigh for suggesting it through lintian). + * debian/rules: drop CFLAGS=-O0 workaround for ancient hppa code + generation bug (see #426302). + * debian/rules: use dpkg-buildflags to retrieve compiler flags + (including hardening options). Build-Depends: dpkg-dev (>= 1.15.7). + + -- Jonathan Nieder Tue, 01 Nov 2011 23:41:55 -0500 + +git (1:1.7.8~rc0-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/diff/0001-...diff, 0002-...diff, 0003-...diff: remove; + applied upstream (thx Jonathan Nieder). + + -- Gerrit Pape Mon, 31 Oct 2011 09:45:53 +0000 + +git (1:1.7.7.1-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0003-Makefile-do-not-set-setgid-bit-on-dir...diff: + remove; applied upstream. + + -- Gerrit Pape Mon, 24 Oct 2011 20:27:20 +0000 + +git (1:1.7.7-2) unstable; urgency=low + + [ Jonathan Nieder ] + * debian/git.postinst: check if /usr/share/doc/git/contrib/hooks is a + symlink before changing it to one (thx Євгеній Мещеряков; closes: + #645005). + * debian/diff: + * 0001-ident-check-etc-mailname-if-author-email-is-unknown.diff, + 0007-Makefile-do-not-use-setgid-bit-on-...diff: remove; obsolete. + * 0002...0006, 0008...0015: rename to 0005-*, ..., 0017-*. + * 0001...0004: new from the upstream 'master' branch: + * ident: check /etc/mailname if email is unknown + * ident: do not retrieve default ident when unnecessary + * init --shared: do not set setgid bit on directories on + GNU/kFreeBSD + * Makefile: fix permissions of mergetools/ when building from + source extracted with permissive umask + * 0018-Makefile-add-a-knob-to-turn-off-hardlinks-...diff: new; + Makefile: add a knob to disable hardlinks within bindir and + gitexecdir. + * debian/rules: add NO_HARDLINKS=1 to OPTS (thx Bastian Blank; + closes: #642603). + * debian/rules: do not rely on umask to set contrib permissions. + * update debian/copyright. + * debian/watch, debian/copyright: point to code.google.com for now. + The upstream tarballs haven't been added back to kernel.org yet. + * debian/changelog.upstream, debian/versions.upstream: include + v1.7.6.4. + + [ Simon Chopin ] + * debian/git.postinst: fix fresh install contrib/hooks cleaning + (#645005). + + -- Gerrit Pape Thu, 13 Oct 2011 00:04:49 +0000 + +git (1:1.7.7-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + * debian/rules, debian/git.postinst: move contrib hooks from + /usr/share/doc/git-core/ into /usr/share/git-core/; provide symlink + for backward compatibility (closes: #640949). + + -- Gerrit Pape Sun, 09 Oct 2011 21:00:07 +0000 + +git (1:1.7.7~rc1-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/rules: git: skip directories in /usr/lib/git-core/ and + /usr/bin/ when stripping programs. + + -- Gerrit Pape Wed, 14 Sep 2011 14:23:10 +0000 + +git (1:1.7.6.3-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream point release. + * debian/diff: + * 0007-...diff, ..., 0014-...diff: slightly rework as 0008...0015-* + to provide better error reporting (thx Jonathan Nieder). + * 0015-Makefile-do-not-use-setgid-bit-on-...diff: rename to 0007-*. + + -- Gerrit Pape Wed, 14 Sep 2011 11:33:23 +0000 + +git (1:1.7.6-1) experimental; urgency=low + + * new upstream release. + * debian/diff: + * 0012-daemon-check-for-errors...diff: clarify patch description. + * 0013-transport-learn-to-honor-DNS-SRV...diff: rename to 0014-*. + * 0013-tcp-make-dns_resolve-return-an-error-code.diff: new; make + dns_resolve() pass on return value from getaddrinfo. + * 0014-transport-honor-DNS-SRV-records.diff: fix two regressions + introduced by this patch when it was added in 1:1.7.6~rc1-1. + * use descriptive messages like "Unable to look up + git.example.com: Out of memory" to report errors from the + resolver, instead of "unable to connect to a socket (success)". + * tolerate alias (CNAME) records in the DNS reply for + _git._tcp., instead of confusing them for invalid SRV + records and erroring out. + * 0015-Makefile-do-not-use-setgid...diff: new; Makefile: set + DIR_HAS_BSD_GROUP_SEMANTICS on GNU/kFreeBSD. + + -- Jonathan Nieder Tue, 28 Jun 2011 12:54:58 -0500 + +git (1:1.7.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + [ Daniel Baumann ] + * add an init.d script for git-daemon (closes: #422139). + * debian/control, debian/rules: new package git-daemon-sysvinit; + Depends: adduser; Conflicts: git-daemon-run; package git now + Suggests and git-all Recommends: git-daemon-run | + git-daemon-sysvinit. + * debian/git-daemon.init: new; script to start or stop git-daemon. + * debian/git-daemon.default: new; provide some default settings and + disable the daemon by default on first installation. + * debian/git-daemon-sysvinit.README.Debian: new; explain how to get + started. + * debian/git-daemon-sysvinit.conffiles: new; treat + /etc/default/git-daemon, /etc/init.d/git-daemon as conffiles. + * debian/git-daemon-sysvinit.postinst: new; add gitdaemon system + user; register and invoke init script to start git-daemon. + * debian/git-daemon-sysvinit.prerm: new; stops git-daemon. + * debian/git-daemon-sysvinit.postrm: new; unregisters init script. + + [ Jonathan Nieder ] + * debian/diff/: + * 0009-daemon-move-...diff, 0011-tcp-...diff: move fallback + definition of HOST_NAME_MAX to new use sites (fixes FTBFS on + kfreebsd). + * 0012-transport-learn-to-honor...diff: rename to 0013-*. + * 0012-daemon-check-for-errors-retrieving-canonical-IP-addre.diff: + new; daemon: check for errors when retrieving IP address for use + by the --interpolated-path feature. + + -- Jonathan Nieder Fri, 17 Jun 2011 15:56:12 -0500 + +git (1:1.7.6~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0007-...diff, ..., 0012-transport-learn...diff: new; + teach the git client to pay attention to SRV records (thx Julien + Cristau; closes: #627839). + * debian/rules: add USE_SRV_RR=1 to OPTS. + * debian/rules: add htmldir=/usr/share/doc/git/html to OPTS and + DOC_OPTS. + + -- Jonathan Nieder Thu, 09 Jun 2011 19:05:55 -0500 + +git (1:1.7.5.4-1) unstable; urgency=low + + * new upstream point release. + + [ Gerrit Pape ] + * debian/changelog.upstream, debian/versions.upstream: update upstream + changelog. + + [ Jonathan Nieder ] + * debian/changelog.upstream.sh: use set -e. + * debian/git-daemon/run: use SO_REUSEADDR when binding the listening + socket so the server can restart without waiting for old connections + to time out (thx Daniel Kahn Gillmor; closes: #609405). + * debian/git-daemon-run.postrm purge: terminate the git-daemon/log + service, even if there is an active connection using it, before + deleting logs and the gitlog user (thx Daniel Kahn Gillmor; closes: + #627314). + + -- Jonathan Nieder Tue, 07 Jun 2011 13:23:58 -0500 + +git (1:1.7.5.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0007-...diff, 0008-...diff, 0009-...diff, 0010-...diff: + remove; included upstream. + * debian/control: Package: git-cvs: make cvs dependency unversioned; + Package: git-gui: make tk dependency unversioned (thx Jonathan + Nieder). + + -- Gerrit Pape Fri, 27 May 2011 13:00:05 +0000 + +git (1:1.7.5.1-1) unstable; urgency=low + + * new upstream point release. + * merge branch debian-experimental. + * debian/diff/: + - 0009-upload-pack-start-pack-objects-before-async-rev-...diff: + remove; applied upstream. + - 0007, 0008 (the add -p split-and-edit fix): rename to 0009-*, + 0010-*. + - 0007-add-p-q-should-really-quit.diff, 0008-t3701-...diff: new + from upstream; tests: check that the add -p split-and-edit bug + has not resurfaced. + * debian/control: package git: no longer Conflicts: but Breaks: + git-core from Debian 5.0 (lenny) to simplify the upgrade path + (thx Russ Allbery for suggesting it through lintian). + * debian/control: package git: Conflicts: git-core from + Debian 4.0 (etch) which provided /usr/bin/git through the + alternatives system. + * debian/control: Standards-Version: 3.9.2.0. + + -- Jonathan Nieder Thu, 05 May 2011 03:41:36 -0500 + +git (1:1.7.5-1) experimental; urgency=low + + * new upstream release. + * 0009-upload-pack-start-pack-objects-before-async-rev-list.diff: + new from upstream; upload-pack: start pack-objects which reads + pack_pipe before writing to it to avoid deadlock (closes: + #607346). + * debian/changelog.upstream, debian/versions.upstream: do not skip + versions not packaged for Debian (thx Gerrit Pape). + + -- Jonathan Nieder Tue, 26 Apr 2011 21:49:48 -0500 + +git (1:1.7.5~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + * 0007-gitk-Take-only-numeric-version-components-when-comput.diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 20 Apr 2011 07:46:58 +0000 + +git (1:1.7.4.4-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0008...0064: remove; applied upstream. + * debian/diff/0008-add...diff, 0009-add-p-work...diff: new from + upstream; add -p: do not error out for attempts to stage hunks + after splitting and editing them. This fixes a regression + introduced by v1.7.4.3~10^2 (apply: do not patch lines that were + already patched, 2011-03-04). + * debian/git-doc.doc-base.git-index-format: new; catalog + .git/index file format document. + * debian/git.preinst, debian/git.postinst, debian/git.postrm: + don't use dpkg-maintscript-helper, avoiding a dependency on + recent dpkg (thx Anders Kaseorg and Marc Haber; closes: #618708). + * debian/git-daemon-run.postrm: terminate the git-daemon/log + service before deleting the gitlog user (closes: #610099). + + -- Jonathan Nieder Fri, 15 Apr 2011 00:00:03 -0500 + +git (1:1.7.4.1-5) unstable; urgency=low + + * merge branch debian-experimental. + * debian/diff/0008...0064: new from the upstream 'maint' branch: + (see RelNotes/1.7.4.2.txt for details) + * revert "core.abbrevguard: Ensure short object names stay + unique a bit longer" + * parse_tag_buffer(): do not prefixcmp() out of range + * pull: do not display fetch usage on --help-all + * gitweb: address warnings from perl 5.13 + * gitweb: replace tabs with spaces when highlighting syntax + * merge: honor prepare-commit-msg hook + * diff: handle diffstat of rewritten binary files + * config: add "[push] default = upstream" synonym for + "[push] default = tracking" + * diffcore: properly honor the difference between -M and -C + * diffcore: improve similarity heuristics for rename detection + * patch-id: do not trip over "no newline" marker + * various documentation, usage string, and code clarity + improvements + + -- Jonathan Nieder Wed, 16 Mar 2011 21:01:53 -0500 + +git (1:1.7.4.1-4) experimental; urgency=low + + * git-el.postinst: check if /usr/share/doc/git/contrib/emacs is a + symlink before changing it to one (closes: #617631). + * git-el.postinst: remove spurious .../contrib/emacs.old and + /usr/share/git-core/emacs/emacs symlinks. + * package git: do not run emacs-package-remove on upgrade (it's not + needed). + - git.postinst: do not run "emacs-package-remove git". + - debian/control: git no longer Depends: emacsen-common (closes: + #617784). + * git-el.emacsen-install, git-el.emacsen-remove: + - use printf instead of echo. + - only remove the lisp (.el) and bytecode (.elc) files that we + install. + - make output less noisy --- for example, do not say "+ set +x". + + -- Jonathan Nieder Sun, 13 Mar 2011 05:03:44 -0500 + +git (1:1.7.4.1-3) unstable; urgency=low + + [ Anders Kaseorg ] + * Loosen versioned replaces/conflicts on git-core, to fix upgrades from + lucid. + + [ Jonathan Nieder ] + * README.emacs: git-blame.el does not print a summary in the echo + area (documents: #611935). + * Move emacs support files to a separate git-el package. + * Make git depend on emacsen-support, so it can reliably clean up + the old emacs support files on upgrade (closes: #614578) + * git-el.emacsen-install: Overwrite .el symlinks if they already + exist (closes: #614659). + * git-el.emacsen-remove: Do not complain if the site-lisp + directory is nonempty or is already missing. + * debian/control: git-man: Section: doc. + + -- Jonathan Nieder Fri, 04 Mar 2011 18:26:27 -0600 + +git (1:1.7.4.1-1) unstable; urgency=low + + * new upstream release (closes: #600566, #575917, #578752, #583693, + #583699, #588103, #507476, #540001, #524309, #581691, #600785, + #577471, #607044, #606975, #610423, #610481). + + [ Anders Kaseorg ] + * debian/git.docs, debian/rules: deal with RelNotes subdirectory. + * debian/diff/0007-gitk-Take-only-numeric-...diff: new; gitk: do + not error out when git version number contains "-rc". + + [ Jonathan Nieder ] + * add myself as uploader. + * debian/diff/0003, 0007, 0010-0034: remove, applied upstream. + * debian/rules: accept patches with .patch suffix, too (thx Anders + Kaseorg). + * debian/rules: use patch -N -r- so patch application is idempotent. + * update debian/copyright. + * debian/diff/0001-ident-check-etc-mailname...diff: avoid calls to + gethostbyname when mailname is not an fqdn (closes: #611608). + * debian/diff/0005-gitk-use-...diff: new; gitk: use standard desktop + fonts by default. The appearance for users that already have a + generated ~/.gitk file is not affected (closes: #466471). + * debian/diff/0006-gitk-...diff: new; gitk: avoid spurious matches + in "All fields" search (thx Frédéric Brière, closes: #465776). + * debian/control: git-cvs: recommend cvs2git for one-time conversions + (closes: #585725). + * debian/control: git-core: explain that it still may be needed (thx + Denis Laxalde). + * debian/control: gitweb: allow lynx-cur to satisfy dependency on a + CGI implementation (thx Ivan Shmakov). + * debian/control, debian/rules: new architecture-independent package + git-man: manual pages that were previously in the main git package. + * debian/rules: do not build documentation on autobuilders (closes: + #499002). + * debian/control: Build-Depends-Indep: asciidoc, xmlto, docbook-xsl. + * debian/rules: git-gui: install git-gui--askpass helper to + /usr/lib/git-core (closes: #598245). + * debian/rules: git-doc: install symlink to html documentation in + /usr/share/doc/git (thx Ian Jackson). + * debian/watch: new; point to upstream sources. + * debian/implicit: create DEBIAN/md5sums with correct permissions. + * debian/diff/0003-remove-shebang...diff: new; do not start shell + libraries with #!/bin/sh. + * debian/rules: do not try to strip scripts even if they begin + with "# " in place of "#!". + * debian/diff/0004-pre-rebase-hook-capture...diff: new; + hooks/pre-rebase: use a < Tue, 15 Feb 2011 19:27:38 -0600 + +git (1:1.7.2.3-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/diff/0034-gitweb-Introduce-esc_attr...diff: new from + upstream: gitweb: do not parrot filenames or other arguments given + in a request without proper quoting (closes: #607248, + CVE-2010-3906). + + -- Jonathan Nieder Thu, 16 Dec 2010 01:00:30 -0600 + +git (1:1.7.2.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/diff/0010...0033: new from the upstream 'maint' branch: + * cache_tree_free: Fix small memory leak. + * diff.c: call regfree to free memory allocated by regcomp. + * gitweb: allow configurations that change with each request + (fixes a regression from v1.7.2-rc2 in some gitolite setups). + * Documentation: 19 formatting fixes (thx Frédéric Brière, + closes: #540001, #600422). + * setup: make sure git dir path is in a permanent buffer. + * do not depend on signed integer overflow. + * debian/control: gitweb: weaken dependencies to allow configurations + using mod_perl or fastcgi rather than CGI; explain dependencies in + the package description (thx Servilio Afre Puentes, + closes: #600413). + + -- Jonathan Nieder Thu, 18 Nov 2010 19:04:09 -0600 + +git (1:1.7.2.3-2) unstable; urgency=low + + * merge branch debian-experimental. + * debian/gitweb.NEWS.Debian: typo (thx Jonathan Nieder). + + -- Gerrit Pape Sun, 17 Oct 2010 20:07:22 +0000 + +git (1:1.7.2.3-1) experimental; urgency=low + + * new upstream release. + * post-receive-email: document command-line mode (closes: #428413). + * add-interactive: Clarify “remaining hunks in the file” + (closes: #526014). + * rebase -i -p: document shortcomings (closes: #532775). + * GIT-VERSION-GEN: restrict tags used (closes: #473604). + * git svn: avoid unnecessary '/' in paths for SVN (thx Jon Dowland, + closes: #546733, #572847). + * git svn: avoid uninitialized var in 'reset' (thx Jens Seidel, + closes: #578908). + * debian/diff/0003-git-submodule.sh-properly-initialize-shell-...diff, + debian/diff/0004-Check-size-of-path-buffer-before-...diff: remove; + applied upstream. + * debian/diff/0001-Revert-gitweb-Use-diff_opts-while...diff: new; + prevent gitweb from serving rename patches that GNU patch 2.6.1 + cannot apply. + * debian/diff/0002-Revert-Merge-branch-jn-gitweb-plackup.diff: new; + install gitweb.css et al in /usr/share/gitweb, not a new static/ + subdirectory. + * debian/diff/0003-Do-not-unquote-into-in-URLs.diff: new from + upstream; do not unquote + into space character in URLs. + * debian/diff/0001-bug-448655-check-etc-mailname-...diff: rename to + debian/diff/0004-bug-448655-check-etc-mailname-if-author...diff. + * debian/diff/0002-bug-506445-hooks-post-receive-...diff: rename to + debian/diff/0005-bug-506445-hooks-post-receive-...diff; adapt. + * debian/diff/0006-instaweb-ignore-GITWEB_CONFIG_SYSTEM.diff: new; + instaweb: ignore /etc/gitweb.conf; + debian/diff/0007-gitweb-skip-logo-in-atom-feed-when...diff, ..., + debian/diff/0009-instaweb-disable-logo-and-favicon...diff: new; + instaweb: avoid 404 errors due to nonexistent image files (thx Uwe + Kleine-König, closes: #592733). + * update debian/copyright. + * debian/rules, debian/git.README.Debian, debian/gitweb.conf: + install gitweb.js, add an Alias for it to the VirtualHost example, + and configure gitweb to look for it in the right place (closes: + #555047). + * debian/gitweb.NEWS.Debian: mention the new gitweb.js file. + * debian/control: gitweb: Depends: apache2 | httpd-cgi (closes: + #559890). + * debian/gitweb.conf: use relative links for gitweb.css et al + (thx Alban Browaeys, closes: #568343). + * debian/control: package git: no longer Conflicts: git + (<< 4.3.20-11). + * debian/control: package git: Breaks: packages from Debian 5.0 + (lenny) relying on removed features such as dashed-form commands in + $PATH (thx Adrian Bunk, closes: #561701); no longer Conflicts: but + Breaks: ancient qgit for the same reason. + * debian/gitweb.README.Debian: copy-edit. + * debian/git.README.Debian: retitle to "Git for Debian" (thx + Christoph Anton Mitterer, closes: #590129). + * debian/control: Homepage: http://git-scm.com/ (closes: #553220). + * debian/control: package git no longer Depends: libdigest-sha1-perl + (thx Ansgar Burchardt, closes: #591039). + * debian/control: Build-Depends: libio-pty-perl for better test + coverage. + + -- Jonathan Nieder Fri, 03 Sep 2010 22:34:30 -0500 + +git (1:1.7.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * debian/diff/0004-Check-size-of-path-buffer-before-writing-...diff: + new, cherry-picked from 3c9d041: setup: Check size of path buffer + before writing into it (closes: #590026, CVE-2010-2542). + + -- Jonathan Nieder Sun, 25 Jul 2010 18:01:15 -0500 + +git (1:1.7.1-1) unstable; urgency=low + + * debian/diff/0003-t-t7400-submodule-basic.sh-debug-output-...diff: + remove; obsolete. + * debian/diff/0003-git-submodule.sh-properly-initialize-shell-...diff: + new; git-submodule.sh: properly initialize shell variables (closes: + #569594). + * debian/rules: no longer set ARCH='$(ARCH)' in environment for make + test. + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Sun, 25 Apr 2010 23:35:50 +0000 + +git (1:1.7.0.5-2~dbg0) unstable; urgency=low + + * debian/diff/0003-t7400-submodule-basic.sh-alpha-s390-skip-...diff: + remove; more archs are affected (additionally hppa, armel). + * debian/diff/0003-t-t7400-submodule-basic.sh-debug-output-...diff: + new; t/t7400-submodule-basic.sh: debug output for t7400.24 'update + --init'. + + -- Gerrit Pape Fri, 23 Apr 2010 12:15:18 +0000 + +git (1:1.7.0.5-1) unstable; urgency=low + + * debian/git-core.postinst: new; replace /usr/share/doc/git-core with + symlink /usr/share/doc/git-core -> git on upgrade from <= 1.7.0.4-2 + (closes: #578298). + * debian/diff/0003-t7400-submodule-basic.sh-alpha-s390-skip-...diff: + new; t7400-submodule-basic.sh: alpha, s390: skip 'update --init' + test (workaround: #569594). + * debian/control: no longer Replaces, Conflicts: git-completion (thx + Jonathan Nieder, closes: #577730). + * new upstream point release. + * debian/rules: set ARCH='$(ARCH)' in environment for make test. + + -- Gerrit Pape Tue, 20 Apr 2010 23:41:04 +0000 + +git (1:1.7.1~rc1-1.1) experimental; urgency=low + + * debian/control: typo (thx Jonathan Nieder). + * debian/git-daemon-run.postinst: remove fixup for #522348. + + -- Gerrit Pape Sun, 11 Apr 2010 23:22:46 +0000 + +git (1:1.7.1~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Sun, 11 Apr 2010 15:28:28 +0000 + +git (1:1.7.0.4-2) unstable; urgency=low + + * debian/rules: package git: no longer install /usr/share/doc/git-core + -> git symlink; git-core: no longer install /usr/lib/git-core -> git + symlink (closes: #576906). + * debian/control: package git: Replaces:, Conflicts: git-core (<= + 1:1.7.0.4-1). + * debian/rules: make /usr/share/gitweb/index.cgi -> + ../../lib/cgi-bin/gitweb.cgi symlink relative (lintian). + * debian/control: package git-core: minor update to the long + description. + * debian/git.README.source: add note about the + mailing list. + * debian/rules: target binary-indep: add missing dependency to + git-core.deb-DEBIAN. + * debian/implicit: no longer create DEBIAN/md5sums. + * debian/rules: revert the /usr/lib/git-core -> /usr/lib/git rename + (keeping upstream's default). + + -- Gerrit Pape Sat, 10 Apr 2010 23:16:54 +0000 + +git (1:1.7.0.4-2~exp0) experimental; urgency=low + + [ Gerrit Pape ] + * debian/control, debian/rules, debian/git-core.*: change source and + binary package name from git-core to git; keep now obsolete empty + git-core package that depends on git for upgrade (see + http://lists.debian.org/debian-devel/2009/09/thrd2.html#00661). + * debian/control: package git: Replaces: git-core, Conflicts: git-core + (<= 1:1.7.0.3-1), Provides: git-core. + * debian/git.NEWS.Debian: talk about the package name change, and the + possible hazzle when upgrading with GNU Interactive Tools installed + since etch and no git-core installed. + * debian/control, debian/rules: new package git-all: dummy package + which brings in all subpackages (following upstream's RPMs). + + [ Jonathan Nieder ] + * debian/git.README.source: adjust for the package name change. + * debian/rules: install symbolic link git -> git-core in /usr/lib + to simplify upgrades. + * debian/git-daemon/run: use $(git --exec-path) instead of hard-coding + the path to the git-daemon binary. + + -- Gerrit Pape Sat, 03 Apr 2010 15:07:19 -0500 + +git-core (1:1.7.0.4-1) unstable; urgency=low + + * debian/git-daemon-run.postrm: purge: don't warn if the git-daemon + service is already removed; use -f option to userdel, on fast-purge + the log service daemon might still run for a short time (closes: + #575434). + * new upstream point release. + + -- Gerrit Pape Thu, 01 Apr 2010 20:42:19 +0000 + +git-core (1:1.7.0.3-1) unstable; urgency=low + + * debian/control: Standards-Version: 3.8.4.0. + * debian/changelog: note fixes from Jonathan Nieder in 1.7.0.2-1. + * new upstream point release. + + -- Gerrit Pape Mon, 22 Mar 2010 09:19:06 +0000 + +git-core (1:1.7.0.2-1) unstable; urgency=low + + * new upstream point release. + + [ Jonathan Nieder ] + * am: remove rebase-apply directory before gc (thx Mark Brown, + closes: #570966). + * git-imap-send: Convert LF to CRLF before storing patch to draft box + (closes: #572598). + * sha1_file: be paranoid when creating loose objects (closes: + #569505). + + -- Gerrit Pape Thu, 18 Mar 2010 20:44:12 +0000 + +git-core (1:1.7.0-1) unstable; urgency=low + + * debian/git-core.README.source: typos. + * new upstream release. + * Documentation: Update git core tutorial clarifying reference to + scripts (closes: ##560795). + * merge branch debian-experimental. + + -- Gerrit Pape Tue, 16 Feb 2010 08:51:32 +0000 + +git-core (1:1.7.0~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Fri, 12 Feb 2010 14:30:12 +0000 + +git-core (1:1.7.0~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0003-git-cvsserver-allow-regex-metacharacters...diff: + remove; applied upstream. + * debian/rules: NO_PYTHON=1. Packaging the git_remote_helpers + Python module will require more work. + * update debian/copyright (closes: #557065). + * debian/rules: set prefix=/usr when building man pages (closes: + #567404). + + -- Jonathan Nieder Sat, 30 Jan 2010 17:46:04 -0600 + +git-core (1:1.6.6.2-1) unstable; urgency=medium + + * new upstream point release. + * debian/diff/0003-git-cvsserver-allow-regex-metacharacters...diff: + remove; applied upstream. + * debian/rules: stop ignoring test suite failures on ia64, since + #563882 has been fixed. Build-Depends: and Depends: + libc6.1 (>= 2.10.2-6) [ia64] for the fix (closes: #568915). + * update debian/copyright (closes: #557065). + * debian/rules: set prefix=/usr when building man pages (closes: + #567404). + + -- Jonathan Nieder Thu, 11 Feb 2010 21:48:55 -0600 + +git-core (1:1.6.6.1-1) unstable; urgency=low + + [ Gerrit Pape ] + * new upstream point release. + * Document git-blame triple -C option (thx Ramkumar Ramachandra, + closes: #476604). + * debian/diff/0003-git-cvsserver-allow-regex-metacharacters...diff: + new; git-cvsserver: allow regex metacharacters in CVSROOT (fixes + build/selftest failure if the build directory pathname contains a +). + * debian/gitweb.apache2.conf, debian/gitweb.postinst: new; make gitweb + work out of the box with Apache (thx Charles Plessy). + * debian/gitweb.README.Debian, debian/gitweb.conf, debian/rules: make + gitweb work out of the box with Apache (thx Charles Plessy, closes: + #497809). + * debian/gitweb.conffiles: add /etc/apache2/conf.d/gitweb. + + [ Jonathan Nieder ] + * debian/rules: ignore test suite failures on ia64 (workaround: + #563882). + + -- Gerrit Pape Wed, 27 Jan 2010 13:30:29 +0000 + +git-core (1:1.6.6-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Mon, 04 Jan 2010 16:01:36 +0000 + +git-core (1:1.6.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Thu, 17 Dec 2009 10:13:09 +0000 + +git-core (1:1.6.5.7-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 17 Dec 2009 09:39:55 +0000 + +git-core (1:1.6.6~rc1-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + + -- Gerrit Pape Fri, 04 Dec 2009 00:17:27 +0000 + +git-core (1:1.6.5.4-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 03 Dec 2009 22:48:57 +0000 + +git-core (1:1.6.6~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0001-bug-369742-pager.c-fallback-to-pager-...diff, + debian/diff/0002-bug-438793-494505-fallback-to-editor-...diff, + debian/diff/0004-bug-477337-git-svn.perl-fallback-to...diff: + remove; obsolete. + * debian/rules: add DEFAULT_PAGER=pager, DEFAULT_EDITOR=editor to + OPTS. + + -- Gerrit Pape Thu, 26 Nov 2009 00:17:59 +0000 + +git-core (1:1.6.5.3-1) unstable; urgency=low + + [ Tanguy Ortolo ] + * debian/git-core.README.Debian, debian/control: git-daemon-run: + document that git-daemon is not provided by this package; add hint + on how to enable git-daemon through inetd(8) (closes: #554215). + + [ Jonathan Nieder ] + * debian/rules: drop misleading PPC_SHA1, ARM_SHA1 settings (closes: + #555039). + * debian/rules: log $(CC) version, not gcc (closes: #555040). + * debian/rules: allow clean as non-root (closes: #555041). + * debian/rules: drop obsolete WITH_P4IMPORT setting (closes: + #555051). + * debian/rules: TCLTK_PATH=wish (closes: #555027). + + [ Gerrit Pape ] + * new upstream point release. + * ls-files: unbreak "ls-files -i" (closes: #553296). + * Require a struct remote in transport_get(); Allow curl helper to + work without a local repository (closes: #553507). + * help -a: do not unnecessarily look for a repository (closes: + #539273). + * thx Jonathan Nieder. + + -- Gerrit Pape Tue, 17 Nov 2009 21:01:46 +0000 + +git-core (1:1.6.5.2-1) unstable; urgency=low + + * restore temporary lost changes from version 1:1.6.3.3-2 (closes: + #530693). + * new upstream point release. + * grep: do not segfault when -f is used (closes: 551071). + + -- Gerrit Pape Mon, 26 Oct 2009 12:05:18 +0000 + +git-core (1:1.6.5-1) unstable; urgency=low + + * new upstream release. + * git-doc: html no longer uses "{plus}" where it should be "+" + (closes: #529255). + * debian/git-core.README.source: new; document how to use the + Debian package source. + * debian/implicit: update to revision 60d9070. + + -- Gerrit Pape Tue, 13 Oct 2009 00:23:00 +0000 + +git-core (1:1.6.4.3-1) unstable; urgency=low + + * new upstream release (closes: #546709). + * git-cvsserver: no longer use deprecated 'git-subcommand' commands + (closes: #536067). + * branch debian-sid: git cherry-pick 098082f, 318b847, 1f9b620 (thx + Anders Kaseorg; closes: #546499). + + -- Gerrit Pape Wed, 16 Sep 2009 11:03:45 +0000 + +git-core (1:1.6.3.3-2) unstable; urgency=low + + [ Anders Kaseorg ] + * Fix manpage formatting: set ASCIIDOC_NO_ROFF instead of + DOCBOOK_XSL_173 (based on the instructions in Documentation/Makefile) + and don’t override the internal Makefile variable ASCIIDOC_EXTRA + (closes: #530693, #521954, #533320). + + [ Gerrit Pape ] + * debian/control: Standards-Version: 3.8.2.0. + + -- Gerrit Pape Mon, 29 Jun 2009 00:06:59 +0000 + +git-core (1:1.6.3.3-1) unstable; urgency=high + + * new upstream point release. + * daemon: Strictly parse the "extra arg" part of the command + (closes: #532935; CVE-2009-2108). + * debian/rules: add NO_CROSS_DIRECTORY_HARDLINKS=1 to OPTS. + * debian/diff/0006-bug-520116-Makefile-do-not-install-cross...diff: + remove; obsolete. + + -- Gerrit Pape Tue, 23 Jun 2009 08:49:17 +0000 + +git-core (1:1.6.3.1-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Thu, 14 May 2009 21:35:01 +0000 + +git-core (1:1.6.3-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Fri, 08 May 2009 07:57:39 +0000 + +git-core (1:1.6.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Wed, 29 Apr 2009 21:58:10 +0000 + +git-core (1:1.6.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Mon, 20 Apr 2009 21:44:09 +0000 + +git-core (1:1.6.2.4-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 20 Apr 2009 20:22:02 +0000 + +git-core (1:1.6.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Tue, 14 Apr 2009 23:06:38 +0000 + +git-core (1:1.6.2.3-1) unstable; urgency=low + + * new upstream point release. + * debian/control: Standards-Version: 3.8.1.0. + * debian/control: change subversion to Subversion in description. + * debian/control: Section: vcs (except for git-doc). + + -- Gerrit Pape Tue, 14 Apr 2009 22:46:43 +0000 + +git-core (1:1.6.2.2-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0006-bug-520116-Makefile-do-not-install-cross...diff: + new; Makefile: do not install cross-directory hardlink (thx Jonathan + Nieder, closes: #520116). + * debian/git-daemon/run: run /usr/lib/git-core/git-daemon instead of + 'git daemon' (closes: #522348). + * debian/git-daemon-run.postinst: on upgrade from >> 1:1.6.0, fixup + #522348. + * debian/git-core.emacsen-startup: remove the line + '(add-to-list 'vc-handled-backends 'git)' (closes: #519728). + + -- Gerrit Pape Sun, 05 Apr 2009 20:49:25 +0000 + +git-core (1:1.6.2.1-1) unstable; urgency=low + + * new upstream point release. + * debian/git-core.emacsen-startup: no longer refer to vc-git.el + (closes: #519728). + + -- Gerrit Pape Mon, 16 Mar 2009 22:18:05 +0000 + +git-core (1:1.6.2-1) unstable; urgency=medium + + * new upstream release. + * merge branch debian-experimental. + * debian/diff/0006-Install-builtins-with-the-user-and-group-of...diff, + debian/diff/0007-git-quiltimport-preserve-standard-input-to...diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 04 Mar 2009 22:44:43 +0000 + +git-core (1:1.6.2~rc2-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + + -- Gerrit Pape Thu, 26 Feb 2009 22:15:13 +0000 + +git-core (1:1.6.1.3-2) unstable; urgency=high + + * debian/diff/0006-Install-builtins-with-the-user-and-group-of...diff: + new from upstream git: Install builtins with the user and group of + the installing personality. + * debian/diff/0007-git-quiltimport-preserve-standard-input-to...diff: + new from upstream git: git-quiltimport: preserve standard input to + be able to read user input (closes: #515910). + + -- Gerrit Pape Thu, 26 Feb 2009 22:01:37 +0000 + +git-core (1:1.6.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/git-core.docs, debian/git-doc.docs, debian/rules: move + Documentation/RelNotes* from git-doc to the git-core package + (closes: #514866). + + -- Gerrit Pape Tue, 17 Feb 2009 20:20:03 +0000 + +git-core (1:1.6.2~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + + -- Gerrit Pape Tue, 10 Feb 2009 00:06:02 +0000 + +git-core (1:1.6.1.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 09 Feb 2009 21:31:39 +0000 + +git-core (1:1.6.1.2-1) experimental; urgency=low + + * new upstream release. + * don't fail to clone over http if connection is rate limited + (closes: #512795). + * git svn info no longer fails (closes: #499243). + * debian/rules: ASCIIDOC_EXTRA='-a asciidoc7compatible -a docbook-xsl-172' + and DOCBOOK_XSL_173=Yes when building documentation (thx Niko Tyni + for the patch, closes: #497883). + * merge branch debian-lenny. + * debian/diff/0005-gitweb-do-not-run-git-diff-that-is-Porcelain.diff: + remove; fixed upstream. + + -- Gerrit Pape Mon, 02 Feb 2009 23:26:45 +0000 + +git-core (1:1.5.6.5-3) unstable; urgency=high + + * debian/rules: no longer install symlink /etc/init.d/git-daemon -> + /usr/bin/sv (closes: #511687). + * debian/git-daemon-run.README.Debian: document how to create the + symlink manually to have an LSB compatible /etc/init.d/git-daemon + interface to control the service. + + -- Gerrit Pape Mon, 02 Feb 2009 20:56:15 +0000 + +git-core (1:1.6.0.6-1) experimental; urgency=low + + * debian/control: git-email: Recommends: libnet-smtp-ssl-perl, + libauthen-sasl-perl (thx Kees Cook, closes: #505636). + * debian/diff/0005-bug-506445-hooks-post-receive-email-set-...diff: + new; hooks/post-receive-email: set encoding to utf-8 (thx Alexander + Gerasiov, closes: #506445). + * new upstream point release (closes: #504641). + * gitweb: do not run "git diff" that is Porcelain. + + -- Gerrit Pape Sat, 20 Dec 2008 11:03:49 +0000 + +git-core (1:1.5.6.5-2) unstable; urgency=high + + * debian/diff/0005-gitweb-do-not-run-git-diff-that-is-Porcelain.diff: + new; fix possible gitweb vulnerability: calling "git diff": Jakub + says that legacy-style URI to view two blob differences are never + generated since 1.4.3. This codepath runs "git diff" Porcelain from + the gitweb, which is a no-no. It can trigger diff.external command + that is specified in the configuration file of the repository being + viewed. + + -- Gerrit Pape Wed, 17 Dec 2008 09:27:01 +0000 + +git-core (1:1.6.0.4-1) experimental; urgency=low + + * new upstream point release. + * debian/control: git-email: minor update to the long description + (thx Gerfried Fuchs, closes: #501559). + * debian/rules: TCLTK_PATH=/usr/bin/wish instead of wish8.5 in OPTS. + * debian/control: git-gui, gitk: Depends: tk (>= 8.4) instead of + tk8.5 (thx Adeodato Simó, closes: #503113). + * debian/rules: move the /usr/bin/git-cvsserver program into the + git-cvs package. + + -- Gerrit Pape Tue, 11 Nov 2008 22:36:05 +0000 + +git-core (1:1.6.0.3-1) experimental; urgency=low + + * debian/control: minor update to long descriptions (thx Reuben + Thomas, closes: #499065). + * debian/git-core.emacsen-startup: new; emacsen-startup configuration + file (thx Jari Aalto, closes: #472197). + * debian/rules: install emacsen-startup configuration file into the + git-core package (thx Eddy Mulyono, closes: #446027). + * new upstream point release. + * debian/git-core.conffiles: add /etc/emacs/site-start.d/50git-core.el + + -- Gerrit Pape Tue, 04 Nov 2008 20:26:56 +0000 + +git-core (1:1.6.0.2-1) experimental; urgency=low + + * new upstream point release. + * debian/git-core.NEWS.Debian: new; mention that most of the programs + now are installed outside the default $PATH; the "git-xyzzy" form + in scripts and on the command line is no longer supported in 1.6.0. + * debian/git-core.README.Debian: fix paths in config example (thx + Michael Biebl for the patch, closes: #498741). + * debian/git-core.README.Debian: typo (thx Vincent Bernat for the + patch, closes: #496834). + + -- Gerrit Pape Wed, 24 Sep 2008 20:55:26 +0000 + +git-core (1:1.6.0.1-1) experimental; urgency=low + + * new upstream point release (closes: #496155). + * merge branch debian-sid. + + -- Gerrit Pape Wed, 27 Aug 2008 07:53:36 +0000 + +git-core (1:1.6.0-1) experimental; urgency=low + + * new upstream release. + * svnimport: newer libsvn wants us to ask for the root with "", + not "/" (closes: #492522, #490400). + * Keep some git-* programs in $(bindir); Move all dashed-form + commands to libexecdir (closes: #461212). + * bash: Add more option completions for 'git log' (closes: + #490220). + * Fix buffer overflow in prepare_attr_stack; Fix buffer overflow + in git diff; Fix buffer overflow in git-grep (closes: #494097). + * 0002-bug-438793-git-sh-setup.sh-builtin-tag.c-fallback.diff: redo + as 0002-bug-438793-494505-fallback-to-editor-not-vi.diff (thx + Jonathan Nieder for the patch, closes: #494505). + * debian/rules: add gitexecdir=/usr/lib/git-core to OPTS; adapt + several paths (thx Jonathan Nieder for a patch, closes: #480396). + * debian/gitweb.NEWS.Debian: new; talk about files moved from + /var/www/ to /usr/share/gitweb/ (see #479479; closes: #494467). + * debian/git-daemon/run: run git daemon instead of git-daemon + (dash-less form). + * debian/git-daemon-run.postinst: add gitdaemon system user. + * debian/git-daemon/run: utilize chpst to run git daemon as user + gitdaemon (thx Daniel Kahn Gillmor, closes: #494991). + + -- Gerrit Pape Sun, 24 Aug 2008 22:31:44 +0000 + +git-core (1:1.5.6.5-1) unstable; urgency=high + + * new upstream point release. + * Fix buffer overflow in prepare_attr_stack; Fix buffer overflow + in git diff; Fix buffer overflow in git-grep (CVE-2008-3546; + closes: #494097). + * debian/diff/0005-bug-494097-CVE-2008-3546.diff: remove; obsolete. + + -- Gerrit Pape Sun, 24 Aug 2008 19:22:02 +0000 + +git-core (1:1.5.6.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix various stack-based buffer overflows when processing overly long + repository pathnames which can be exploited to execute arbitrary code if + a victim is tricked into using git-grep or git-diff on a crafted + repository (CVE-2008-3546; Closes: #494097). + + -- Nico Golde Sat, 09 Aug 2008 13:53:13 +0200 + +git-core (1:1.5.6.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0005-git-svn.perl-workaround-assertions-in-svn...diff: + remove; applied upstream (opens: #490400). + * debian/control: Standards-Version: 3.8.0.1. + + -- Gerrit Pape Thu, 17 Jul 2008 07:40:08 +0000 + +git-core (1:1.5.6.2-1) unstable; urgency=low + + * new upstream point release (closes: #489431). + * debian/copyright: apply patch from Ansgar Burchardt: adopt proposed + machine-readable format; clarify some license information (thx, + closes: #488351). + * debian/rules: package gitweb: install gitweb.css, git-favicon.png, + git-logo.png into /usr/share/gitweb/ instead of /var/www/ (closes: + #479479). + * debian/control: package git-arch: no longer Suggests: bazaar + (closes: #486726). + * debian/diff/0005-git-svn.perl-workaround-assertions-in-svn...diff: + new; git-svn.perl: workaround assertions in svn library 1.5.0 + (closes: #489108). + + -- Gerrit Pape Sun, 06 Jul 2008 18:35:27 +0000 + +git-core (1:1.5.6-1) unstable; urgency=low + + * new upstream release. + * merge branch debian-experimental. + + -- Gerrit Pape Thu, 19 Jun 2008 07:38:31 +0000 + +git-core (1:1.5.6~rc3-1) experimental; urgency=low + + * debian/git-daemon-run.postrm: remove log files on purge. + * new upstream release candidate. + * debian/control: package git-core: no longer Depends: cpio, no + longer Recommends: curl. + + -- Gerrit Pape Sun, 15 Jun 2008 11:14:49 +0000 + +git-core (1:1.5.6~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * merge branch debian-sid. + * debian/rules: do not build manpages twice (thx Jonathan Nieder). + + -- Gerrit Pape Mon, 09 Jun 2008 12:02:43 +0000 + +git-core (1:1.5.5.4-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: enable DOCBOOK_XSL_172 build variable, fixing man page + breakage (thx Jonathan Nieder, closes: #476634). + * debian/control: Build-Depends: docbook-xsl (>> 1.72) (thx Jonathan + Nieder). + + -- Gerrit Pape Mon, 09 Jun 2008 11:51:19 +0000 + +git-core (1:1.5.6~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * git-svn fails in prop_walk if $self->{path} is not empty (closes: + 477393). + * gitweb: Fix "next" link on bottom of page (closes: #481902). + * merge branch debian-sid. + * debian/rules: add THREADED_DELTA_SEARCH=1 to OPTS (closes: #483534). + + -- Gerrit Pape Thu, 05 Jun 2008 10:14:14 +0000 + +git-core (1:1.5.5.3-1) unstable; urgency=low + + * new upstream point release. + * commit --interactive: properly update the index before commiting + (closes: #480429). + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + remove; applied upstream. + * debian/diff/0005-bug-477337-git-svn.perl-fallback-to-pager...diff: + new; git-svn.perl: fallback to 'pager' not 'less' if PAGER is unset + (closes: #477337). + + -- Gerrit Pape Wed, 28 May 2008 19:32:57 +0000 + +git-core (1:1.5.6~rc0-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file...diff: + remove; fixed upstream. + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + remove; applied upstream. + + -- Gerrit Pape Mon, 26 May 2008 16:53:38 +0000 + +git-core (1:1.5.5.2-1) unstable; urgency=low + + * new upstream point release. + * diff-options.txt: document the new "--dirstat" option (closes: + #476437). + * debian/diff/0005-git-bisect.sh-don-t-accidentally-override...diff: + new: git-bisect.sh: don't accidentally override existing branch + "bisect" (closes: #478647). + + -- Gerrit Pape Mon, 26 May 2008 16:41:45 +0000 + +git-core (1:1.5.5.1-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Mon, 21 Apr 2008 18:24:34 +0000 + +git-core (1:1.5.5-1) unstable; urgency=low + + * new upstream release. + * gitk: Fix changing colors through Edit->Preferences (closes: #472615). + * Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output" + (closes: #469083). + * merge branch debian/experimental. + + -- Gerrit Pape Tue, 08 Apr 2008 20:26:25 +0000 + +git-core (1:1.5.5~rc3-2) experimental; urgency=low + + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file-if-defaul.diff: + amend: properly apply GITWEB_CONFIG_SYSTEM to gitweb.cgi. + + -- Gerrit Pape Fri, 04 Apr 2008 20:40:48 +0000 + +git-core (1:1.5.5~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0004-gitweb-fallback-to-system-wide-config-file-if-defaul.diff: + new: gitweb: fallback to system-wide config file if default config does + not exist (closes: #450592). + * debian/rules: remove GITWEB_CONFIG=/etc/gitweb.conf from OPTS. + + -- Gerrit Pape Thu, 03 Apr 2008 19:43:33 +0000 + +git-core (1:1.5.5~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * t9600-cvsimport.sh: set HOME before checking for cvsps availability + (closes: #471969). + * imap-send: properly error out if imap.host is not set in config + (closes: #472632). + * merge branch debian-sid. + + -- Gerrit Pape Fri, 28 Mar 2008 08:53:30 +0000 + +git-core (1:1.5.4.5-1) unstable; urgency=low + + * new upstream point release (closes: #473071). + + -- Gerrit Pape Fri, 28 Mar 2008 08:26:39 +0000 + +git-core (1:1.5.5~rc1-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Sun, 23 Mar 2008 11:55:21 +0000 + +git-core (1:1.5.5~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * git-pull documentation: warn about the option order (closes: #463853). + * hash-object: cleanup handling of command line options (closes: + #464432). + * debian/diff/0004-gitk-properly-deal-with-tag-names-containing-sl.diff: + remove; applied upstream. + + -- Gerrit Pape Wed, 19 Mar 2008 07:45:01 +0000 + +git-core (1:1.5.4.4-1) unstable; urgency=low + + * new upstream point release. + * templates/Makefile: don't depend on local umask setting (closes: + #467518). + * Fix random crashes in http_cleanup() (closes: #468836). + * send-email: fix In-Reply-To regression (closes: #468153). + * git-merge.sh: better handling of combined --squash,--no-ff,--no-commit + options (closes: #468568). + + -- Gerrit Pape Mon, 10 Mar 2008 10:38:51 +0000 + +git-core (1:1.5.4.3-1) unstable; urgency=low + + * new upstream point release. + * git-clone.sh: properly configure remote even if remote's head is + dangling (closes: #466581). + * debian/diff/0004-gitk-properly-deal-with-tag-names-containing-sl.diff: + new: from upstream master: gitk: properly deal with tag names containing / + (slash) (closes: #464104). + * debian/git-daemon-run.postrm: adapt paths in /var/. + + -- Gerrit Pape Sun, 24 Feb 2008 16:19:02 +0000 + +git-core (1:1.5.4.2-2) unstable; urgency=low + + * debian/rules: git-daemon-run: no longer include symlinks for ./supervise/ + subdirectories, update-service now takes care of this. + * debian/git-daemon-run.postinst: remove ad re-add git-daemon service on + upgrade from <= 1.5.4.2-1. + + -- Gerrit Pape Mon, 18 Feb 2008 22:22:14 +0000 + +git-core (1:1.5.4.2-1) unstable; urgency=low + + * new upstream point release. + * cvsimport: have default merge regex also match beginning of commit + message (thx Frédéric Brière, closes: #463468). + * builtin-commit: remove .git/SQUASH_MSG upon successful commit (closes: + #464656). + * debian/rules: change TCLTK_PATH to /usr/bin/wish8.5 in OPTS. + * debian/control: Build-Depends: tcl8.5; git-gui, gitk: Depends: tk8.5 + (closes: #456423). + * debian/git-daemon-run.postinst, debian/git-daemon-run.postrm, + debian/git-daemon-run.prerm: use runit's update-service program to + add/remove the git daemon service, instead of dealing with symlinks in + /var/service/ directly. + * debian/control: package git-daemon: Depends: runit (>= 1.8.0-2) (1st + version that provides the update-service program). + + -- Gerrit Pape Sun, 17 Feb 2008 18:48:00 +0000 + +git-core (1:1.5.4.1-1) unstable; urgency=medium + + * debian/control: Build-Depends: cvsps (for selftests, thx Marco Rodrigues, + closes: #463896). + * new upstream point release. + + -- Gerrit Pape Mon, 11 Feb 2008 12:00:03 +0000 + +git-core (1:1.5.4-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * debian/git-core.README.Debian: add Alias'es for git-favicon.png and + git-logo.png to the VirtualHost example (thx Frederic Briere, closes: + #463732). + * debian/rules: target build-arch-stamp: re-run selftests with --verbose + on test failures. + + -- Gerrit Pape Sun, 03 Feb 2008 05:01:16 +0000 + +git-core (1:1.5.4~rc5-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Mon, 28 Jan 2008 11:01:08 +0000 + +git-core (1:1.5.4~rc4-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0003-bug-448655-check-etc-mailname-if-author-email-is-un.diff: + adapt; don't warn if /etc/mailname does not exist (closes: #461844). + * debian/rules: install /usr/share/gitk/ into the gitk package, not + git-core. + + -- Gerrit Pape Mon, 21 Jan 2008 21:15:21 +0000 + +git-core (1:1.5.4~rc3-1) experimental; urgency=low + + * merge branch debian-sid. + * new upstream release candidate. + * "git pull --tags": error out with a better message (closes: #456035). + * gitk: use user-configured background in view definition dialog + (closes: #457124). + * debian/control: Build-Depends: cvs, libdbd-sqlite3-perl (for selftests). + + -- Gerrit Pape Sat, 12 Jan 2008 15:09:23 +0000 + +git-core (1:1.5.3.8-1) unstable; urgency=low + + * debian/control: for all packages: Suggests: git-doc instead of + Recommends: (thx Andrew Moise, closes: #455369). + * debian/control: add Vcs-Git: http://smarden.org/git/git.git/. + * new upstream point release. + + -- Gerrit Pape Tue, 08 Jan 2008 21:01:35 +0000 + +git-core (1:1.5.4~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * shortlog manpage documentation: work around asciidoc markup issues + (closes: #447911). + * Fix $EDITOR regression introduced by rewrite in C (closes: #446845). + + -- Gerrit Pape Thu, 27 Dec 2007 08:45:01 +0000 + +git-core (1:1.5.4~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * gitweb: Teach "a=blob" action to be more lenient about blob/file mime + type (closes: #435610). + + -- Gerrit Pape Thu, 20 Dec 2007 09:07:10 +0000 + +git-core (1:1.5.4~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * build with correct version information (on amd64, closes: #454935, + #454408). + * git-reset: add -q option to operate quietly (closes: #444933). + * gitk: disable colours when calling git log (closes: #454420). + * "git svnimport" was removed in favor of "git svn" (closes: #436930, + #447325, #447965, #451037). + * git-commit: allow grouping of short options (closes: #407241). + * debian/diff/0004-contrib-hooks-post-receive-email-make-subject-prefix.diff, + debian/diff/0005-Don-t-cache-DESTDIR-in-perl-perl.mak.diff: remove; + applied upstream. + * debian/rules: install git-gui's lib/ directory plus subdirectory + properly. + * debian/control: Build-Depends: gettext. + + -- Gerrit Pape Thu, 13 Dec 2007 14:08:45 +0000 + +git-core (1:1.5.3.7-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/0005-Don-t-cache-DESTDIR-in-perl-perl.mak.diff: new; don't + cache DESTDIR in perl/perl.mak (#452077). + * debian/rules: remove $(MAKE) -C perl clean to remove the perl/perl.mak + again, this is now handled through debian/diff/0005 (thx Pierre + Habouzit, #452077). + + -- Gerrit Pape Mon, 3 Dec 2007 10:17:11 +0000 + +git-core (1:1.5.3.6-1.1) unstable; urgency=low + + * Non-maintainer upload: Gerrit is currently changing home, and this bug is + preventing people from installing git, I took the initiative to fix it + before his return. + * debian/rules: force a $(MAKE) -C perl clean to remove the perl/perl.mak + that remembers our DESTDIR and makes perl modules be installed in + debian/git-core/ in the install-indep target again + (closes: #452077, #452078, #452080, #452111, #452324). + + -- Pierre Habouzit Thu, 22 Nov 2007 00:40:08 +0100 + +git-core (1:1.5.3.6-1) unstable; urgency=low + + * debian/implicit: add proper dependencies to support 'parallel build' + through make -j (thx Daniel Schepler for the patch). + * debian/rules: support 'nocheck' in DEB_BUILD_OPTIONS to skip running + the selftests. + * debian/diff/0003-bug-448655-check-etc-mailname-if-author-email-is-un.diff: + new; check /etc/mailname if author email is unknown (closes: #448655). + * debian/gitweb.docs: new; install gitweb/README. + * new upstream point release. + * git-cvsimport: really convert underscores in branch names to dots with + -u (closes: #446495). + * git-mailsplit: with maildirs not only process cur/, but also new/ + (closes: #447396). + * debian/diff/0004-contrib-hooks-post-receive-email-make-subject-prefix.diff: + new; cherry-pick'ed from master: contrib/hooks/post-receive-email: make + subject prefix configurable (closes: #428418). + + -- Gerrit Pape Mon, 19 Nov 2007 12:32:11 +0000 + +git-core (1:1.5.3.5-1) unstable; urgency=low + + * new upstream point release. + * git-config: handle --file option with relative pathname properly; + git-config: print error message if the config file cannot be read; + git-config: don't silently ignore options after --list (closes: + #445208). + + -- Gerrit Pape Thu, 01 Nov 2007 08:35:46 +0000 + +git-core (1:1.5.3.4-1) unstable; urgency=low + + * new upstream point release (closes: #445188). + + -- Gerrit Pape Thu, 04 Oct 2007 08:27:01 +0000 + +git-core (1:1.5.3.3-1) unstable; urgency=low + + * new upstream point release. + + -- Gerrit Pape Sun, 30 Sep 2007 09:25:06 +0000 + +git-core (1:1.5.3.2-1) unstable; urgency=low + + * new upstream point release. + * git-svn: fix "Malformed network data" with svn:// servers (closes: + #430091, #436142). + * git-commit: Allow partial commit of file removal (closes: #437817). + * git-gui: lib/index.tcl: handle files with % in the filename properly + (closes: #441167). + * git-clone: improve error message if curl program is missing or not + executable (closes: #440976). + * debian/git-daemon-run.postinst: use 'sv -v term git-daemon' instead of + 'sv restart git-daemon' to restart git-daemon service if it was running. + * debian/control: git-core: no longer Suggests: cogito, which was removed. + * debian/diff/genindex.diff: apply and remove. + * debian/gitweb.conf: comment out $home_link, and set to gitweb.cgi's + default (thx Ansgar Burchardt for the patch, closes: 441694). + + -- Gerrit Pape Thu, 20 Sep 2007 07:28:41 +0000 + +git-core (1:1.5.3.1-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-daemon-run: improve long description (closes: + #440699). + * debian/git-daemon-run.README.Debian: improve. + * debian/control: git-svn: improve long description. + * debian/control: git-cvs: improve long description. + * debian/control: git-core: improve long description (closes: #412560). + + -- Gerrit Pape Tue, 04 Sep 2007 18:18:33 +0000 + +git-core (1:1.5.3-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * debian/control: git-email: move libemail-valid-perl from Depends: to + Recommends: (thx Uwe Kleine-Koenig, closes: #439902). + * debian/control: git-email: no longer Depends: libmail-sendmail-perl (thx + Uwe Kleine-Koenig). + + -- Gerrit Pape Sun, 02 Sep 2007 16:41:54 +0000 + +git-core (1:1.5.3~rc7-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0002-git-merge-do-up-to-date-check-also-for-all-strategie.diff: + remove; included upstream. + + -- Gerrit Pape Wed, 29 Aug 2007 12:22:16 +0000 + +git-core (1:1.5.3~rc6-1) experimental; urgency=low + + * new upstream release candidate. + * git-am: initialize variable $resume on startup (closes: #435807). + * debian/diff/0002-git-merge-do-up-to-date-check-also-for-all-strategie.diff: + new; http://article.gmane.org/gmane.comp.version-control.git/55981. + * debian/diff/0003-git-sh-setup.sh-fallback-to-editor-not-vi-if-VI.diff: + new; git-sh-setup.sh: fallback to 'editor' not 'vi' if $VISUAL and $EDITOR + are unset (thx Mike Hommey, closes: #438793). + * merge branch debian-sid. + + -- Gerrit Pape Sun, 26 Aug 2007 09:54:16 +0000 + +git-core (1:1.5.2.5-2) unstable; urgency=low + + * debian/git-core.conffiles: new; add /etc/bash_completion.d/git. + + -- Gerrit Pape Sun, 26 Aug 2007 09:49:39 +0000 + +git-core (1:1.5.2.5-1) unstable; urgency=low + + * debian/control: fix typo in Build-Depends: libcurl4-gnutls-dev | + libcurl3-gnutls-dev (thx Mikael Eriksson, closes: #433196). + * new upstream point release. + * debian/rules: add TCLTK_PATH=/usr/bin/wish8.4 to OPTS (closes: #438662). + * dbian/control: git-core: Depends: cpio (closes: #438057). + * debian/git-core.README.Debian: fix typos (closes: #438932). + * debian/versions.upstream, debian/changelog.upstream: adapt. + * debian/rules, debian/control: install git-completion.bash from contrib as + /etc/bash_completion.d/git; git-core: Conflicts:, Provides:, Replaces: + git-completion (closes: #437532, thx Sebastian Harl). + + -- Gerrit Pape Sat, 25 Aug 2007 17:56:20 +0000 + +git-core (1:1.5.3~rc4-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Sat, 04 Aug 2007 13:02:05 +0000 + +git-core (1:1.5.3~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 27 Jul 2007 11:13:52 +0000 + +git-core (1:1.5.3~rc2-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/????-Pack-objects-properly-initialize-the-depth-value.diff: + remove; obsolete. + * debian/control, debian/rules: remove git-p4 package again, moved into + contrib/ upstream; see /usr/share/doc/git-core/contrib/p4import/. + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 20 Jul 2007 08:47:45 +0000 + +git-core (1:1.5.3~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * git-commit: don't add multiple Signed-off-by: from the same identity + (closes: #430851). + * Fix core.sharedRepository = 2 (closes: #432698). + * merge branch debian-sid. + * debian/versions.upstream, debian/changelog.upstream: adapt. + * debian/diff/0002-gitk-properly-resolve-ambiguity-if-argument-is-both.diff: + remove; doesn't apply anymore. + * debian/diff/0002-Pack-objects-properly-initialize-the-depth-value.diff: + new; on upstream advice. + + -- Gerrit Pape Sat, 14 Jul 2007 11:45:27 +0000 + +git-core (1:1.5.2.4-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: build documentation with ASCIIDOC8=YesPlease (closes: + #432560). + * debian/control: Build-Depends: asciidoc (>> 8.0.0). + * debian/diff/????-git-gui-properly-popup-error-if-gitk-should-be-start.diff: + remove; merged upstream. + * debian/control: Build-Depends: libcurl4-gnutls-dev | libcurl3-gnutsl-dev + (closes: #432812). + * debian/versions.upstream, debian/changelog.upstream: adapt. + + -- Gerrit Pape Fri, 13 Jul 2007 19:13:38 +0000 + +git-core (1:1.5.3~rc0-1) experimental; urgency=low + + * new upstream release candidate. + * debian/changelog.upstream.sh: run git shortlog with option --no-merges. + * debian/versions.upstream, debian/changelog.upstream: update. + * debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff, + debian/diff/0004-git-cvsimport-force-checkout-of-working-tree-after-i.diff: + remove; applied upstream. + * debian/diff/00*.diff: adapt. + * debian/rules: put git-gui, git-citool man pages into package git-gui. + + -- Gerrit Pape Tue, 03 Jul 2007 10:01:12 +0000 + +git-core (1:1.5.2.3-1) unstable; urgency=low + + * new upstream point release. + * debian/control: package git-gui: Replaces: git-core (<< 1:1.5.2.2-3) + (thx Frank Lichtenheld, closes: #431481). + * debian/versions.upstream, debian/changelog.upstream: update. + + -- Gerrit Pape Tue, 03 Jul 2007 08:26:11 +0000 + +git-core (1:1.5.2.2-3) unstable; urgency=low + + * debian/rules: move /usr/share/git-gui/ from git-core package into + git-gui package (thx Ansgar Burchardt, closes: #430530). + * debian/diff/0004-git-cvsimport-force-checkout-of-working-tree-after-i.diff: + new; git-cvsimport: force checkout of working tree after initial import + (closes: #430903). + * debian/diff/0005-git-gui-properly-popup-error-if-gitk-should-be-start.diff: + new; git-gui: properly popup error if gitk should be started but is not + installed (#429810). + * debian/control: git-gui: Recommends: gitk (closes: #429810). + * debian/rules: workaround #427907: compile with -O0 instead of -O2 on hppa + (#429389). + + -- Gerrit Pape Fri, 29 Jun 2007 12:54:39 +0000 + +git-core (1:1.5.2.2-2) unstable; urgency=low + + * debian/control: all Architecture: all packages: Depends: git-core (>> + ${source:Upstream-Version}, git-core (<< ${source:Upstream-Version}-.) + instead of (= ${source:Version}) to support binNMUs (closes: #423041, + #430128). + + -- Gerrit Pape Sat, 23 Jun 2007 14:02:36 +0000 + +git-core (1:1.5.2.2-1) unstable; urgency=low + + * new upstream point release. + * Fix typo in remote branch example in git user manual (closes: #427502). + * debian/diff/0003-git-branch-track-fix-tracking-branch-computation.diff: + remove; applied upstream. + * debian/versions.upstream: new; ordered list of upstream versions, + starting with 1.0.0. + * debian/changelog.upstream.sh: new; create changelog.upstream from git + shortlog using debian/versions.upstream. + * debian/changelog.upstream: re-created through changelog.upstream.sh. + * debian/diff/0003-git-svn-trailing-slash-in-prefix-is-mandatory-with.diff: + new; git-svn: trailing slash in prefix is mandatory with --branches/-b + (closes: #429443). + + -- Gerrit Pape Tue, 19 Jun 2007 17:32:30 +0000 + +git-core (1:1.5.2.1-2) unstable; urgency=low + + * debian/diff/0003-git-branch-track-fix-tracking-branch-computation.diff: + new; from upstream master: git-branch --track: fix tracking branch + computation. + + -- Gerrit Pape Fri, 8 Jun 2007 09:04:47 +0000 + +git-core (1:1.5.2.1-1) unstable; urgency=low + + * new upstream point release. + * Create a new manpage for the gitignore format, and reference it + elsewhere (thx Josh Triplett, closes: #427078). + * debian/diff/0002-gitk-properly-resolve-ambiguity-if-argument-is-both.diff: + new; properly resolve ambiguity if argument is both, revision and + filename (closes: #425491). + * debian/control: git-core: Conflicts: git (<< 4.3.20-11) (/usr/bin/git + transition). + * debian/git-daemon-run.README.Debian: new (#422139). + * debian/control: all Architecture: all packages: Depends: git-core + (= ${source:Version}) instead of (>= ...); this makes it no longer + support binNMUs (closes: #425494, reopens: #423041). + + -- Gerrit Pape Sun, 03 Jun 2007 10:09:53 +0000 + +git-core (1:1.5.2-1) unstable; urgency=low + + * merge branch debian-experimental. + * new upstream release. + * gitweb: choose appropriate view for file type if a= parameter missing + (closes: #410465). + * git fetch -q is supported (closes: #423165). + * /usr/bin/git transition (thx Ian Beckwith!). + * debian/git-core.preinst: new; remove /usr/bin/git alternative if + upgrading from versions older than 1:1.5.2~rc3-2. + * debian/git-core.prerm, debian/git-core.postinst: remove; no longer + handle /usr/bin/git alternative through update-alternatives. + * debian/rules: no longer install git program as git-scm. + + -- Gerrit Pape Wed, 30 May 2007 12:38:45 +0000 + +git-core (1:1.5.2~rc3-2) experimental; urgency=low + + * debian/diff/0000-maint-branch-from-20070514.diff: remove; obsolete. + * debian/control: package git-p4: Section: contrib/devel (closes: + #422755). + * debian/control: package git-p4: Depends: git-core (>= ${source:Version}) + instead of (= ${Source-Version}) (to support binNMUs). + + -- Gerrit Pape Tue, 15 May 2007 21:33:06 +0000 + +git-core (1:1.5.1.4-2) unstable; urgency=low + + * debian/diff/0000-maint-branch-from-20070514.diff: new; snapshot upstream + maint branch 20070514: + * includes git-svn fixes (closes: #423599, #423226). + * deian/rules: reverse order when applying diffs (fix typo). + * debian/control: all Architecture: all packages: Depends: git-core (>= + ${source:Version}) instead of (= ${Source-Version}) (to support binNMUs, + closes: #423041). + + -- Gerrit Pape Mon, 14 May 2007 13:15:50 +0000 + +git-core (1:1.5.2~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff: + remove; included upstream. + * debian/control: Build-Depends: tcl8.4 (for gitgui). + * debian/rules: add symlink /etc/init.d/git-daemon -> /usr/bin/sv to + git-daemon-run package (#422139). + + -- Gerrit Pape Mon, 14 May 2007 10:10:02 +0000 + +git-core (1:1.5.1.4-1) unstable; urgency=medium + + * new upstream point release. + * debian/diff/pager-vs-less.diff: rename to + 0001-pager.c-fallback-to-pager-not-less-if-PAGER-is.diff; adapt. + * debian/diff/0002-Optimize-directory-listing-with-pathspec-limiter.diff: + new: Optimize directory listing with pathspec limiter (closes: #420671). + * debian/git-daemon-run.postinst: restart git-daemon service if it was + running. + + -- Gerrit Pape Wed, 09 May 2007 08:48:50 +0000 + +git-core (1:1.5.2~rc2-1) experimental; urgency=low + + * new upstream release candidate. + + -- Gerrit Pape Mon, 07 May 2007 18:02:53 +0000 + +git-core (1:1.5.2~rc1-1) experimental; urgency=low + + * new upstream release candidate. + * debian/control, debian/rules: new package git-p4: tools for importing + development history from perforce repositories. + * debian/rules: add WITH_P4IMPORT=1 to OPTS; no longer install + git-p4import.py into /usr/share/doc/git-core/contrib/; add OPTS to + make clean in target clean:; add PYTHON_PATH=/usr/bin/python to OPTS. + + -- Gerrit Pape Tue, 01 May 2007 12:28:15 +0000 + +git-core (1:1.5.1.3-1) unstable; urgency=low + + * new upstream point release. + * git-add tried to optimize by finding common leading directories + across its arguments but botched, causing very confused behaviour + (closes: #420671). + * Documentation/git-reset.txt: suggest git commit --amend in example + (closes: #420112). + * unofficial rpm.spec file shipped with git was letting ETC_GITCONFIG + set to /usr/etc/gitconfig. Tweak the official Makefile to make it + harder for distro people to make the same mistake, by setting the + variable to /etc/gitconfig if prefix is set to /usr (closes: + #420675). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Tue, 01 May 2007 08:59:06 +0000 + +git-core (1:1.5.1.2-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Sun, 22 Apr 2007 13:31:05 +0000 + +git-core (1:1.5.1.1-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + * debian/diff/0010-rename-contrib-hooks-post-receieve-email-to-contrib.diff: + remove; applied upstream. + + -- Gerrit Pape Thu, 12 Apr 2007 09:05:44 +0000 + +git-core (1:1.5.1-1) unstable; urgency=low + + * new upstream release. + * git-svn got almost a rewrite (closes: #416372). + * debian/diff/git-cvsserver-update-hook.diff: remove; included upstream. + * debian/diff/Documentation-git-svnimport.txt-fix-typo.diff, + debian/diff/http-fetch-don-t-use-double-slash-as-directory-sepa.diff, + debian/diff/Documentation-git-rev-parse.txt-fix-example-in-SPEC.diff: + remove; applied upstream. + * debian/diff/GNU-Hurd.diff: remove; obsolete. + * debian/git-daemon-run.postrm: check for deluser being available, if + not, print warning and don't remove system user (closes: #416755). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement, and git shortlog. + * debian/diff/0010-rename-contrib-hooks-post-receieve-email-to-contrib.diff: + new; rename contrib/hooks/post-receieve-email to contrib/hooks/post- + receive-email. + + -- Gerrit Pape Wed, 4 Apr 2007 11:56:18 +0000 + +git-core (1:1.5.0.6-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/http-fetch-don-t-use-double-slash-as-directory-sepa.diff: + new, cherry-pick'ed from upstream master: http-fetch: don't use + double-slash as directory separator in URLs (closes: #409887). + * debian/diff/Documentation-git-svnimport.txt-fix-typo.diff: new: + Documentation/git-svnimport.txt: fix typo. + * debian/diff/Documentation-git-rev-parse.txt-fix-example-in-SPEC.diff: + new Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES + (closes: #404795). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Thu, 29 Mar 2007 10:51:00 +0000 + +git-core (1:1.5.0.5-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: make sure subdirectories of /usr/share/doc/git-core/ are + mode 0755 (closes: #415328); remove .gitignore file(s) from + /usr/share/doc/git-core/ (closes: #413913). + * debian/control: git-svn: Depends: libterm-readkey-perl (thx Pierre + Habouzit, closes: #415475). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Wed, 21 Mar 2007 17:02:27 +0000 + +git-core (1:1.5.0.3-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/cvsexportcommit-.msg.diff: remove; applied upstream. + * debian/git-core.docs, debian/git-doc.docs: add RelNotes. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 5 Mar 2007 19:44:05 +0000 + +git-core (1:1.5.0.2-1) unstable; urgency=low + + * new upstream point release. + * debian/control: git-core: Conflicts: qgit (<< 1.5.5) (closes: #412452). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/cvsexportcommit-.msg.diff: new; don't cleanup .msg if not + yet committed to cvs (closes: #412732). + + -- Gerrit Pape Wed, 28 Feb 2007 15:50:53 +0000 + +git-core (1:1.5.0.1-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/git-cvsserver-update-hook.diff: new from upstream pu branch: + Have git-cvsserver call hooks/update before really altering the ref. + * debian/control: git-cvs: Depends: libdbd-sqlite3-perl (git-cvsserver). + + -- Gerrit Pape Sun, 25 Feb 2007 11:38:34 +0000 + +git-core (1:1.5.0-1) experimental; urgency=low + + * new upstream release. + * debian/diff/archimport-empty-dir.diff: remove; applied upstream. + * debian/diff/pager-vs-less.diff, debian/diff/Add-install-lib-target.diff: + adapt. + * debian/control: new package git-gui, the git graphical user interface; + git-core: no longer Depends:, Build-Depends: rcs; git-core: Suggests: + git-gui. + * debian/rules: new package git-gui. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements and git shortlog. + * debian/git-daemon/run: don't limit git-daemon's memory resources. + * debian/control, debian/rules: remove git-core-dev package again, + libgit.a is not a publically usable/useful library at this moment, as + its internal API is not cast in stone yet. + * debian/diff/Add-install-lib-target.diff: remove; there's no git-core-dev + package. + + -- Gerrit Pape Fri, 16 Feb 2007 07:18:44 +0000 + +git-core (1:1.5.0~rc3-1) experimental; urgency=low + + * new upstream release candidate. + * debian/diff/Add-install-lib-target.diff: new; add install-lib target to + install libgit.a library plus header files (thx Luca Falavigna). + * debian/rules: new package git-core-dev; remove obsolete + WITH_SEND_EMAIL=1, OPTIMIZE="..." from $(OPTS); remove + WITH_OWN_SUBPROCESS_PY=1 from $(OPTS), it's no longer necessary (thx + Luca Falavigna; closes: #403731); make git-p4import.pl available through + /usr/share/doc/git-core/contrib/ (closes: #403387); minor cleanup. + * debian/control: new package git-core-dev (thx Luca Falavigna; closes: + #407722); no longer Build-Depends: python; git-core: no longer Recommends: + python, Suggests: git-core-dev; update short and long descriptions + (closes: #406323); git-arch: Depends: tla, instead of Suggests:. + * debian/diff/GNU-Hurd.diff: adapt. + * debian/diff/archimport-empty-dir.diff: new; git-archimport: initial import + needs empty directory (closes: #400508). + * debian/gitweb.README.Debian: typo. + + -- Gerrit Pape Sat, 3 Feb 2007 09:32:48 +0000 + +git-core (1:1.4.4.4-1) unstable; urgency=low + + * new upstream release, important fixes: + * pack-check.c::verify_packfile(): don't run SHA-1 update on huge data. + * Fix infinite loop when deleting multiple packed refs. + * diff --check: fix off by one error. + * debian/diff/0001-spurious-.sp-in-manpages.diff: remove; included in + upstream version. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Tue, 9 Jan 2007 19:43:56 +0000 + +git-core (1:1.4.4.3-1) unstable; urgency=medium + + * new upstream release (closes: #404796); important fixes: + * Make sure the empty tree exists when needed in merge-recursive; the + error message may make the user think that their database is corrupt + when its actually not. + * Don't use memcpy when source and dest. buffers may overlap. + * cvsserver: Avoid miscounting bytes in Perl v5.8.x; this breaks the + counting of bytes for the CVS protocol, resulting in the client + expecting less data than we actually send, and storing truncated files. + * debian/diff/0001-spurious-.sp-in-manpages.diff: new from upstream git; + work around spurious .sp in manpages (closes: #388370). + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + + -- Gerrit Pape Fri, 29 Dec 2006 07:38:15 +0000 + +git-core (1:1.4.4.2-1) unstable; urgency=low + + * new upstream release. + * fixes FTBFS on m68k (thx Roman Zippel, closes: #402022). + * 0001-archive-zip-don-t-use-sizeof-struct.diff, + 0002-git-svn-error-out-from-dcommit-on-a-parent-less-commit.diff, + 0003-git-svn-correctly-handle-revision-0-in-SVN-repositories.diff, + 0004-git-svn-preserve-uncommitted-changes-after-dcommit.diff, + 0005-Increase-length-of-function-name-buffer.diff: remove; obsolete. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements and git log | git shortlog. + + -- Gerrit Pape Fri, 8 Dec 2006 19:13:49 +0000 + +git-core (1:1.4.4.1-1) unstable; urgency=low + + * new upstream release (closes: #400191). + * 0001-archive-zip-don-t-use-sizeof-struct.diff: new from upstream git; + replaces debian/diff/not-packed-structs.diff. + * 0002-git-svn-error-out-from-dcommit-on-a-parent-less-commit.diff, + 0003-git-svn-correctly-handle-revision-0-in-SVN-repositories.diff, + 0004-git-svn-preserve-uncommitted-changes-after-dcommit.diff, + 0005-Increase-length-of-function-name-buffer.diff: new from upstream + git. + * debian/diff/genindex.diff: new; support subdirs in gitweb example index + generator (thx David Nusinow; closes: #400284). + * debian/diff/GNU-Hurd.diff, debian/diff/pager-vs-less.diff: adapt. + + -- Gerrit Pape Sun, 26 Nov 2006 14:31:39 +0000 + +git-core (1:1.4.4-2) unstable; urgency=low + + * debian/diff/not-packed-structs.diff: new; don't use sizeof(struct ...), + size doesn't match on arm (fixes selftests failure on arm). + + -- Gerrit Pape Wed, 22 Nov 2006 23:31:11 +0000 + +git-core (1:1.4.4-1) unstable; urgency=low + + * new upstream release (closes: #399575). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/control: Build-Depends: unzip (for selftests). + + -- Gerrit Pape Tue, 21 Nov 2006 09:43:37 +0000 + +git-core (1:1.4.3.5-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 13 Nov 2006 17:46:50 +0000 + +git-core (1:1.4.3.3-2) unstable; urgency=medium + + * debian/git-daemon-run.postinst: don't make the log service system user + gitlog member of group adm, but nogroup; gitlog's home directory is + /nonexistent (thx Florian Weimer, closes: #396687). + * debian/git-daemon/log/run: make /var/log/git-daemon log directory mode + 2750, owner gitlog:adm. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + + -- Gerrit Pape Mon, 6 Nov 2006 20:12:08 +0000 + +git-core (1:1.4.3.3-1) unstable; urgency=low + + * new upstream release. + * debian/diff/0001-Set-HOME-for-selftests.diff: remove; applied upstream. + * debian/control: git-core: Depends: libdigest-sha1-perl (closes: #395304, + thx Ichthyostega). + + -- Gerrit Pape Tue, 31 Oct 2006 07:31:21 +0000 + +git-core (1:1.4.3.2-1) unstable; urgency=low + + * new upstream release. + * debian/diff/gitweb.conf.diff: remove; obsolete. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/rules: add 'GITWEB_CONFIG=/etc/gitweb.conf mandir=/usr/share/man + OPTIMIZE="-O2 -g -Wall" INSTALLDIRS=vendor' to build OPTS, adapt paths; + git-arch: don't include git-archive, git-upload-archive; gitweb: install + git-logo.png, git-favicon.png; git-core: properly install new Git.pm + plus man page. + * debian/diff/0001-Set-HOME-for-selftests.diff: new; set $HOME for + selftests (fixes build/selftest failures). + * debian/control: git-core: Depends: liberror-perl. + + -- Gerrit Pape Tue, 24 Oct 2006 16:32:35 +0000 + +git-core (1:1.4.2.3-2) unstable; urgency=low + + * debian/control: new package git-daemon-run: provide a git-daemon + service; git-core: no longer Suggests: runit, Depends: adduser, the + git-daemon-run package now Depends: runit, adduser. + * debian/debian/git-core.postinst, debian/git-daemon-run.postrm, + debian/git-daemon-run.prerm: new; manage gitlog user and git-daemon + service (closes: #388144). + * debian/git-core.postinst: no longer adduser gitlog, git-daemon-run + package does now. + * debian/git-core.postrm: remove; obsolete. + * debian/rules: install git-daemon service directory in the new + git-daemon-run package instead of the git-core package. + * debian/git-core.conffiles: rename to debian/git-daemon-run.conffiles. + * debian/git-core.README.Debian: adapt. + * debian/control: git-core: Suggests: git-daemon-run. + + -- Gerrit Pape Sun, 8 Oct 2006 09:29:50 +0000 + +git-core (1:1.4.2.3-1) unstable; urgency=medium + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/t3403-skip-3-7.diff: remove; git-am is fixed upstream. + * debian/gitweb.conf: add $stylesheet = "/gitweb.css" (thx Christian + Kujau, closes: #383065). + + -- Gerrit Pape Sun, 8 Oct 2006 07:31:03 +0000 + +git-core (1:1.4.2.1-1) unstable; urgency=low + + * new upstream release (closes: #386820, #387405). + * debian/changelog.upstream: upstream changes taken from mailing list + announcements. + * debian/diff/GNU-Hurd.diff: new; make the build process detect and + support the Debian GNU/Hurd architecture (thx Cyril Brulebois, closes: + #379841). + * debian/diff/GNU-kFreeBSD.diff: remove; applied upstream. + * debian/rules: gitweb: install gitweb.css into /var/www/ instead of + /usr/share/doc/gitweb/ (thx Matthijs Melchior, closes: #383065). + * debian/gitweb.docs: remove; obsolete. + * debian/examples/index.aux-generation: example script to generate an + optional index.aux file for the use with gitweb (thx Matthew Wilcox, + #383219). + * debian/gitweb.examples: new; install debian/examples/index.aux-generation + (#383219). + * debian/git-core.README.Debian: new; hints on how to set up a + git.example.org server providing git://, rsync://, http:// access to + repositories from Matthew Wilcox (thx!, closes: #383219). + * debian/gitweb.README.Debian: cleanup; refer to git-core.README.Debian. + * debian/control: git-svn: Depends: libsvn-perl | libsvn-core-perl (thx + Peter Samuelson); git-core, git-doc: Suggests: gitweb; gitweb: + Recommends: git-doc. + * debian/diff/pager-vs-less.diff, debian/diff/gitweb.conf.diff: adapt. + * debian/git-daemon/: new; git-daemon service directory for the use with + runit. + * debian/control: Build-Depends: subversion, libsvn-perl | libsvn-core-perl + (for git-svn selftests); git-core: Suggests: runit, Depends: adduser. + * debian/diff/t3403-skip-3-7.diff: new; skip selftests 3,7 in t3403 as + they fail without a terminal connected. + * debian/git-core.conffiles: new; add /etc/sv/git-daemon/run, + /etc/sv/git-daemon/log/run. + + -- Gerrit Pape Fri, 15 Sep 2006 12:46:58 +0000 + +git-core (1:1.4.1.1-1) unstable; urgency=low + + * new upstream release. + * debian/diff/GNU-kFreeBSD.diff: new; make the build process detect and + support the Debian GNU/kFreeBSD architecture (thx Petr Salinger, closes: + #380209). + + -- Gerrit Pape Sat, 29 Jul 2006 15:31:04 +0000 + +git-core (1:1.4.1-2) unstable; urgency=low + + * adopt package gitweb, now included in git-core upstream source (thx + Andres Salomon): + * debian/control, debian/rules: build gitweb package. + * debian/copyright: adapt. + * debian/gitweb.README.Debian, debian/gitweb.conf, debian/gitweb.docs: + new; taken from Andres' gitweb package. + * debian/diff/gitweb.conf.diff: new; adapt Andres' gitweb.conf.patch. + * debian/gitweb.conffiles: new; /etc/gitweb.conf. + * debian/changelog: use epoch 1 to supersede gitweb-264 package version. + * debian/rules: set DESTDIR in environment, not build flags. + + -- Gerrit Pape Thu, 27 Jul 2006 21:44:06 +0000 + +git-core (1.4.1-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: upstream changes taken from mailing list + announcement. + * debian/rules: user same build flags and prefix to $(MAKE) in build + and install target to prevent rebuild in install target. + + -- Gerrit Pape Tue, 11 Jul 2006 21:38:33 +0000 + +git-core (1.4.0-1) unstable; urgency=low + + * new upstream release. + * debian/changelog.upstream: new; upstream changes taken from mailing + list announcement. + * debian/rules: install debian/changelog.upstream as upstream changelog. + * debian/diff/pager-vs-less.diff: adapt. + * debian/control: Standards-Version: 3.7.2.0. + + -- Gerrit Pape Wed, 14 Jun 2006 17:04:56 +0000 + +git-core (1.3.3-2) unstable; urgency=medium + + * debian/control: git-core: Depends: perl-modules (closes: #369737). + * debian/diff/pager-vs-less.diff: new; fallback to `pager` not `less` + if $PAGER is unset (closes: #369742). + + -- Gerrit Pape Sat, 10 Jun 2006 11:18:48 +0000 + +git-core (1.3.3-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Thu, 25 May 2006 10:46:00 +0000 + +git-core (1.3.2-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Wed, 10 May 2006 20:41:39 +0000 + +git-core (1.3.1-1) unstable; urgency=low + + * new upstream release (closes: #364678). + * debian/rules: install contrib/ directory into /usr/share/doc/git-core/. + + -- Gerrit Pape Mon, 1 May 2006 13:01:42 +0000 + +git-core (1.2.6-1) unstable; urgency=low + + * new upstream release. + * debian/control: git-cvs: Depends: cvsps (>> 2.1-0). + + -- Gerrit Pape Sun, 16 Apr 2006 14:37:53 +0000 + +git-core (1.2.4-1) unstable; urgency=low + + * new upstream release (closes: #354563). + + -- Gerrit Pape Fri, 3 Mar 2006 21:33:58 +0000 + +git-core (1.2.1-1) unstable; urgency=low + + * new upstream release (closes: #353041). + * debian/control: git-core: Recommends: ssh-client instead of + openssh-client (closes: #350708). + + -- Gerrit Pape Thu, 16 Feb 2006 09:33:42 +0000 + +git-core (1.1.5-1) unstable; urgency=high + + * new upstream release. + * checkout: do not make a temporary copy of symlink target. + If the index records an insanely long symbolic link, copying + into the temporary would overflow the buffer (noticed by Mark + Wooding). (closes: #350274). + + -- Gerrit Pape Sat, 28 Jan 2006 20:16:44 +0000 + +git-core (1.1.3-1) unstable; urgency=low + + * new upstream release. + + -- Gerrit Pape Mon, 16 Jan 2006 10:19:37 +0000 + +git-core (1.0.8-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/t6001-rev-lisge-order.sh.diff: remove; applied upstream. + * debian/control: Build-Depends: libcurl3-gnutls-dev | libcurl3-dev, + python, asciidoc (>> 7.0.2-3) (ease backport to sarge, thx Norbert + Tretkowski, closes: #344929). + + -- Gerrit Pape Mon, 9 Jan 2006 19:19:36 +0000 + +git-core (1.0.6-1) unstable; urgency=low + + * new upstream point release. + * debian/diff/t6001-rev-list-merge-order.sh.diff: new: fix skipping + merge-order test with NO_OPENSSL=1. + * debian/rules: re-enable git-rev-list --merge-order selftests. + * debian/control: git-svn: Depends: libwww-perl (closes: #345045). + + -- Gerrit Pape Mon, 2 Jan 2006 20:25:57 +0000 + +git-core (1.0.5-1) unstable; urgency=low + + * new upstream point release. + * debian/rules: don't take upstream changelog from upstream + debian/changelog. + * debian/changelog.upstream: remove again. + + -- Gerrit Pape Tue, 27 Dec 2005 13:25:53 +0000 + +git-core (1.0.3-1) unstable; urgency=low + + * new upstream point release. + * debian/changelog.upstream: new: upstream changelog taken from upstream + debian/changelog. + * debian/rules: install debian/changelog.upstream as upstream changelog; + remove obsolete VERSION variable. + + -- Gerrit Pape Fri, 23 Dec 2005 14:58:14 +0000 + +git-core (1.0.0-1) unstable; urgency=medium + + * new upstream release: GIT 1.0.0. + + -- Gerrit Pape Wed, 21 Dec 2005 16:17:18 +0000 + +git-core (0.99.9n-1) unstable; urgency=low + + * new upstream version: GIT 0.99.9n aka 1.0rc6. + * debian/rules: rename git program in git-core package to git-scm, + handle /usr/bin/git program through update-alternatives (as suggested + by Ian Beckwith, see #342363). + * debian/control: git-core: Conflicts: git (<< 4.3.20-8) (closes: + #342363). + * debian/git-core.postinst, debian/git-core.prerm: new: run + update-alternatives --install /usr/bin/git git /usr/bin/git-scm with + priority 70 on configure, and --remove on remove respectively. + + -- Gerrit Pape Thu, 15 Dec 2005 11:24:51 +0000 + +git-core (0.99.9m-1) unstable; urgency=low + + * new upstream version: GIT 0.99.9m aka 1.0rc5. + * sets PYTHONPATH for selftests (fixes autobuild test failures). + * switch from tarball-in-tarball approach to original upstream tarball. + * debian/changelog: add changelog history, Junio C Hamano, Ryan Anderson, + Eric Biederman previously were maintaining this package unofficially. + * debian/control: Build-Depends: rcs (for selftests); git-core: + Recommends: patch, less, Suggests: cogito; git-arch: Suggests: tla, + bazzar; git-cvs: Depends: cvsps, Suggests: cvs; git-svn: Depends: + libsvn-core-perl (closes:#342617), Suggests: subversion; git-email: + Depends: libmail-sendmail-perl, libemail-valod-perl; update short + description (lots taken from upstream unofficial package, thx). + * debian/git-core.docs, debian/git-doc.docs: adapt. + * debian/rules: adapt; remove target unpack; add target patch; adapt + target clean. + + -- Gerrit Pape Wed, 14 Dec 2005 19:48:41 +0000 + +git-core (0.99.9l-1) unstable; urgency=low + + * new upstream version. + * debian/rules: apply diffs with patch -p1. + * debian/control, debian/rules: split off git-arch, git-cvs, git-svn, + git-email packages, as suggested by upstream: + http://article.gmane.org/gmane.comp.version-control.git/13185 + * debian/git-doc.docs: get docs from temporary install directory; + include *.txt docs. + * debian/control: git-doc: Section: doc; Suggests: git-core, git-arch, + git-cvs, git-svn, git-email, gitk; git-core: Suggests: git-arch, + git-cvs, git-svn, git-email, gitk. + + -- Gerrit Pape Mon, 5 Dec 2005 18:04:37 +0000 + +git-core (0.99.9k-1) unstable; urgency=low + + * new upstream version. + * debian/implicit: update to revision 1.11. + * debian/git-doc.docs: add git/Documentation/howto, + git/Documentation/technical (closes: #341178). + + -- Gerrit Pape Tue, 29 Nov 2005 21:45:53 +0000 + +git-core (0.99.9j-1) unstable; urgency=low + + * initial version. + * debian/control: git-core: Replaces: cogito (<< 0.16rc2-0); cogito >= + 0.16rc2-0 no longer includes the git core components, but depends on + the git-core package (see #338789). + + -- Gerrit Pape Fri, 18 Nov 2005 22:26:36 +0000 + +git-core (0.99.9j-0) unstable; urgency=low + + * GIT 0.99.9j aka 1.0rc3 + + -- Junio C Hamano Wed, 16 Nov 2005 20:39:55 -0800 + +git-core (0.99.9i-0) unstable; urgency=low + + * GIT 0.99.9i aka 1.0rc2 + + -- Junio C Hamano Mon, 14 Nov 2005 18:38:27 -0800 + +git-core (0.99.9h-0) unstable; urgency=low + + * GIT 0.99.9h + + -- Junio C Hamano Fri, 11 Nov 2005 22:33:18 -0800 + +git-core (0.99.9g-0) unstable; urgency=low + + * GIT 0.99.9g + + -- Junio C Hamano Wed, 9 Nov 2005 21:01:55 -0800 + +git-core (0.99.9f-0) unstable; urgency=low + + * GIT 0.99.9f + + -- Junio C Hamano Tue, 8 Nov 2005 01:21:52 -0800 + +git-core (0.99.9e-0) unstable; urgency=low + + * GIT 0.99.9e + + -- Junio C Hamano Sun, 6 Nov 2005 18:37:18 -0800 + +git-core (0.99.9d-0) unstable; urgency=low + + * GIT 0.99.9d + + -- Junio C Hamano Sat, 5 Nov 2005 11:46:37 -0800 + +git-core (0.99.9c-0) unstable; urgency=low + + * GIT 0.99.9c + + -- Junio C Hamano Thu, 3 Nov 2005 15:44:54 -0800 + +git-core (0.99.9b-0) unstable; urgency=low + + * GIT 0.99.9b + + -- Junio C Hamano Tue, 1 Nov 2005 21:39:39 -0800 + +git-core (0.99.9a-0) unstable; urgency=low + + * GIT 0.99.9a + + -- Junio C Hamano Sun, 30 Oct 2005 15:03:32 -0800 + +git-core (0.99.9.GIT-2) unstable; urgency=low + + * Build Dependency did not include libexpat-dev. + + -- Junio C Hamano Sun, 13 Nov 2005 01:55:34 -0800 + +git-core (0.99.9.GIT-1) unstable; urgency=low + + * Do not scatter txt and html documentation into feature + subpackages. Do place man pages into them. + * Capture more cvs stuff into git-cvs package. + + -- Junio C Hamano Tue, 8 Nov 2005 01:19:06 -0800 + +git-core (0.99.9.GIT-0) unstable; urgency=low + + * Test Build. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + +git-core (0.99.9-1) unstable; urgency=low + + * Split the git-core binary package into core, doc, and foreign SCM + interoperability modules. + + -- Junio C Hamano Sat, 5 Nov 2005 11:18:13 -0800 + +git-core (0.99.9-0) unstable; urgency=low + + * GIT 0.99.9 + + -- Junio C Hamano Sat, 29 Oct 2005 14:34:30 -0700 + +git-core (0.99.8-0) unstable; urgency=low + + * GIT 0.99.8 + + -- Junio C Hamano Sun, 2 Oct 2005 12:54:26 -0700 + +git-core (0.99.7-0) unstable; urgency=low + + * GIT 0.99.7 + + -- Junio C Hamano Sat, 10 Sep 2005 18:36:39 -0700 + +git-core (0.99.6-0) unstable; urgency=low + + * GIT 0.99.6 + + -- Junio C Hamano Wed, 24 Aug 2005 23:09:35 -0700 + +git-core (0.99.5-1) unstable; urgency=low + + * Enable git-send-email on Debian. There is no reason to shy + away from it, since we have the necessary Perl modules available. + + -- Junio C Hamano Thu, 25 Aug 2005 14:16:59 -0700 + +git-core (0.99.5-0) unstable; urgency=low + + * GIT 0.99.5 + + -- Junio C Hamano Wed, 10 Aug 2005 22:05:00 -0700 + +git-core (0.99.4-4) unstable; urgency=low + + * Mark git-tk as architecture neutral. + + -- Junio C Hamano Fri, 12 Aug 2005 13:25:00 -0700 + +git-core (0.99.4-3) unstable; urgency=low + + * Split off gitk. + * Do not depend on diff which is an essential package. + * Use dh_movefiles, not dh_install, to stage two subpackages. + + -- Matthias Urlichs Thu, 11 Aug 2005 01:43:24 +0200 + +git-core (0.99.4-2) unstable; urgency=low + + * Git 0.99.4 official release. + + -- Junio C Hamano Wed, 10 Aug 2005 15:00:00 -0700 + +git-core (0.99.4-1) unstable; urgency=low + + * Pass prefix down to the submake when building. + + -- Junio C Hamano Sat, 6 Aug 2005 13:00:00 -0700 + +git-core (0.99-2) unstable; urgency=low + + * Conflict with the GNU Interactive Tools package, which also installs + /usr/bin/git. + * Use the Mozilla SHA1 code and/or the PPC assembly in preference to + OpenSSL. This is only a partial fix for the license issues with OpenSSL. + * Minor tweaks to the Depends. + + -- Ryan Anderson Sat, 23 Jul 2005 14:15:00 -0400 + +git-core (0.99-1) unstable; urgency=low + + * Update deb package support to build correctly. + + -- Ryan Anderson Thu, 21 Jul 2005 02:03:32 -0400 + +git-core (0.99-0) unstable; urgency=low + + * Initial deb package support + + -- Eric Biederman Tue, 12 Jul 2005 10:57:51 -0600 --- git-1.7.10.4.orig/debian/gitweb.README.Debian +++ git-1.7.10.4/debian/gitweb.README.Debian @@ -0,0 +1,19 @@ +gitweb for Debian +----------------- + +The gitweb CGI by default looks into the directory /var/cache/git/ for +browsable repositories (this is configured in /etc/gitweb.conf). It expects +the repositories' .git subdirectories in /var/cache/git/, symlinks pointing +to the corresponding subdirectories in the repositories are just fine, e.g.: + + ln -s ~pape/git/foo/.git /var/cache/git/foo.git + +On systems with an Apache webserver, gitweb is automatically made available at +http://localhost/gitweb. You can deactivate it by commenting out the first +line of /etc/apache2/conf.d/gitweb. + +For more details about setting up gitweb for a git.example.org server, and +on how to make the git core tools such as 'git clone' work through http, see +/usr/share/doc/git/README.Debian. + + -- Gerrit Pape Fri, 15 Sep 2006 09:19:37 +0000 --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-howtos +++ git-1.7.10.4/debian/git-doc.doc-base.git-howtos @@ -0,0 +1,16 @@ +Document: git-howtos +Title: Git How-to Documents +Author: The git list +Abstract: Mailing list postings made by various people + describing how they use git in their workflow. +Section: File Management + +Format: Text +Index: /usr/share/doc/git-doc/howto-index.txt +Files: /usr/share/doc/git-doc/howto-index.txt + /usr/share/doc/git-doc/howto/*.txt + +Format: HTML +Index: /usr/share/doc/git-doc/howto-index.html +Files: /usr/share/doc/git-doc/howto-index.html + /usr/share/doc/git-doc/howto/*.html --- git-1.7.10.4.orig/debian/git.conffiles +++ git-1.7.10.4/debian/git.conffiles @@ -0,0 +1 @@ +/etc/bash_completion.d/git --- git-1.7.10.4.orig/debian/git.lintian-overrides +++ git-1.7.10.4/debian/git.lintian-overrides @@ -0,0 +1,8 @@ +# the git manual pages are in the git-man package. +git binary: binary-without-manpage usr/bin/git +git binary: binary-without-manpage usr/bin/git-receive-pack +git binary: binary-without-manpage usr/bin/git-shell +git binary: binary-without-manpage usr/bin/git-upload-archive +git binary: binary-without-manpage usr/bin/git-upload-pack +# every new .git dir contains empty branches/ to support old scripts. +git binary: package-contains-empty-directory usr/share/git-core/templates/branches/ --- git-1.7.10.4.orig/debian/git-daemon-sysvinit.README.Debian +++ git-1.7.10.4/debian/git-daemon-sysvinit.README.Debian @@ -0,0 +1,31 @@ +git-daemon-sysvinit for Debian +------------------------------ + +This package enables a git-daemon service. This allows people to use a +git:// URL to access your repositories. + +After installing this package, the daemon needs to be enabled in +/etc/default/git-daemon by setting: + + GIT_DAEMON_ENABLE=false + +to: + + GIT_DAEMON_ENABLE=true + +After that, the git daemon can be started with: + + # /etc/init.d/git-daemon start + +The git daemon by default looks into the directory /var/cache/git/ for +repositories (this is configured in /etc/default/git-daemon). It expects +the repositories' .git subdirectories in that directory, symlinks +pointing to the corresponding subdirectories in the repositories are just +fine, e.g.: + + ln -s ~daniel/git/foo/.git /var/cache/git/foo.git + +This makes 'git-clone git://git.example.org/git/foo' to clone the foo +repository on remote machines work. + + -- Daniel Baumann Tue, 19 Oct 2010 00:54:58 +0200 --- git-1.7.10.4.orig/debian/git-core.preinst +++ git-1.7.10.4/debian/git-core.preinst @@ -0,0 +1,5 @@ +#!/bin/sh +set -e + +test -z "$2" || dpkg --compare-versions "$2" gt '1:1.5.2~rc3-2' || + exec update-alternatives --remove git /usr/bin/git-scm --- git-1.7.10.4.orig/debian/copyright +++ git-1.7.10.4/debian/copyright @@ -0,0 +1,389 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: git@vger.kernel.org +Source: http://code.google.com/p/git-core/downloads/list + +Files: * +Copyright: © 2005-2012, Linus Torvalds and others. +License: GPL-2 + +Files: xdiff/* +Copyright: © 2003-2009, Davide Libenzi, Johannes E. Schindelin +License: LGPL-2.1+ + +Files: xdiff/xhistogram.c +Copyright: © 2010, Google Inc. + and other copyright owners as documented in JGit's IP log. +License: EDL-1.0 + +Files: gitk-git/* +Copyright: © 2005-2011, Paul Mackerras, et al. +License: GPL-2+ + +Files: git-gui/* +Copyright: © 2005-2010, Shawn Pearce, et. al. +License: GPL-2+ + +Files: git-gui/po/de.po git-gui/po/fr.po git-gui/po/glossary/* +Copyright: © 2007-2008, Shawn Pearce, et al. +License: GPL-2 +Comment: This file is distributed under the same license as the git package. + +Files: git-gui/po/glossary/pt_br.po +Copyright: © 2007, Shawn Pearce, et al. +License: GPL-2+ +Comment: This file is distributed under the same license as the git-gui package. + +Files: gitweb/static/js/* +Copyright: © 2007, Fredrik Kuivinen + © 2007, Petr Baudis + © 2008-2011, Jakub Narebski + © 2011, John 'Warthog9' Hawley +License: GPL-2+ + +Files: git-svn.perl +Copyright: © 2006, Eric Wong +License: GPL-2+ + +Files: vcs-svn/* +Copyright: © 2010, David Barr + © 2008, Jason Evans + © 2005, Stefan Hegny, hydrografix Consulting GmbH, + Frankfurt/Main, Germany + and others, see http://svn2cc.sarovar.org +License: BSD-2-clause + +Files: imap-send.c +Copyright: © 2000-2002, Michael R. Elkins + © 2002-2004, Oswald Buddenhagen + © 2004, Theodore Y. Ts'o + © 2006, Mike McCormack +Name: git-imap-send - drops patches into an imap Drafts folder + derived from isync/mbsync - mailbox synchronizer +License: GPL-2+ + +Files: perl/Git.pm +Copyright: © 2006, by Petr Baudis +License: GPL-2+ + +Files: perl/private-Error.pm +Copyright: © 1997-8, Graham Barr +License: GPL-1+ or Artistic-1 + This program is free software; you can redistribute it and/or modify + it under the terms of either: + . + a) the GNU General Public License as published by the Free Software + Foundation; either version 1, or (at your option) any later + version, or + . + b) the "Artistic License" which comes with Perl. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL' and + the Artistic Licence in '/usr/share/common-licenses/Artistic'. + +Files: kwset.c kwset.h +Copyright: © 1989, 1998, 2000, 2005, Free Software Foundation, Inc. +License: GPL-2+ + +Files: trace.c +Copyright: © 2000-2002, Michael R. Elkins + © 2002-2004, Oswald Buddenhagen + © 2004, Theodore Y. Ts'o + © 2006, Mike McCormack + © 2006, Christian Couder +License: GPL-2+ + +Files: sh-i18n--envsubst.c +Copyright: © 2010, Ævar Arnfjörð Bjarmason + © 1998-2007, Free Software Foundation, Inc. +License: GPL-2+ + +Files: t/test-lib.sh +Copyright: © 2005, Junio C Hamano +License: GPL-2+ + +Files: compat/fnmatch/* +Copyright: © 1991-1999, Free Software Foundation, Inc. +License: LGPL-2+ +Comment: This file is part of the GNU C Library. + +Files: compat/inet_ntop.c compat/inet_pton.c +Copyright: © 1996-2001, Internet Software Consortium. +License: ISC + +Files: compat/win32/poll.c compat/win32/poll.h +Copyright: © 2001-2003, 2006-2011, Free Software Foundation, Inc. +Name: Emulation for poll(2) from gnulib. +License: GPL-2+ + +Files: compat/vcbuild/include/sys/utime.h +Copyright: ? +License: mingw-runtime + +Files: compat/nedmalloc/* +Copyright: © 2005-2006 Niall Douglas +License: Boost + +Files: compat/nedmalloc/malloc.c.h +Copyright: © 2006, KJK::Hyperion +License: dlmalloc + +Files: compat/regex/* +Copyright: © 1985, 1989-93, 1995-2010, Free Software Foundation, Inc. +Name: Extended regular expression matching and search library +License: LGPL-2.1+ + +Files: compat/strtok_r.c +Copyright: © 1991, 1996-1999, 2001, 2004, Free Software Foundation, Inc. +Name: Reentrant string tokenizer. Generic version. +License: LGPL-2.1+ + +Files: compat/obstack.c compat/obstack.h +Copyright: © 1988-1994, 1996-2005, 2009, Free Software Foundation, Inc. +Name: Object stack macros. +License: LGPL-2.1+ + +Files: contrib/fast-import/git-p4 +Copyright: © 2007, Simon Hausmann + © 2007, Trolltech ASA +License: Expat + +Files: contrib/hg-to-git/hg-to-git.py +Copyright: © 2007, Stelian Pop +Name: hg-to-git.py - A Mercurial to GIT converter +License: GPL-2+ + +Files: contrib/mw-to-git/git-remote-mediawiki +Copyright: © 2011 + Jérémie Nikaes + Arnaud Lacurie + Claire Fousse + David Amouyal + Matthieu Moy +License: GPL-2+ + +Files: debian/* +Copyright: © 2005, Sebastian Kuzminsky + © 2005-2006, Andres Salomon + © 2005-2012, Gerrit Pape +License: GPL-2 + +License: GPL-2 + You can redistribute this software and/or modify it under the terms of + the GNU General Public License as published by the Free Software + Foundation; version 2 dated June, 1991. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + On Debian systems, the complete text of the GNU Library General Public License + can be found in the /usr/share/common-licenses/LGPL-2 file. + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-2.1. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice(s), this list of conditions and the following disclaimer + unmodified other than the allowable addition of one or more + copyright notices. + 2. Redistributions in binary form must reproduce the above copyright + notice(s), this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + +License: Expat + : + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License: EDL-1.0 + Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the following + conditions are met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + - Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + . + - Neither the name of the Eclipse Foundation, Inc. nor the + names of its contributors may be used to endorse or promote + products derived from this software without specific prior + written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: mingw-runtime + This file has no copyright assigned and is placed in the Public Domain. + This file is a part of the mingw-runtime package. + . + The mingw-runtime package and its code is distributed in the hope that it + will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR + IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to + warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + You are free to use this package and its code without limitation. + +License: Boost + It is licensed under the Boost Software License which basically means + you can do anything you like with it. This does not apply to the malloc.c.h + file which remains copyright to others. + . + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: dlmalloc + This is a version (aka dlmalloc) of malloc/free/realloc written by + Doug Lea and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain. Send questions, + comments, complaints, performance data, etc to dl@cs.oswego.edu + . + Incorporates code from intrin_x86.h, which bears the following notice: + . + Compatibility header for GCC -- GCC equivalents of intrinsic + Microsoft Visual C++ functions. Originally developed for the ReactOS + () and TinyKrnl () + projects. + . + Copyright (c) 2006 KJK::Hyperion + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. --- git-1.7.10.4.orig/debian/gitweb.docs +++ git-1.7.10.4/debian/gitweb.docs @@ -0,0 +1 @@ +gitweb/README --- git-1.7.10.4.orig/debian/git-el.prerm +++ git-1.7.10.4/debian/git-el.prerm @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +/usr/lib/emacsen-common/emacs-package-remove git --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-bisect-lk2009 +++ git-1.7.10.4/debian/git-doc.doc-base.git-bisect-lk2009 @@ -0,0 +1,19 @@ +Document: git-bisect-lk2009 +Title: Fighting regressions with git bisect +Author: Christian Couder +Abstract: "git bisect" enables software users and developers + to easily find the commit that introduced a regression. We + show why it is important to have good tools to fight + regressions. We describe how "git bisect" works from the + outside and the algorithms it uses inside. Then we explain + how to take advantage of "git bisect" to improve current + practices. And we discuss how "git bisect" could improve in + the future. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/git-bisect-lk2009.txt + +Format: HTML +Index: /usr/share/doc/git-doc/git-bisect-lk2009.html +Files: /usr/share/doc/git-doc/git-bisect-lk2009.html --- git-1.7.10.4.orig/debian/git-daemon-run.prerm +++ git-1.7.10.4/debian/git-daemon-run.prerm @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +test "$1" = 'remove' || test "$1" = 'deconfigure' || \ + test "$1" = 'failed-upgrade' || exit 0 + +update-service --remove /etc/sv/git-daemon || : --- git-1.7.10.4.orig/debian/git-daemon.init +++ git-1.7.10.4/debian/git-daemon.init @@ -0,0 +1,138 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: git-daemon +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: git-daemon service +# Description: git-daemon is a simple server for git repositories, +# ideally suited for read-only updates, i.e. pulling from +# git repositories through the network. +### END INIT INFO + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/git-core +DESC="git-daemon service" +NAME=git-daemon +DAEMON=/usr/lib/git-core/$NAME +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -e /usr/share/git-core/sysvinit/sentinel ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +GIT_DAEMON_USER=${GIT_DAEMON_USER:-gitdaemon} +GIT_DAEMON_BASE_PATH=${GIT_DAEMON_BASE_PATH:-/var/cache} +GIT_DAEMON_DIRECTORY=${GIT_DAEMON_DIRECTORY:-/var/cache/git} + +DAEMON_ARGS="--user=$GIT_DAEMON_USER --pid-file=$PIDFILE --detach" +DAEMON_ARGS="$DAEMON_ARGS --reuseaddr --verbose $GIT_DAEMON_OPTIONS" +DAEMON_ARGS="$DAEMON_ARGS --base-path=$GIT_DAEMON_BASE_PATH $GIT_DAEMON_DIRECTORY" + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + if [ $GIT_DAEMON_ENABLE = true ]; then + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + else + [ "$VERBOSE" != no ] && log_warning_msg "$NAME not enabled in /etc/default/$NAME, not starting..." + exit 0 + fi + + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + if [ $GIT_DAEMON_ENABLE != true ]; then + [ "$VERBOSE" != no ] && log_warning_msg "$NAME not enabled in /etc/default/$NAME, stopping..." + do_stop + case "$?" in + 0|1) + log_end_msg 0 ;; + *) + log_end_msg 1 ;; + esac + exit + fi + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: --- git-1.7.10.4.orig/debian/git.README.source +++ git-1.7.10.4/debian/git.README.source @@ -0,0 +1,84 @@ +Git sources for Debian +---------------------- + +The git Debian package sources are available through git, and +through 'apt-get source git'. Getting the sources through git +should be preferred: + + # apt-get install git # if not yet done + + $ git clone http://smarden.org/git/git.git/ + $ cd git + +After cloning the repository, you have checked out the debian-sid +branch, ready to be used by dpkg-buildpackage, e.g. + + $ dpkg-buildpackage -i -rfakeroot -uc -us + +If you want to make changes in the ./debian/ subdirectory, this is the +correct branch to work on. After making changes, document them in +debian/changelog, and commit through 'git add' and 'git commit', or 'git +commit -a', or similar. If you think the changes should be incorporated +into the standard Debian package, create the patch[es] through 'git +format-patch', and send them to the Debian Bug Tracking System, e.g. + + $ vi debian/rules + $ debchange -pi + $ git commit -a + $ git format-patch HEAD^ + + +If you want to make changes to the upstream git sources, first checkout +the release+patches branch + + $ git checkout -b release+patches origin/release+patches + +The release+patches branch holds patches on top of the current release +version that is packaged for Debian/unstable. The current release +version is available in the release branch. If you are interested, you +can checkout this branch too + + $ git checkout -b release origin/release + +When releasing a new Debian package based on a new upstream release, the +release branch will be fastforwarded, and the release+patches branch is +rewound and rebased on the new HEAD of the release branch. This is done +by + + $ git checkout release + $ git merge v1.6.5 + $ git checkout release+patches + $ git rebase release + +You generally don't need to do that, but beware that the release+patches +branch is rewound occasionally. + +After checking out the release+patches branch, make the desired changes +to the upstream sources, and commit them. To integrate the changes into +the Debian package, extract these changes, and change to the debian-sid +branch (Note: the file extension for the patches is '.diff', use 'git +config --add format.suffix .diff' to make that the default) + + $ git format-patch release..release+patches + $ git checkout debian-sid + +Now move the extracted patches into the debian/diff/ directory, add a +meaningful message to debian/changelog, and commit the changes to the +debian-sid branch + + $ mv ????-*.diff debian/diff/ + $ git add debian/diff + $ debchange -pi + $ git add debian/changelog + $ git commit + +Again, if you think the changes should be incorporated into the standard +Debian package, create the patch[es] from the debian-sid branch through +'git format-patch', send them to the Debian Bug Tracking System. + +There's a mailing list to coordinate work on the git-core packages, if +you're interested in helping please subscribe to the + mailing list by sending an email to +. + + -- Gerrit Pape Sat, 10 Apr 2010 12:28:52 +0000 --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-user-manual +++ git-1.7.10.4/debian/git-doc.doc-base.git-user-manual @@ -0,0 +1,16 @@ +Document: git-user-manual +Title: Git User's Manual (for version 1.5.3 or newer) +Author: J. Bruce Fields and the git list +Abstract: This manual provides a leisurely but practical + introduction to git. Chapters 1 and 2 explain how to fetch + and study a project using git. People needing to do actual + development will also want to read chapters 3 and 4. + Further chapters cover more specialized topics. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/user-manual.txt + +Format: HTML +Index: /usr/share/doc/git-doc/user-manual.html +Files: /usr/share/doc/git-doc/user-manual.html --- git-1.7.10.4.orig/debian/git-el.conffiles +++ git-1.7.10.4/debian/git-el.conffiles @@ -0,0 +1 @@ +/etc/emacs/site-start.d/50git-core.el --- git-1.7.10.4.orig/debian/git.docs +++ git-1.7.10.4/debian/git.docs @@ -0,0 +1,2 @@ +README +Documentation/RelNotes --- git-1.7.10.4.orig/debian/git-el.emacsen-startup +++ git-1.7.10.4/debian/git-el.emacsen-startup @@ -0,0 +1,32 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50git-core.el +;; for the Debian git package + + +(let ((dir (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/git"))) + (if (not (file-exists-p dir)) + (message "git removed but not purged, skipping setup") + + ;; debian-pkg-add-load-path-item as from debian 3.1 "sarge", + ;; emacsen-common 1.4.14 of June 2002 + (debian-pkg-add-load-path-item dir) + + ;; Compatibility note: In debian git-core 1:1.7.0-1 there was a long + ;; list of generated autoloads here, but now pruned back to the + ;; interactive entrypoints. If you were using those autoloads in elisp + ;; code, don't do that, use (require 'git) to express the dependency. + + ;; git.el + + (autoload 'git-status "git" "Entry point into git-status mode." t) + + ;; git-blame.el + + ;; this autoload as recommended by git-blame.el comments + (autoload 'git-blame-mode "git-blame" + "Minor mode for incremental blame for Git." t))) + +;; End of file --- git-1.7.10.4.orig/debian/git-daemon-sysvinit.conffiles +++ git-1.7.10.4/debian/git-daemon-sysvinit.conffiles @@ -0,0 +1,2 @@ +/etc/default/git-daemon +/etc/init.d/git-daemon --- git-1.7.10.4.orig/debian/git-daemon-run.postrm +++ git-1.7.10.4/debian/git-daemon-run.postrm @@ -0,0 +1,20 @@ +#!/bin/sh +set -e + +test "$1" = 'purge' || exit 0 + +sv down /etc/sv/git-daemon 2>/dev/null || : +sv down /etc/sv/git-daemon/log 2>/dev/null || : +sv force-shutdown /etc/sv/git-daemon 2>/dev/null || : +sv force-stop /etc/sv/git-daemon/log 2>/dev/null || : +rm -rf /etc/sv/git-daemon/supervise /etc/sv/git-daemon/log/supervise +rm -rf /var/lib/supervise/git-daemon /var/lib/supervise/git-daemon.log + +for i in '@*' current config lock state; do + rm -f /var/log/git-daemon/$i +done +rmdir /var/log/git-daemon || : + +getent passwd gitlog >/dev/null || exit 0 +! deluser --version >/dev/null 2>&1 || exec deluser -f gitlog +echo 'deluser program not available, not removing system user "gitlog".' >&2 --- git-1.7.10.4.orig/debian/git-daemon-run.postinst +++ git-1.7.10.4/debian/git-daemon-run.postinst @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +getent passwd gitlog >/dev/null || \ + adduser --system --home /nonexistent --no-create-home gitlog +getent passwd gitdaemon >/dev/null || \ + adduser --system --home /nonexistent --no-create-home gitdaemon + +test -z "$2" || dpkg --compare-versions "$2" gt '1:1.5.4.2-1' || { + update-service --remove /etc/sv/git-daemon 2>/dev/null || : + sleep 6 + set "$1" +} + +# enable git-daemon service +update-service --add /etc/sv/git-daemon + +# restart git-daemon service if it was running +test -z "$2" || sv -v term git-daemon || : --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-tools +++ git-1.7.10.4/debian/git-doc.doc-base.git-tools @@ -0,0 +1,13 @@ +Document: git-tools +Title: A short git tools survey +Author: Marco Costalba +Abstract: A brief and outdated survey of useful git tools, + including third-party and external projects. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/git-tools.txt + +Format: HTML +Index: /usr/share/doc/git-doc/git-tools.html +Files: /usr/share/doc/git-doc/git-tools.html --- git-1.7.10.4.orig/debian/gitweb.NEWS.Debian +++ git-1.7.10.4/debian/gitweb.NEWS.Debian @@ -0,0 +1,27 @@ +gitweb (1:1.7.4.1-1) unstable; urgency=low + + The gitweb auxiliary files gitweb.css, git-favicon.png, + git-logo.png, and gitweb.js have been moved from /usr/share/gitweb + to a static/ subdirectory. You may need to adapt your web server + and gitweb configuration to adjust. See /usr/share/doc/git/README.Debian + for details. + + -- Jonathan Nieder Mon, 13 Dec 2010 01:12:31 -0600 + +gitweb (1:1.7.2.3-1) experimental; urgency=low + + Since version 1.6.6-rc1, gitweb includes a "git blame" feature that + loads asynchronously using the gitweb.js script. You may need to + adapt your web server configuration to include it. See + /usr/share/doc/git/README.Debian for details. + + -- Jonathan Nieder Sat, 14 Aug 2010 03:10:24 -0500 + +git-core (1:1.5.6.2-1) unstable; urgency=low + + The gitweb auxiliary files gitweb.css, git-favicon.png, git-logo.png + are moved from /var/www/ to /usr/share/gitweb/ to comply with the + current draft Debian webapps policy. You need to either adapt the + web server configuration, or copy/symlink them back to /var/www/. + + -- Gerrit Pape Sun, 06 Jul 2008 18:35:27 +0000 --- git-1.7.10.4.orig/debian/gitweb.postinst +++ git-1.7.10.4/debian/gitweb.postinst @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +case "$1" in + configure) + if [ -x /etc/init.d/apache2 ] + then + if which /usr/sbin/invoke-rc.d >/dev/null 2>&1 + then + invoke-rc.d apache2 reload || true + else + /etc/init.d/apache2 reload || true + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac --- git-1.7.10.4.orig/debian/git-daemon-sysvinit.prerm +++ git-1.7.10.4/debian/git-daemon-sysvinit.prerm @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +test "$1" = 'remove' || test "$1" = 'deconfigure' || \ + test "$1" = 'failed-upgrade' || exit 0 + +if [ -x "/etc/init.d/git-daemon" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d git-daemon stop || exit $? + else + /etc/init.d/git-daemon stop || exit $? + fi +fi --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-protocol +++ git-1.7.10.4/debian/git-doc.doc-base.git-protocol @@ -0,0 +1,12 @@ +Document: git-protocol +Title: Technical documentation for git protocol +Author: Scott Chacon and the git list +Abstract: Reference documentation for the upload-pack and + receive-pack protocols that underlie git's ssh://, git://, + file://, and smart http:// transports. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/technical/pack-protocol.txt + /usr/share/doc/git-doc/technical/protocol-*.txt + /usr/share/doc/git-doc/technical/send-pack-pipeline.txt --- git-1.7.10.4.orig/debian/git.postinst +++ git-1.7.10.4/debian/git.postinst @@ -0,0 +1,43 @@ +#!/bin/sh +set -e +test "$1" = configure || exit 0 + +# Snippet based on dpkg-maintscript-helper from dpkg 1.15.8. Using a +# home-grown snippet instead of using Pre-Depends: dpkg (>= 1.15.7) +# makes the package easier to try out on old systems without requiring +# new dpkg in these early times. +# +# Kind reader of the future: it's about time to rip this out and use a +# call to dpkg-maintscript-helper, don't you think? +rm_conffile () { + CONFFILE=$1; shift + if dpkg --compare-versions "$2" lt-nl '1:1.7.4.1-2~'; then + if test -e "$CONFFILE.dpkg-backup"; then + mv -f "$CONFFILE.dpkg-backup" "$CONFFILE.dpkg-bak" + fi + if test -e "$CONFFILE.dpkg-remove"; then + echo "Removing $CONFFILE ..." + rm -f "$CONFFILE.dpkg-remove" + fi + fi +} + +removed_conffile=/etc/emacs/site-start.d/50git-core.el +rm_conffile "$removed_conffile" "$1" "$2" + +# Carry over modifications so git-el can use them. +if dpkg --compare-versions "$2" lt '1:1.7.4.1-2~' && + ! test -e "$removed_conffile" && + test -r "$removed_conffile".dpkg-bak; then + mv "$removed_conffile".dpkg-bak "$removed_conffile" +fi + +# 1.7.7-1 replaces /usr/share/doc/git/contrib/hooks with a symlink, +# but dpkg doesn't do so on package upgrade +if test -n "$2" && dpkg --compare-versions "$2" lt '1:1.7.7-1' && + test ! -L /usr/share/doc/git/contrib/hooks && + test -d /usr/share/doc/git/contrib/hooks; then + rmdir /usr/share/doc/git/contrib/hooks && + ln -s ../../../git-core/contrib/hooks \ + /usr/share/doc/git/contrib/hooks +fi --- git-1.7.10.4.orig/debian/git-daemon.default +++ git-1.7.10.4/debian/git-daemon.default @@ -0,0 +1,14 @@ +# Defaults for git-daemon initscript +# sourced by /etc/init.d/git-daemon +# installed at /etc/default/git-daemon by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +GIT_DAEMON_ENABLE=false +GIT_DAEMON_USER=gitdaemon +GIT_DAEMON_DIRECTORY=/var/cache/git + +# Additional options that are passed to the Daemon. +GIT_DAEMON_OPTIONS="" --- git-1.7.10.4.orig/debian/git-el.emacsen-install +++ git-1.7.10.4/debian/git-el.emacsen-install @@ -0,0 +1,33 @@ +#!/bin/sh +# Based on /usr/share/doc/emacsen-common/sample-package-install-foo.gz. +# +# Unlike the example, we place symlinks to the elisp source alongside +# the compiled bytecode, so the .el source is available to the various +# Emacs help tools. Putting .el and .elc files in the same directory +# keeps "list-load-path-shadows" happy. + +set -e +FLAVOR=$1 +el_files="git.el git-blame.el" +el_dir=/usr/share/git-core/emacs +elc_dir=/usr/share/$FLAVOR/site-lisp/git + +# The emacs startup file looks for these files in +# /usr/share/${debian-emacs-flavor}/site-lisp/git. +# Installing to the generic /usr/share/emacs/site-list/git would be +# pointless. +[ "$FLAVOR" != emacs ] || exit 0 + +printf 'install/git: Handling install of emacsen flavor %s\n' "$FLAVOR" +[ -d "$elc_dir" ] || mkdir "$elc_dir" +( + cd $elc_dir + for i in $el_files + do + ln -sf $el_dir/$i $i + done + + printf 'install/git: Byte-compiling for %s\n' "$FLAVOR" + set -x + $FLAVOR -batch -q -no-site-file -f batch-byte-compile $el_files +) --- git-1.7.10.4.orig/debian/control +++ git-1.7.10.4/debian/control @@ -0,0 +1,337 @@ +Source: git +Section: vcs +Priority: optional +Maintainer: Gerrit Pape +Uploaders: Jonathan Nieder +Build-Depends: libz-dev, + libcurl4-gnutls-dev | libcurl3-gnutls-dev, libexpat1-dev, + subversion, libsvn-perl | libsvn-core-perl, libyaml-perl, + tcl8.5, gettext, + cvs, cvsps, libdbd-sqlite3-perl, + unzip, libio-pty-perl, + dpkg-dev (>= 1.15.7~), + libc6.1 (>= 2.10.2-6) [ia64] +Build-Depends-Indep: asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72) +Standards-Version: 3.9.3.1 +Homepage: http://git-scm.com/ +Vcs-Git: http://smarden.org/git/git.git/ +Vcs-Browser: http://repo.or.cz/w/git/debian.git/ + +Package: git +Architecture: any +Depends: ${shlibs:Depends}, perl-modules, liberror-perl, + git-man (>> ${source:Upstream-Version}), git-man (<< ${source:Upstream-Version}-.), + libc6.1 (>= 2.10.2-6) [ia64] +Recommends: patch, less, rsync, ssh-client +Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit, + git-doc, git-el, git-arch, git-cvs, git-svn, git-email, git-gui, gitk, gitweb +Replaces: gitweb (<< 1:1.7.4~rc1), + cogito (<< 0.16rc2-0), git-core (<< 1:1.7.0.4-1.) +Breaks: gitweb (<< 1:1.7.4~rc1), + qgit (<< 1.5.5), git-buildpackage (<< 0.4.38), cogito (<= 0.18.2+), + stgit (<< 0.15), stgit-contrib (<< 0.15), gitpkg (<< 0.15), + guilt (<< 0.33), gitosis (<< 0.2+20090917-7), + git-core (<< 1:1.7.0.4-1.) +Conflicts: git-core (<< 1:1.5.2~rc3-2.) +Provides: git-completion, git-core +Description: fast, scalable, distributed revision control system + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git main components with minimal dependencies. + Additional functionality, e.g. a graphical user interface and revision + tree visualizer, tools for interoperating with other VCS's, or a web + interface, is provided as separate git* packages. + +Package: git-man +Section: doc +Architecture: all +Replaces: git (<< 1:1.7.4~rc1), + cogito (<< 0.16rc2-0), git-core (<< 1:1.7.0.4-1.) +Breaks: git (<< 1:1.7.4~rc1) +Description: fast, scalable, distributed revision control system (manual pages) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides reference documentation for use by the 'man' + utility and the 'git help' command. + +Package: git-core +Architecture: all +Depends: git (>> 1:1.7.0.2) +Description: fast, scalable, distributed revision control system (obsolete) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This is a transitional dummy package. The 'git-core' package has been + renamed to 'git', which has been installed automatically. This + git-core package is now obsolete, and can safely be removed from the + system if no other package depends on it. + +Package: git-doc +Section: doc +Architecture: all +Suggests: git, git-arch, git-cvs, git-svn, git-email, gitk, gitweb +Description: fast, scalable, distributed revision control system (documentation) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the documentation. + +Package: git-arch +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), tla +Suggests: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (arch interoperability) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides tools for importing development history from arch + repositories. + +Package: git-cvs +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), cvsps, libdbd-sqlite3-perl +Suggests: git-doc, cvs +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (cvs interoperability) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git cvsimport, cvsexportcommit, and cvsserver + tools, which allow Git to read from and write to CVS repositories and + offer access over CVS protocol to Git repositories. + . + The git cvsimport tool can incrementally import from a repository that + is being actively developed and only requires remote access over CVS + protocol. Unfortunately, in many situations the import leads to + incorrect results. For reliable, one-shot imports, cvs2git from the + cvs2svn package or parsecvs may be a better fit. + +Package: git-svn +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), libsvn-perl | libsvn-core-perl, libyaml-perl, libwww-perl, libterm-readkey-perl +Suggests: git-doc, subversion +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (svn interoperability) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides tools for interoperating with Subversion repositories, + and importing SVN development history. + +Package: git-email +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.) +Recommends: libemail-valid-perl, libnet-smtp-ssl-perl, libauthen-sasl-perl +Suggests: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (email add-on) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git-send-email program for sending series of + patch emails. + +Package: git-daemon-run +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), runit (>= 1.8.0-2), adduser +Conflicts: git-daemon-sysvinit +Description: fast, scalable, distributed revision control system (git-daemon service) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + git-daemon, as provided by the git package, is a simple server for git + repositories, ideally suited for read-only updates, i.e. pulling from git + repositories through the network. This package provides a runit service + for running git-daemon permanently. + +Package: git-daemon-sysvinit +Priority: extra +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), adduser +Conflicts: git-daemon-run +Description: fast, scalable, distributed revision control system (git-daemon service) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + git-daemon, as provided by the git package, is a simple server for git + repositories, ideally suited for read-only updates, i.e. pulling from git + repositories through the network. This package provides a sysvinit service + for running git-daemon permanently. + +Package: git-gui +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), tk +Replaces: git-core (<< 1:1.5.2.2-3) +Recommends: gitk +Suggests: git-doc, aspell +Description: fast, scalable, distributed revision control system (GUI) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the git graphical user interface. + . + If aspell is installed, it can check the spelling of commit messages + as the user types. + +Package: gitk +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), tk (>= 8.4) +Suggests: git-doc +Replaces: cogito (<< 0.16rc2-0) +Description: fast, scalable, distributed revision control system (revision tree visualizer) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides the gitk program, a tcl/tk revision tree visualizer. + +Package: git-el +Architecture: all +Depends: git (>= 1:1.7.4.1-2~), emacs | emacsen +Replaces: git (<< 1:1.7.4.1-2~) +Breaks: git (<< 1:1.7.4.1-2~) +Description: fast, scalable, distributed revision control system (emacs support) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package provides two modules for integration with Emacs: + . + * git.el: + . + Status manager that displays the state of all the files of the + project and provides easy access to the most frequently used git + commands. The user interface is intended to be similar to the + pcl-cvs mode. It can be started with `M-x git-status'. + . + * git-blame.el: + . + Emacs implementation of incremental "git blame". When you turn it + on while viewing a file, the editor buffer will be updated by + setting the background of individual lines to a color that reflects + which commit it comes from. + . + This package does not contain the VC-mode backend for git. That is + part of standard Emacs distributions, starting with version 22.2. + . + For a more polished Emacs interface for Git, see the magit package. + +Package: gitweb +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), + perl, apache2 | httpd | lynx-cur +Suggests: httpd-cgi | libcgi-fast-perl, git-doc +Description: fast, scalable, distributed revision control system (web interface) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This package configures a web interface for browsing git repositories. + . + If apache2 is installed, the web interface is automatically made + available at http://localhost/gitweb. Other servers that support CGI + or mod_perl are supported through manual configuration. + . + If libcgi-fast-perl is installed, gitweb can also be run over FastCGI + (and served by nginx, for example). + +Package: git-all +Architecture: all +Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), + git-doc, git-el, git-arch, git-cvs, git-svn, git-email, git-gui, gitk, gitweb +Recommends: git-daemon-run | git-daemon-sysvinit +Description: fast, scalable, distributed revision control system (all subpackages) + Git is popular version control system designed to handle very large + projects with speed and efficiency; it is used for many high profile + open source projects, most notably the Linux kernel. + . + Git falls in the category of distributed source code management tools. + Every Git working directory is a full-fledged repository with full + revision tracking capabilities, not dependent on network access or a + central server. + . + This is a dummy package which brings in all subpackages. --- git-1.7.10.4.orig/debian/versions.upstream +++ git-1.7.10.4/debian/versions.upstream @@ -0,0 +1,348 @@ +v1.0rc1 +v1.0rc2 +v1.0rc3 +v1.0rc4 +v1.0rc5 +v1.0rc6 +v1.0.0 +v1.0.0a +v1.0.0b +v1.0.1 +v1.0.2 +v1.0.3 +v1.0.4 +v1.0.5 +v1.0.6 +v1.0.7 +v1.0.8 +v1.0.9 +v1.0.10 +v1.0.11 +v1.0.12 +v1.0.13 +v1.1.0 +v1.1.1 +v1.1.2 +v1.1.3 +v1.1.4 +v1.1.5 +v1.1.6 +v1.2.0 +v1.2.1 +v1.2.2 +v1.2.3 +v1.2.4 +v1.2.5 +v1.2.6 +v1.3.0-rc1 +v1.3.0-rc2 +v1.3.0-rc3 +v1.3.0-rc4 +v1.3.0 +v1.3.1 +v1.3.2 +v1.3.3 +v1.4.0-rc1 +v1.4.0-rc2 +v1.4.0 +v1.4.1-rc1 +v1.4.1-rc2 +v1.4.1 +v1.4.1.1 +v1.4.2-rc1 +v1.4.2-rc2 +v1.4.2-rc3 +v1.4.2-rc4 +v1.4.2 +v1.4.2.1 +v1.4.2.2 +v1.4.2.3 +v1.4.2.4 +v1.4.3-rc1 +v1.4.3-rc2 +v1.4.3-rc3 +v1.4.3 +v1.4.3.1 +v1.4.3.2 +v1.4.3.3 +v1.4.3.4 +v1.4.3.5 +v1.4.4-rc1 +v1.4.4-rc2 +v1.4.4 +v1.4.4.1 +v1.4.4.2 +v1.4.4.3 +v1.4.4.4 +v1.5.0-rc0 +v1.5.0-rc1 +v1.5.0-rc2 +v1.5.0-rc3 +v1.5.0-rc4 +v1.5.0 +v1.5.0.1 +v1.5.0.2 +v1.5.0.3 +v1.5.0.4 +v1.5.0.5 +v1.5.0.6 +v1.5.0.7 +v1.5.1-rc1 +v1.5.1-rc2 +v1.5.1-rc3 +v1.5.1 +v1.5.1.1 +v1.5.1.2 +v1.5.1.3 +v1.5.1.4 +v1.5.1.5 +v1.5.1.6 +v1.5.2-rc0 +v1.5.2-rc1 +v1.5.2-rc2 +v1.5.2-rc3 +v1.5.2 +v1.5.2.1 +v1.5.2.2 +v1.5.2.3 +v1.5.2.4 +v1.5.2.5 +v1.5.3-rc0 +v1.5.3-rc1 +v1.5.3-rc2 +v1.5.3-rc3 +v1.5.3-rc4 +v1.5.3-rc5 +v1.5.3-rc6 +v1.5.3-rc7 +v1.5.3 +v1.5.3.1 +v1.5.3.2 +v1.5.3.3 +v1.5.3.4 +v1.5.3.5 +v1.5.3.6 +v1.5.3.7 +v1.5.3.8 +v1.5.4-rc0 +v1.5.4-rc1 +v1.5.4-rc2 +v1.5.4-rc3 +v1.5.4-rc4 +v1.5.4-rc5 +v1.5.4 +v1.5.4.1 +v1.5.4.2 +v1.5.4.3 +v1.5.4.4 +v1.5.4.5 +v1.5.4.6 +v1.5.4.7 +v1.5.5-rc0 +v1.5.5-rc1 +v1.5.5-rc2 +v1.5.5-rc3 +v1.5.5 +v1.5.5.1 +v1.5.5.2 +v1.5.5.3 +v1.5.5.4 +v1.5.5.5 +v1.5.5.6 +v1.5.6-rc0 +v1.5.6-rc1 +v1.5.6-rc2 +v1.5.6-rc3 +v1.5.6 +v1.5.6.1 +v1.5.6.2 +v1.5.6.3 +v1.5.6.4 +v1.5.6.5 +v1.5.6.6 +v1.6.0-rc0 +v1.6.0-rc1 +v1.6.0-rc2 +v1.6.0-rc3 +v1.6.0 +v1.6.0.1 +v1.6.0.2 +v1.6.0.3 +v1.6.0.4 +v1.6.0.5 +v1.6.0.6 +v1.6.1-rc1 +v1.6.1-rc2 +v1.6.1-rc3 +v1.6.1-rc4 +v1.6.1 +v1.6.1.1 +v1.6.1.2 +v1.6.1.3 +v1.6.1.4 +v1.6.2-rc0 +v1.6.2-rc1 +v1.6.2-rc2 +v1.6.2 +v1.6.2.1 +v1.6.2.2 +v1.6.2.3 +v1.6.2.4 +v1.6.2.5 +v1.6.3-rc0 +v1.6.3-rc1 +v1.6.3-rc2 +v1.6.3-rc3 +v1.6.3-rc4 +v1.6.3 +v1.6.3.1 +v1.6.3.2 +v1.6.3.3 +v1.6.3.4 +v1.6.4-rc0 +v1.6.4-rc1 +v1.6.4-rc2 +v1.6.4-rc3 +v1.6.4 +v1.6.4.1 +v1.6.4.2 +v1.6.4.3 +v1.6.4.4 +v1.6.4.5 +v1.6.5-rc0 +v1.6.5-rc1 +v1.6.5-rc2 +v1.6.5-rc3 +v1.6.5 +v1.6.5.1 +v1.6.5.2 +v1.6.5.3 +v1.6.5.4 +v1.6.5.5 +v1.6.5.6 +v1.6.5.7 +v1.6.5.8 +v1.6.5.9 +v1.6.6-rc0 +v1.6.6-rc1 +v1.6.6-rc2 +v1.6.6-rc3 +v1.6.6-rc4 +v1.6.6 +v1.6.6.1 +v1.6.6.2 +v1.6.6.3 +v1.7.0-rc0 +v1.7.0-rc1 +v1.7.0-rc2 +v1.7.0 +v1.7.0.1 +v1.7.0.2 +v1.7.0.3 +v1.7.0.4 +v1.7.0.5 +v1.7.0.6 +v1.7.0.7 +v1.7.0.8 +v1.7.0.9 +v1.7.1-rc0 +v1.7.1-rc1 +v1.7.1-rc2 +v1.7.1 +v1.7.1.1 +v1.7.1.2 +v1.7.1.3 +v1.7.1.4 +v1.7.2-rc0 +v1.7.2-rc1 +v1.7.2-rc2 +v1.7.2-rc3 +v1.7.2 +v1.7.2.1 +v1.7.2.2 +v1.7.2.3 +v1.7.2.4 +v1.7.2.5 +v1.7.3-rc0 +v1.7.3-rc1 +v1.7.3-rc2 +v1.7.3 +v1.7.3.1 +v1.7.3.2 +v1.7.3.3 +v1.7.3.4 +v1.7.3.5 +v1.7.4-rc0 +v1.7.4-rc1 +v1.7.4-rc2 +v1.7.4-rc3 +v1.7.4 +v1.7.4.1 +v1.7.4.2 +v1.7.4.3 +v1.7.4.4 +v1.7.4.5 +v1.7.5-rc0 +v1.7.5-rc1 +v1.7.5-rc2 +v1.7.5-rc3 +v1.7.5 +v1.7.5.1 +v1.7.5.2 +v1.7.5.3 +v1.7.5.4 +v1.7.6-rc0 +v1.7.6-rc1 +v1.7.6-rc2 +v1.7.6-rc3 +v1.7.6 +v1.7.6.1 +v1.7.6.2 +v1.7.6.3 +v1.7.6.4 +v1.7.6.5 +v1.7.7-rc0 +v1.7.7-rc1 +v1.7.7-rc2 +v1.7.7-rc3 +v1.7.7 +v1.7.7.1 +v1.7.7.2 +v1.7.7.3 +v1.7.7.4 +v1.7.7.5 +v1.7.7.6 +v1.7.7.7 +v1.7.8-rc0 +v1.7.8-rc1 +v1.7.8-rc2 +v1.7.8-rc3 +v1.7.8-rc4 +v1.7.8 +v1.7.8.1 +v1.7.8.2 +v1.7.8.3 +v1.7.8.4 +v1.7.8.5 +v1.7.8.6 +v1.7.9-rc0 +v1.7.9-rc1 +v1.7.9-rc2 +v1.7.9 +v1.7.9.1 +v1.7.9.2 +v1.7.9.3 +v1.7.9.4 +v1.7.9.5 +v1.7.9.6 +v1.7.9.7 +v1.7.10-rc0 +v1.7.10-rc1 +v1.7.10-rc2 +v1.7.10-rc3 +v1.7.10-rc4 +v1.7.10 +v1.7.10.1 +v1.7.10.2 +v1.7.10.3 +v1.7.10.4 --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-shallow-clone-design +++ git-1.7.10.4/debian/git-doc.doc-base.git-shallow-clone-design @@ -0,0 +1,12 @@ +Document: git-shallow-clone-design +Title: Technical documentation for shallow clones in git +Author: Johannes Schindelin +Abstract: There has not been any work on the git fetch/clone + --depth lately, so it is hard to find out what it does, and + how. This document describes the ideas as well as the + current problems, and can serve as a starting point for + shallow people. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/technical/shallow.txt --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-reference-manual +++ git-1.7.10.4/debian/git-doc.doc-base.git-reference-manual @@ -0,0 +1,14 @@ +Document: git-reference-manual +Title: Git Reference Manual +Author: David Greaves and the git list +Abstract: Git manual pages, including glossary and tutorials. +Section: File Management + +Format: HTML +Index: /usr/share/doc/git-doc/git.html +Files: /usr/share/doc/git-doc/git.html + /usr/share/doc/git-doc/git[a-z]*.html + /usr/share/doc/git-doc/git-[ac-su-z]*.html + /usr/share/doc/git-doc/git-b[a-hj-z]*.html + /usr/share/doc/git-doc/git-bisect.html + /usr/share/doc/git-doc/git-t[a-np-z]*.html --- git-1.7.10.4.orig/debian/rules +++ git-1.7.10.4/debian/rules @@ -0,0 +1,306 @@ +#!/usr/bin/make -f + +ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) +BUILD_DOCS =$(shell if type asciidoc >/dev/null 2>&1; then echo 1; fi) + +CC =gcc +CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) +LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS) +STRIP =strip +TEST =test +OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \ + mandir=/usr/share/man htmldir=/usr/share/doc/git/html \ + INSTALLDIRS=vendor \ + NO_PYTHON=1 \ + USE_SRV_RR=1 \ + THREADED_DELTA_SEARCH=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 NO_HARDLINKS=1 \ + DEFAULT_PAGER=pager DEFAULT_EDITOR=editor \ + CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' +DOC_OPTS =prefix=/usr htmldir=/usr/share/doc/git/html \ + ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP =: strip +endif +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + TEST = +endif + +TMP =$(shell pwd)/tmp +GIT =$(shell pwd)/debian/git + +patch: deb-checkdir patch-stamp +patch-stamp: + for i in `ls -1 debian/diff/*.diff debian/diff/*.patch \ + 2>/dev/null || :`; do \ + patch -p1 -N -r- <$$i || test $$? = 1 || exit 1; \ + done + chmod a+x t/*.sh + touch patch-stamp + +build: build-arch build-indep + +build-arch: deb-checkdir build-arch-stamp +build-arch-stamp: patch-stamp + -$(CC) -v + DESTDIR='$(GIT)' $(MAKE) all $(OPTS) + test -z '$(TEST)' || \ + DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) || \ + GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) + touch build-arch-stamp + +build-indep: deb-checkdir build-indep-stamp +build-indep-stamp: patch-stamp build-arch-stamp + : 'Work around bug #478524' + set -e; if test '$(BUILD_DOCS)' = 1; \ + then \ + $(MAKE) -CDocumentation man html $(DOC_OPTS); \ + fi + touch build-indep-stamp + +clean: deb-checkdir + $(MAKE) clean $(OPTS) + ! test -e patch-stamp || \ + for i in `ls -1r debian/diff/*.diff debian/diff/*.patch \ + 2>/dev/null || :`; do \ + patch -p1 -NR -r- <$$i || test $$? = 1 || exit 1; \ + done + rm -rf '$(TMP)' + rm -f patch-stamp build-arch-stamp build-indep-stamp + rm -rf '$(GIT)' '$(GIT)'-doc '$(GIT)'-arch '$(GIT)'-cvs + rm -rf '$(GIT)'-svn '$(GIT)'-email '$(GIT)'-el + rm -rf '$(GIT)'-daemon-run '$(GIT)'-daemon-sysvinit '$(GIT)'-gui + rm -rf '$(GIT)'k '$(GIT)'web '$(GIT)'-all '$(GIT)'-man '$(GIT)'-core + rm -f debian/files debian/substvars changelog + +install: install-arch install-indep +install-arch: deb-checkdir deb-checkuid build-arch-stamp + # git + rm -rf '$(GIT)' + install -d -m0755 '$(GIT)'/usr/bin + DESTDIR='$(GIT)' $(MAKE) install $(OPTS) + install -d -m0755 '$(GIT)'/var/cache/git + rm -f '$(GIT)'/usr/share/perl5/Error.pm + rm -rf '$(GIT)'/usr/share/man + chmod 644 '$(GIT)'/usr/share/perl5/Git.pm + : 'Disable preliminary German translation.' + rm -rf '$(GIT)'/usr/share/locale/de + # don't include arch, cvs, svn, email, gui tools, and gitk program + for i in git-archimport git-cvs git-svn git-send-email \ + git-gui git-citool; do \ + rm -f '$(GIT)'/usr/lib/git-core/$$i*; \ + done + rm -f '$(GIT)'/usr/bin/git-cvsserver + rm -f '$(GIT)'/usr/bin/gitk + for i in '$(GIT)'/usr/bin/* '$(GIT)'/usr/lib/git-core/*; do \ + test -d $$i || \ + test "`head -c2 $$i`" = '#!' || \ + test "`head -c2 $$i`" = '# ' || \ + $(STRIP) -R .comment -R .note $$i; \ + done + # don't include git-gui's lib + rm -rf '$(GIT)'/usr/share/git-gui/ + # don't include gitk's lib + rm -rf '$(GIT)'/usr/share/gitk/ + # bash completion + install -d -m0755 '$(GIT)'/etc/bash_completion.d + install -m0644 contrib/completion/git-completion.bash \ + '$(GIT)'/etc/bash_completion.d/git + # gitweb + install -d -m0755 '$(GIT)'/usr/share/gitweb + ln -s gitweb.cgi '$(GIT)'/usr/share/gitweb/index.cgi + # contrib hooks + install -d -m0755 '$(GIT)'/usr/share/git-core/contrib/hooks + install -m0644 contrib/hooks/* \ + '$(GIT)'/usr/share/git-core/contrib/hooks/ + # contrib + install -d -m0755 '$(GIT)'/usr/share/doc/git + cp -R contrib '$(GIT)'/usr/share/doc/git/ + rm -rf '$(GIT)'/usr/share/doc/git/contrib/completion + rm -rf '$(GIT)'/usr/share/doc/git/contrib/emacs + find '$(GIT)'/usr/share/doc/git/contrib -type f | xargs chmod 0644 + find '$(GIT)'/usr/share/doc/git/contrib -type d | xargs chmod 0755 + # remove contrib hooks, they are now installed in + # /usr/share/git-core/contrib, keep symlink for backward compatibility + rm -rf '$(GIT)'/usr/share/doc/git/contrib/hooks + ln -s ../../../git-core/contrib/hooks \ + '$(GIT)'/usr/share/doc/git/contrib/ + find '$(GIT)'/usr/share/doc/git/ -name .gitignore | xargs rm -f + # upstream changelog + test -r changelog || ln -s debian/changelog.upstream changelog + +install-indep: + : 'Work around bug #478524' + set -e; if test '$(BUILD_DOCS)' = 1; \ + then \ + $(MAKE) -f debian/rules install-indep-real; \ + fi +install-indep-real: build-arch-stamp build-indep-stamp + rm -rf '$(TMP)' + install -d -m0755 '$(TMP)' + DESTDIR='$(TMP)' $(MAKE) install install-doc $(OPTS) + $(MAKE) -CDocumentation install-webdoc WEBDOC_DEST='$(TMP)'/html \ + 2>/dev/null + # RelNotes are shipped in git + rm -rf '$(TMP)'/html/RelNotes + # git-man + rm -rf '$(GIT)'-man + install -d -m0755 '$(GIT)'-man/usr/share/man/man3 + DESTDIR='$(GIT)'-man $(MAKE) install-doc $(OPTS) + install -m 0644 '$(TMP)'/usr/share/man/man3/Git.3pm \ + '$(GIT)'-man/usr/share/man/man3/Git.3pm + rm -f '$(GIT)'-man/usr/share/man/man3/private-Error.3pm + # don't include arch, cvs, svn, email, gui, and gitk man pages + for i in git-archimport git-cvs git-svn git-send-email gitk \ + git-gui git-citool; do \ + rm -f '$(GIT)'-man/usr/share/man/man1/$$i*; \ + done + chmod 0644 '$(GIT)'-man/usr/share/man/man?/*.[0-9]* + gzip -9 '$(GIT)'-man/usr/share/man/man?/*.[0-9]* + # git-doc + rm -rf '$(GIT)'-doc + install -d -m0755 '$(GIT)'-doc/usr/share/doc/git + ln -s ../git-doc '$(GIT)'-doc/usr/share/doc/git/html + # git-cvs, git-svn + for i in cvs svn; do \ + rm -rf '$(GIT)'-$$i && \ + install -d -m0755 '$(GIT)'-$$i/usr/lib/git-core && \ + install -m0755 '$(TMP)'/usr/lib/git-core/git-$$i* \ + '$(GIT)'-$$i/usr/lib/git-core/ && \ + install -d -m0755 '$(GIT)'-$$i/usr/share/man/man1 && \ + install -m0644 '$(TMP)'/usr/share/man/man1/git-$$i* \ + '$(GIT)'-$$i/usr/share/man/man1/ && \ + gzip -9 '$(GIT)'-$$i/usr/share/man/man1/*.1 || exit 1; \ + done + # git-cvs + install -d -m0755 '$(GIT)'-cvs/usr/bin + install -m0755 '$(TMP)'/usr/bin/git-cvsserver '$(GIT)'-cvs/usr/bin/ + # git-arch + rm -rf '$(GIT)'-arch + install -d -m0755 '$(GIT)'-arch/usr/lib/git-core + install -m0755 '$(TMP)'/usr/lib/git-core/git-archimport \ + '$(GIT)'-arch/usr/lib/git-core/ + install -d -m0755 '$(GIT)'-arch/usr/share/man/man1 + install -m0644 '$(TMP)'/usr/share/man/man1/git-archimport.1 \ + '$(GIT)'-arch/usr/share/man/man1/ + gzip -9 '$(GIT)'-arch/usr/share/man/man1/*.1 + # git-email + rm -rf '$(GIT)'-email + install -d -m0755 '$(GIT)'-email/usr/lib/git-core + install -m0755 '$(TMP)'/usr/lib/git-core/git-send-email \ + '$(GIT)'-email/usr/lib/git-core/ + install -d -m0755 '$(GIT)'-email/usr/share/man/man1 + install -m0644 '$(TMP)'/usr/share/man/man1/git-send-email.1 \ + '$(GIT)'-email/usr/share/man/man1/ + gzip -9 '$(GIT)'-email/usr/share/man/man1/*.1 + # git-daemon-run + rm -rf '$(GIT)'-daemon-run + install -d -m0755 '$(GIT)'-daemon-run/etc/sv/git-daemon/log + install -m0755 debian/git-daemon/run \ + '$(GIT)'-daemon-run/etc/sv/git-daemon/run + install -m0755 debian/git-daemon/log/run \ + '$(GIT)'-daemon-run/etc/sv/git-daemon/log/run + # git-daemon-sysvinit + rm -rf '$(GIT)'-daemon-sysvinit + install -d -m0755 '$(GIT)'-daemon-sysvinit/etc/init.d + install -m0755 debian/git-daemon.init \ + '$(GIT)'-daemon-sysvinit/etc/init.d/git-daemon + install -d -m0755 '$(GIT)'-daemon-sysvinit/etc/default + install -m0644 debian/git-daemon.default \ + '$(GIT)'-daemon-sysvinit/etc/default/git-daemon + install -d -m0755 '$(GIT)'-daemon-sysvinit/usr/share/git-core/sysvinit + >'$(GIT)'-daemon-sysvinit/usr/share/git-core/sysvinit/sentinel + chmod 0644 \ + '$(GIT)'-daemon-sysvinit/usr/share/git-core/sysvinit/sentinel + # git-el + rm -rf '$(GIT)'-el + install -m0644 -D debian/git-el.emacsen-startup \ + '$(GIT)'-el/etc/emacs/site-start.d/50git-core.el + install -m0755 -D debian/git-el.emacsen-install \ + '$(GIT)'-el/usr/lib/emacsen-common/packages/install/git + install -m0755 -D debian/git-el.emacsen-remove \ + '$(GIT)'-el/usr/lib/emacsen-common/packages/remove/git + install -d -m0755 '$(GIT)'-el/usr/share/git-core/emacs + install -m0644 contrib/emacs/git-blame.el \ + '$(GIT)'-el/usr/share/git-core/emacs/git-blame.el + install -m0644 contrib/emacs/git.el \ + '$(GIT)'-el/usr/share/git-core/emacs/git.el + install -d -m0755 '$(GIT)'-el/usr/share/doc/git-el + ln -s ../git/README.emacs \ + '$(GIT)'-el/usr/share/doc/git-el/README.Debian + install -d -m0755 '$(GIT)'-el/usr/share/doc/git/contrib + ln -s ../../../git-core/emacs \ + '$(GIT)'-el/usr/share/doc/git/contrib/emacs + # git-gui + rm -rf '$(GIT)'-gui + install -d -m0755 '$(GIT)'-gui/usr/lib/git-core + install -m0755 '$(TMP)'/usr/lib/git-core/git-gui \ + '$(GIT)'-gui/usr/lib/git-core/ + install -m0755 '$(TMP)'/usr/lib/git-core/git-gui--askpass \ + '$(GIT)'-gui/usr/lib/git-core/ + install -m0755 '$(TMP)'/usr/lib/git-core/git-citool \ + '$(GIT)'-gui/usr/lib/git-core/ + install -d -m0755 '$(GIT)'-gui/usr/share/man/man1 + for i in gui citool; do \ + install -m0644 '$(TMP)'/usr/share/man/man1/git-$$i* \ + '$(GIT)'-gui/usr/share/man/man1/; \ + done + gzip -9 '$(GIT)'-gui/usr/share/man/man1/*.1 + install -d -m0755 '$(GIT)'-gui/usr/share/git-gui + cp -a '$(TMP)'/usr/share/git-gui/lib '$(GIT)'-gui/usr/share/git-gui/ + # gitk + rm -rf '$(GIT)'k + install -d -m0755 '$(GIT)'k/usr/bin + install -m0755 '$(TMP)'/usr/bin/gitk \ + '$(GIT)'k/usr/bin/gitk + install -d -m0755 '$(GIT)'k/usr/share/man/man1 + install -m0644 '$(TMP)'/usr/share/man/man1/gitk.1 \ + '$(GIT)'k/usr/share/man/man1/ + gzip -9 '$(GIT)'k/usr/share/man/man1/*.1 + install -d -m0755 '$(GIT)'k/usr/share/gitk + cp -a '$(TMP)'/usr/share/gitk/lib '$(GIT)'k/usr/share/gitk/ + # gitweb + rm -rf '$(GIT)'web + install -d -m0755 '$(GIT)'web/usr/lib/cgi-bin + ln -s ../../share/gitweb/gitweb.cgi \ + '$(GIT)'web/usr/lib/cgi-bin/gitweb.cgi + install -d -m0755 '$(GIT)'web/etc + install -m0644 debian/gitweb.conf '$(GIT)'web/etc/gitweb.conf + install -d -m0755 '$(GIT)'web/etc/apache2/conf.d + install -m0644 debian/gitweb.apache2.conf \ + '$(GIT)'web/etc/apache2/conf.d/gitweb + # git-all + rm -rf '$(GIT)'-all + install -d -m0755 '$(GIT)'-all + # git-core + rm -rf '$(GIT)'-core + install -d -m0755 '$(GIT)'-core/usr/share/doc + ln -s git '$(GIT)'-core/usr/share/doc/git-core + # upstream changelog + test -r changelog || ln -s debian/changelog.upstream changelog + +binary: binary-arch binary-indep +binary-arch: install-arch git.deb + rm -f debian/substvars + dpkg-shlibdeps '$(GIT)'/usr/bin/* '$(GIT)'/usr/lib/git-core/* + dpkg-gencontrol -isp -pgit -P'$(GIT)' + dpkg -b '$(GIT)' .. +binary-indep: install-indep git-doc.deb git-arch.deb git-cvs.deb git-svn.deb \ + git-daemon-run.deb git-daemon-sysvinit.deb \ + git-email.deb git-gui.deb gitk.deb gitweb.deb \ + git-all.deb git-el.deb git-man.deb git-core.deb-DEBIAN + rm -f debian/substvars + for i in -doc -arch -cvs -svn -daemon-run -daemon-sysvinit \ + -email -gui k web -all -core -el -man; do \ + dpkg-gencontrol -isp -pgit$$i -P'$(GIT)'$$i && \ + dpkg -b '$(GIT)'$$i .. || exit 1; \ + done + +.PHONY: patch clean +.PHONY: build build-arch build-indep +.PHONY: install install-arch install-indep install-indep-real +.PHONY: binary binary-arch binary-indep + +include debian/implicit --- git-1.7.10.4.orig/debian/git-el.postinst +++ git-1.7.10.4/debian/git-el.postinst @@ -0,0 +1,22 @@ +#!/bin/sh +set -e +test "$1" = configure || exit 0 +/usr/lib/emacsen-common/emacs-package-install git + +# Clean up after 1:1.7.4.1-1 through 1:1.7.4.1-3. +! test -L /usr/share/git-core/emacs/emacs || +rm -f /usr/share/git-core/emacs/emacs +! test -L /usr/share/doc/git/contrib/emacs.old || +rm -f /usr/share/doc/git/contrib/emacs.old + +# Replace the old /usr/share/doc/git/contrib/emacs directory +# with a symlink. +test -z "$2" && +! test -L /usr/share/doc/git/contrib/emacs && +test -d /usr/share/doc/git/contrib/emacs || exit 0 + +if ! rmdir /usr/share/doc/git/contrib/emacs; then + echo Moving /usr/share/doc/git/contrib/emacs to emacs.old >&2 + mv -f /usr/share/doc/git/contrib/emacs /usr/share/doc/git/contrib/emacs.old +fi +ln -s ../../../git-core/emacs /usr/share/doc/git/contrib/emacs --- git-1.7.10.4.orig/debian/git-doc.doc-base.git-index-format +++ git-1.7.10.4/debian/git-doc.doc-base.git-index-format @@ -0,0 +1,9 @@ +Document: git-index-format +Title: Git index format +Author: Robin Rosenberg, Nguyễn Thái Ngọc Duy, Junio C Hamano, and the git list +Abstract: The on-disk format of Git's staging area, merging area, + and working directory cache. +Section: File Management + +Format: Text +Files: /usr/share/doc/git-doc/technical/index-format.txt --- git-1.7.10.4.orig/debian/git-doc.docs +++ git-1.7.10.4/debian/git-doc.docs @@ -0,0 +1,2 @@ +tmp/html/* +Documentation/technical --- git-1.7.10.4.orig/debian/git-daemon-sysvinit.postinst +++ git-1.7.10.4/debian/git-daemon-sysvinit.postinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +getent passwd gitdaemon >/dev/null || \ + adduser --system --home /nonexistent --no-create-home gitdaemon + +if [ -x "/etc/init.d/git-daemon" ]; then + # enable git-daemon service + update-rc.d git-daemon defaults >/dev/null + + # restart git-daemon service if it was running + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d git-daemon start || exit $? + else + /etc/init.d/git-daemon start || exit $? + fi +fi --- git-1.7.10.4.orig/debian/changelog.upstream +++ git-1.7.10.4/debian/changelog.upstream @@ -0,0 +1,34096 @@ +Version v1.7.10.4; changes since v1.7.10.3: +------------------------------------------- + +Avery Pennarun (1): + checkout: no progress messages if !isatty(2). + +Erik Faye-Lund (2): + rebase: report invalid commit correctly + Makefile: add missing GIT-VERSION-FILE dependency + +Jeff King (3): + fix off-by-one error in split_ident_line + pretty: avoid buffer overflow in format_person_part + avoid segfault when reading header of malformed commits + +Junio C Hamano (2): + Start preparing for 1.7.10.4 + Git 1.7.10.4 + +Peter Krefting (1): + Update Swedish translation (728t0f0u) + +René Scharfe (4): + grep: factor out create_grep_pat() + grep: factor out do_append_grep_pat() + grep: support newline separated pattern list + grep: stop leaking line strings with -f + + +Version v1.7.10.3; changes since v1.7.10.2: +------------------------------------------- + +Bobby Powers (2): + diff --no-index: reset temporary buffer lengths on directory iteration + diff --no-index: don't leak buffers in queue_diff + +Carlos Martín Nieto (1): + pack-protocol: fix first-want separator in the examples + +Erik Faye-Lund (2): + clone: fix progress-regression + checkout: do not corrupt HEAD on empty repo + +Heiko Voigt (2): + link to gitmodules page at the beginning of git-submodule documentation + teach add_submodule_odb() to look for alternates + +Jan Krüger (1): + log-tree: use custom line terminator in line termination mode + +Jeff King (10): + docs: stop using asciidoc no-inline-literal + t1411: add more selector index/date tests + log: respect date_mode_explicit with --format:%gd + reflog-walk: clean up "flag" field of commit_reflog struct + reflog-walk: always make HEAD@{0} show indexed selectors + commit: refactor option parsing + status: refactor null_termination option + status: fix null termination with "-b" + status: respect "-b" for porcelain format + osxkeychain: pull make config from top-level directory + +Jens Lehmann (1): + Consistently use "superproject" instead of "supermodule" + +Jiang Xin (4): + l10n: Update git.pot (1 new messages) + l10n: zh_CN.po: translate 1 new message + l10n: Update git.pot (3 new, 2 removed messages) + l10n: zh_CN.po: translate 3 new messages + +Johannes Sixt (3): + t2020-checkout-detach: check for the number of orphaned commits + checkout (detached): truncate list of orphaned commits at the new HEAD + t3404: begin "exchange commits with -p" test with correct preconditions + +Jonathan Nieder (1): + config doc: remove confusion about relative GIT_DIR from FILES section + +Junio C Hamano (5): + log-tree: the previous one is still not quite right + reflog-walk: tell explicit --date=default from not having --date at all + Start preparing for 1.7.10.3 + Update draft release notes to 1.7.10.3 + Git 1.7.10.3 + +Linus Torvalds (1): + fmt-merge-message: add empty line between tag and signature verification + +Ralf Thielow (7): + l10n: add new members to German translation team + l10n: de.po: translate "track" as "beobachten" + l10n: de.po: translate "remote" as "extern" + l10n: de.po: collection of improvements + l10n: de.po: unify translation of "ahead" and "behind" + l10n: de.po: translate one new message + l10n: de.po: translate 3 new messages + +Thomas Rast (4): + l10n: de.po: translate "bare" as "bloß" + l10n: de.po: hopefully uncontroversial fixes + l10n: de.po: translate "bad" as "ungültig" ("invalid") + l10n: de.po: collection of suggestions + + +Version v1.7.10.2; changes since v1.7.10.1: +------------------------------------------- + +Angus Hammond (1): + grep.c: remove redundant line of code + +Ben Walton (1): + Avoid bug in Solaris xpg4/sed as used in submodule + +Christian Couder (1): + revert: add missing va_end + +Christopher Tiwald (2): + push: Provide situational hints for non-fast-forward errors + Fix httpd tests that broke when non-ff push advice changed + +Clemens Buchacher (3): + http auth fails with multiple curl handles + properly keep track of current working directory + cherry-pick: do not expect file arguments + +Florian Achleitner (1): + Documentation/git-config: describe and clarify "--local " option + +Heiko Voigt (1): + document submdule.$name.update=none option for gitmodules + +Jeff King (15): + clean up struct ref's nonfastforward field + http-backend: respect existing GIT_COMMITTER_* variables + fix http auth with multiple curl handles + gc: do not explode objects which will be immediately pruned + http: clean up leak in init_curl_http_auth + http: use newer curl options for setting credentials + argv-array: refactor empty_argv initialization + argv-array: add a new "pushl" method + gc: use argv-array for sub-commands + config: reject bogus section names for --rename-section + config: expand tildes in include.path variable + send-pack: show progress when isatty(2) + teach send-pack about --[no-]progress + t5541: test more combinations of --progress + t/gitweb-lib: use $PERL_PATH to run gitweb + +Jim Meyering (1): + diff: avoid stack-buffer-read-overrun for very long name + +Johannes Sixt (2): + t9300-fast-import: avoid 'exit' in test_expect_success snippets + t5570: fix forwarding of git-daemon messages via cat + +Junio C Hamano (13): + xdiff: remove XDL_PATCH_* macros + xdiff: PATIENCE/HISTOGRAM are not independent option bits + rebase -i: remind that the lines are top-to-bottom + builtin/merge.c: remove "remoteheads" global variable + builtin/merge.c: collect other parents early + builtin/merge.c: reduce parents early + fmt-merge-msg: discard needless merge parents + t9400: fix gnuism in grep + diff --no-index: use strbuf for temporary pathnames + contrib/rerere-train: use installed git-sh-setup + Start preparing for 1.7.10.2 + Update draft release notes to 1.7.10.2 + Git 1.7.10.2 + +Lucian Poston (5): + Add output_prefix_length to diff_options + Adjust stat width calculations to take --graph output into account + t4052: Adjust --graph --stat output for prefixes + t4052: Test diff-stat output with minimum columns + Prevent graph_width of stat width from falling below min + +Marc Branchaud (2): + fetch: Give remote_ref to update_local_ref() as well + fetch: describe new refs based on where it came from + +Michał Kiedrowicz (1): + merge tests: octopus with redundant parents + +Pete Wyckoff (2): + git-remote-testgit: fix race when spawning fast-import + git p4 doc: fix formatting + +Ralf Thielow (1): + sequencer: remove additional blank line + +René Scharfe (2): + unpack-trees: don't perform any index operation if we're not merging + unpack-trees: plug minor memory leak + +Ross Lagerwall (2): + rev-parse --show-prefix: add in trailing newline + stash: use eval_gettextln correctly + +Stefano Lattarini (1): + tests: modernise style: more uses of test_line_count + +Zbigniew Jędrzejewski-Szmek (4): + t4052: test --stat output with --graph + test-lib: skip test with COLUMNS=1 under mksh + t4052: work around shells unable to set COLUMNS to 1 + Consistently use perl from /usr/bin/ for scripts + + +Version v1.7.10.1; changes since v1.7.10: +----------------------------------------- + +Adam Monsen (1): + git-commit.txt: clarify -t requires editing message + +Byrial Jensen (2): + l10n: New da.po file with 0 translations + l10n: Add Danish team (da) to list of teams + +Ivan Todoroski (4): + fetch-pack: new --stdin option to read refs from stdin + remote-curl: send the refs to fetch-pack on stdin + fetch-pack: test cases for the new --stdin option + remote-curl: main test case for the OS command line overflow + +Jeff King (6): + drop casts from users EMPTY_TREE_SHA1_BIN + make is_empty_blob_sha1 available everywhere + teach diffcore-rename to optionally ignore empty content + merge-recursive: don't detect renames of empty files + add--interactive: ignore unmerged entries in patch mode + run-command: treat inaccessible directories as ENOENT + +Jens Lehmann (1): + submodules: recursive fetch also checks new tags for submodule commits + +Jiang Xin (2): + l10n: Update git.pot (2 new messages) + l10n: Update Simplified Chinese translation + +Johan Herland (3): + t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ + notes-merge: use opendir/readdir instead of using read_directory() + notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd + +Johannes Sixt (1): + t4034: diff.*.wordregex should not be "sticky" in --word-diff + +John Keeping (1): + rebase -i continue: don't skip commits that only change submodules + +Jonathan Nieder (1): + bundle: remove stray single-quote from error message + +Junio C Hamano (16): + ident.c: add split_ident_line() to parse formatted ident line + t7503: does pre-commit-hook learn authorship? + commit: pass author/committer info to hooks + remove_dir_recursively(): Add flag for skipping removal of toplevel dir + clean: preserve nested git worktree in subdirectories + t7501: test the right kind of breakage + commit: do not trigger bogus "has templated message edited" check + commit: rephrase the error when user did not touch templated log message + Documentation/git-commit: rephrase the "initial-ness" of templates + push: error out when the "upstream" semantics does not make sense + blame: accept --need-minimal + Git 1.7.7.7 + Git 1.7.8.6 + Git 1.7.9.7 + Start preparing for 1.7.10.1 + Git 1.7.10.1 + +Lucian Poston (3): + log --graph --stat: three-dash separator should come after graph lines + log --graph: fix break in graph lines + t4202: add test for "log --graph --stat -p" separator lines + +Marco Sousa (1): + l10n: Updated pt_PT language + +Pete Wyckoff (1): + fast-import: tighten parsing of datarefs + +Ralf Thielow (2): + l10n: Add the German translation team and initialize de.po + l10n: Initial German translation + +Ramsay Allan Jones (1): + compat/mingw.[ch]: Change return type of exec functions to int + +René Scharfe (3): + combine-diff: fix loop index underflow + submodule: fix prototype of gitmodules_config + test-subprocess: fix segfault without arguments + +Thomas Rast (2): + diff: refactor the word-diff setup from builtin_diff_cmd + diff: tweak a _copy_ of diff_options with word-diff + + +Version v1.7.10; changes since v1.7.10-rc4: +------------------------------------------- + +Felipe Contreras (1): + spec: add missing build dependency + +Junio C Hamano (1): + Git 1.7.10 + + +Version v1.7.10-rc4; changes since v1.7.10-rc3: +----------------------------------------------- + +Heiko Voigt (1): + string-list: document that string_list_insert() inserts unique strings + +Jiang Xin (1): + l10n: Improve zh_CN translation for Git 1.7.10-rc3 + +Junio C Hamano (3): + merge: backport GIT_MERGE_AUTOEDIT support + Git 1.7.9.6 + Git 1.7.10-rc4 + +Marco Sousa (1): + l10n: Inital Portuguese Portugal language (pt_PT) + +Pat Thoyts (2): + gitk: fix tabbed preferences construction when using tcl 8.4 + gitk: fix setting font display with new tabbed dialog layout. + +René Scharfe (1): + config: remove useless assignment + +Vincent van Ravesteijn (1): + l10n: Add the Dutch translation team and initialize nl.po + + +Version v1.7.10-rc3; changes since v1.7.10-rc2: +----------------------------------------------- + +Frédéric Brière (1): + gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields + +Jiang Xin (4): + l10n: Update git.pot (1 new message) + l10n: Update zh_CN translation for Git 1.7.10-rc1 + l10n: Review zh_CN translation for Git 1.7.10-rc1 + Add url of Swedish l10n team in TEAMS file + +Jim Meyering (3): + gitk: Make "git describe" output clickable, too + correct spelling: an URL -> a URL + correct a few doubled-word nits in comments and documentation + +Jonathan Nieder (1): + gitk: Use symbolic font names "sans" and "monospace" when available + +Junio C Hamano (3): + Git 1.7.9.5 + Update draft release notes to 1.7.10 + Git 1.7.10-rc3 + +Marcus Karlsson (1): + gitk: Teach gitk to respect log.showroot + +Mark Lodato (1): + grep doc: add --break / --heading / -W to synopsis + +Nelson Benitez Leon (1): + documentation: fix alphabetic ordered list for git-rebase man page + +Pat Thoyts (2): + gitk: Use a tabbed dialog to edit preferences + gitk: Fix the display of files when filtered by path + +Paul Mackerras (2): + gitk: Speed up resolution of short SHA1 ids + gitk: Add menu items for comparing a commit with the marked commit + +Peter Krefting (1): + Update Swedish translation (724t0f0u). + +Rodrigo Silva (MestreLion) (1): + Documentation: improve description of GIT_EDITOR and preference order + +Zbigniew Jędrzejewski-Szmek (2): + gitk: Use "gitk: repo-top-level-dir" as window title + tests: unset COLUMNS inherited from environment + + +Version v1.7.10-rc2; changes since v1.7.10-rc1: +----------------------------------------------- + +Alex Merry (1): + contrib/completion: "local var=()" is misinterpreted as func-decl by zsh + +D Waitzman (1): + Documentation/gitweb: trivial English fixes + +Jonathan Nieder (2): + fast-import: leakfix for 'ls' of dirty trees + fast-import: don't allow 'ls' of path with empty components + +Junio C Hamano (4): + fetch/receive: remove over-pessimistic connectivity check + Update draft release notes to 1.7.10 + .mailmap: unify various old mail addresses of gitster + Git 1.7.10-rc2 + +Stefano Lattarini (1): + configure: allow user to prevent $PATH "sanitization" on Solaris + +Tim Henigan (7): + Documentation/diff-options: reword description of --submodule option + contrib/diffall: comment actual reason for 'cdup' + contrib/diffall: create tmp dirs without mktemp + contrib/diffall: eliminate use of tar + contrib/diffall: eliminate duplicate while loops + contrib/diffall: fix cleanup trap on Windows + Documentation/difftool: add deltawalker to list of valid diff tools + +Ævar Arnfjörð Bjarmason (2): + Git::I18N: compatibility with perl <5.8.3 + perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER + + +Version v1.7.10-rc1; changes since v1.7.10-rc0: +----------------------------------------------- + +Alex Zepeda (1): + verify-tag: Parse GPG configuration options. + +Jakub Narebski (1): + gitweb: Fix fixed string (non-regexp) project search + +Jens Lehmann (3): + submodules: always use a relative path to gitdir + submodules: always use a relative path from gitdir to work tree + submodules: refactor computation of relative gitdir path + +Jiang Xin (3): + l10n: Update zh_CN translation for 1.7.9.2 + l10n: Update git.pot (1 new message) + l10n: Update zh_CN translation for 1.7.10-rc0 + +Johannes Sixt (1): + submodules: fix ambiguous absolute paths under Windows + +Junio C Hamano (7): + Update draft release notes to 1.7.10 + t0204: clarify the "observe undefined behaviour" test + i18n: fix auto detection of gettext scheme for shell scripts + Git 1.7.9.4 + Update draft release notes to 1.7.10 before -rc1 + am: officially deprecate -b/--binary option + Git 1.7.10-rc1 + +Karsten Blees (1): + fix deletion of .git/objects sub-directories in git-prune/repack + +Martin Stenberg (1): + config: report errors at the EOL with correct line number + +Peter Krefting (2): + po/sv.po: add Swedish translation + Update Swedish translation (732t0f0u). + +Phil Hord (1): + rerere: Document 'rerere remaining' + +Thomas Rast (4): + perf: load test-lib-functions from the correct directory + perf: export some important test-lib variables + p4000: use -3000 when promising -3000 + git-am: error out when seeing -b/--binary + +Thynson (7): + l10n: Improve zh_CN translation for lines insertion and deletion. + l10n: Improve zh_CN translation for msg about branch deletion deny + l10n: Improve zh_CN translation for empty cherry-pick msg. + l10n: Improve zh_CN translation for msg that make empty commit when amend. + l10n: Improve commit msg for zh_CN translation + l10n: Improve zh_CN trans for msg that cannot fast-forward + l10n: Improve zh_CN translation for msg "not something we can merge" + +Vincent van Ravesteijn (3): + Documentation/git-branch: cleanups + Documentation/git-branch: fix a typo + Documentation/git-branch: add default for --contains + + +Version v1.7.10-rc0; changes since v1.7.9.7: +-------------------------------------------- + +Adrian Weimann (1): + completion: --edit and --no-edit for git-merge + +Alex Riesen (1): + add a Makefile switch to avoid gettext translation in shell scripts + +Bernhard R. Link (6): + gitweb: move hard coded .git suffix out of git_get_projects_list + gitweb: prepare git_get_projects_list for use outside 'forks'. + gitweb: add project_filter to limit project list to a subdirectory + gitweb: limit links to alternate forms of project_list to active project_filter + gitweb: show active project_filter in project_list page header + gitweb: place links to parent directories in page header + +Carlos Martín Nieto (1): + Make git-{pull,rebase} message without tracking information friendlier + +Clemens Buchacher (3): + git-daemon: add tests + git-daemon: produce output when ready + git-daemon tests: wait until daemon is ready + +David Barr (9): + vcs-svn: set up channel to read fast-import cat-blob response + vcs-svn: quote paths correctly for ls command + vcs-svn: use mark from previous import for parent commit + vcs-svn: pass paths through to fast-import + vcs-svn: drop string_pool + vcs-svn: drop treap + vcs-svn: drop obj_pool + vcs-svn: avoid using ls command twice + vcs-svn: implement text-delta handling + +Dmitry Ivankov (2): + vcs-svn: do not initialize report_buffer twice + vcs-svn: reset first_commit_done in fast_export_init + +Felipe Contreras (4): + remote: use a local variable in match_push_refs() + remote: reorganize check_pattern_match() + remote: refactor code into alloc_delete_ref() + push: add '--prune' option + +Frederic Heitzmann (1): + completion: add --interactive option to git svn dcommit + +Jakub Narebski (11): + gitweb: improve usability of projects search form + gitweb: Make project search respect project_filter + gitweb: Harden and improve $project_filter page title + gitweb: Refactor checking if part of project info need filling + gitweb: Option for filling only specified info in fill_project_list_info + gitweb: Faster project search + gitweb: Introduce esc_html_match_hl and esc_html_hl_regions + gitweb: Highlight matched part of project name when searching projects + gitweb: Highlight matched part of project description when searching projects + gitweb: Highlight matched part of shortened project description + gitweb: Fix passing parameters to git_project_search_form + +Jan Krüger (1): + symbolic-ref --short: abbreviate the output unambiguously + +Jared Hance (1): + Add threaded versions of functions in symlinks.c. + +Jeff King (20): + parse_object: try internal cache before reading object db + upload-pack: avoid parsing objects during ref advertisement + upload-pack: avoid parsing tag destinations + t0300: use write_script helper + docs: add a basic description of the config API + drop odd return value semantics from userdiff_config + diff-highlight: make perl strict and warnings fatal + diff-highlight: don't highlight whole lines + diff-highlight: refactor to prepare for multi-line hunks + diff-highlight: match multi-line hunks + diff-highlight: document some non-optimal cases + docs/api-config: minor clarifications + t1300: add missing &&-chaining + config: copy the return value of prefix_filename + config: teach git_config_set_multivar_in_file a default path + config: teach git_config_rename_section a file argument + config: provide a version of git_config with more options + config: stop using config_exclusive_filename + config: eliminate config_exclusive_filename + config: add include directive + +Jehan Bing (1): + Add a setting to require a filter to be successful + +Jens Lehmann (1): + test-lib: add the test_pause convenience function + +Jiang Xin (5): + l10n: initial git.pot for 1.7.10 upcoming release + l10n: po for zh_CN + l10n: Update git.pot (12 new messages) + l10n: update Chinese translation to the new git.po + Update l10n guide: change the repository URL, etc + +Jonathan Nieder (23): + vcs-svn: use higher mark numbers for blobs + vcs-svn: save marks for imported commits + vcs-svn: add a comment before each commit + vcs-svn: eliminate repo_tree structure + vcs-svn: handle filenames with dq correctly + Makefile: list one vcs-svn/xdiff object or header per line + vcs-svn: learn to maintain a sliding view of a file + vcs-svn: make buffer_read_binary API more convenient + vcs-svn: skeleton of an svn delta parser + vcs-svn: parse svndiff0 window header + vcs-svn: read the preimage when applying deltas + vcs-svn: read inline data from deltas + vcs-svn: read instructions from deltas + vcs-svn: implement copyfrom_data delta instruction + vcs-svn: verify that deltas consume all inline data + vcs-svn: let deltas use data from postimage + vcs-svn: let deltas use data from preimage + test-svn-fe: split off "test-svn-fe -d" into a separate function + vcs-svn: cap number of bytes read from sliding view + vcs-svn: guard against overflow when computing preimage length + vcs-svn: avoid hangs from corrupt deltas + vcs-svn: allow import of > 4GiB files + vcs-svn: suppress a -Wtype-limits warning + +Junio C Hamano (28): + git-sh-i18n: restructure the logic to compute gettext.sh scheme + i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n + merge: use editor by default in interactive sessions + push: do not let configured foreign-vcs permanently clobbered + t9801: do not overuse test_must_fail + i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT + vcs-svn/svndiff.c: squelch false "unused" warning from gcc + Kick off the post 1.7.9 cycle + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + t9100: remove bogus " || test" after each test scriptlet + merge: do not trust fstat(2) too much when checking interactiveness + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + grep: use static trans-case table + fsck: --no-dangling omits "dangling object" information + pickaxe: allow -i to search in patch case-insensitively + Update l10n guide + diff --stat: tests for long filenames and big change counts + Update draft release notes to 1.7.10 + Update draft release notes to 1.7.10 + fsck doc: a minor typofix + Git 1.7.10-rc0 + +Linus Torvalds (1): + "git pull" doesn't know "--edit" + +Luke Diamand (6): + git-p4: handle p4 branches and labels containing shell chars + git-p4: cope with labels with empty descriptions + git-p4: importing labels should cope with missing owner + git-p4: add test for p4 labels + git-p4: label import fails with multiple labels at the same changelist + git-p4: add initial support for RCS keywords + +Michael Haggerty (11): + pack_refs(): remove redundant check + ref_array: keep track of whether references are sorted + add_packed_ref(): new function in the refs API. + write_remote_refs(): create packed (rather than extra) refs + t5700: document a failure of alternates to affect fetch + clone.c: move more code into the "if (refs)" conditional + fetch-pack.c: rename some parameters from "path" to "refname" + fetch-pack.c: inline insert_alternate_refs() + everything_local(): mark alternate refs as complete + clone: do not add alternate references to extra_refs + refs: remove the extra_refs API + +Michał Kiedrowicz (2): + pack-objects: Fix compilation with NO_PTHREDS + grep -P: add tests for matching ^ and $ + +Nelson Benitez Leon (1): + http: support proxies that require authentication + +Nguyễn Thái Ngọc Duy (20): + clone: add --single-branch to fetch only one branch + Fix incorrect ref namespace check + Eliminate recursion in setting/clearing marks in commit list + index-pack: eliminate recursion in find_unresolved_deltas + index-pack: eliminate unlimited recursion in get_base_data() + t5601: add missing && cascade + clone: write detached HEAD in bare repositories + clone: factor out checkout code + clone: factor out HEAD update code + clone: factor out remote ref writing + clone: delay cloning until after remote HEAD checking + clone: --branch= always means refs/heads/ + clone: refuse to clone if --branch points to bogus ref + clone: allow --branch to take a tag + clone: print advice on checking out detached HEAD + clone: fix up delay cloning conditions + pack-objects: do not accept "--index-version=version," + pack-objects: remove bogus comment + pack-objects: convert to use parse_options() + cache-tree: update API to take abitrary flags + +Pete Wyckoff (6): + git-p4: only a single ... wildcard is supported + git-p4: fix verbose comment typo + git-p4: clarify comment + git-p4: adjust test to adhere to stricter useClientSpec + git-p4: add tests demonstrating spec overlay ambiguities + git-p4: Change p4 command invocation + +Phil Hord (1): + cherry-pick: No advice to commit if --no-commit + +Philip Jägenstedt (2): + completion: remote set-* and + completion: normalize increment/decrement style + +Ramkumar Ramachandra (2): + revert: prepare to move replay_action to header + sequencer: factor code out of revert builtin + +Ramsay Allan Jones (3): + vcs-svn: rename check_overflow arguments for clarity + builtin/tag.c: Fix a sparse warning + ctype.c: Fix a sparse warning + +René Scharfe (5): + xdiff: print post-image for common records instead of pre-image + test-parse-options: convert to OPT_BOOL() + parse-options: allow positivation of options starting, with no- + parse-options: remove PARSE_OPT_NEGHELP + parse-options: typo check for unknown switches + +Riku (1): + l10n: update zh_CN translation for "Fetching %s" + +Russell Myers (1): + git-p4: the option to specify 'host' is -H, not -h + +Stefano Lattarini (1): + t0000: modernise style + +Steven Walter (2): + git-svn.perl: perform deletions before anything else + git-svn.perl: fix a false-positive in the "already exists" test + +Thomas Rast (6): + am: learn passing -b to mailinfo + mailinfo: with -b, keep space after [foo] + Move the user-facing test library to test-lib-functions.sh + Introduce a performance testing framework + Add a performance test for git-grep + perf: compare diff algorithms + +Tim Henigan (2): + contrib: add git-diffall script + mergetools: add a plug-in to support DeltaWalker + +Tom Grennan (1): + tag: add --points-at list option + +Vitor Antunes (2): + git-p4: Search for parent commit on branch creation + git-p4: Add test case for complex branch import + +Wei-Yin Chen (陳威尹) (1): + git-svn: Fix time zone in --localtime + +Yichao Yu (1): + l10n: fast-forward here is ff-only merge, not push + +Zbigniew Jędrzejewski-Szmek (11): + make lineno_width() from blame reusable for others + send-email: document the --smtp-debug option + git-p4: missing she-bang line in t9804 confuses prove + diff --stat: use the full terminal width + show --stat: use the full terminal width + log --stat: use the full terminal width + merge --stat: use the full terminal width + diff --stat: use a maximum of 5/8 for the filename part + diff --stat: add a test for output with COLUMNS=40 + diff --stat: enable limiting of the graph part + diff --stat: add config option to limit graph width + +ws3389 (1): + l10n: leave leading space unchanged for zh_CN.po + +Ævar Arnfjörð Bjarmason (2): + git-svn: remove redundant porcelain option to rev-list + git-svn: un-break "git svn rebase" when log.abbrevCommit=true + + +Version v1.7.9.7; changes since v1.7.9.6: +----------------------------------------- + +D Waitzman (1): + Documentation/gitweb: trivial English fixes + +Jonathan Nieder (1): + bundle: remove stray single-quote from error message + +Junio C Hamano (4): + fetch/receive: remove over-pessimistic connectivity check + Git 1.7.7.7 + Git 1.7.8.6 + Git 1.7.9.7 + + +Version v1.7.9.6; changes since v1.7.9.5: +----------------------------------------- + +Heiko Voigt (1): + string-list: document that string_list_insert() inserts unique strings + +Junio C Hamano (2): + merge: backport GIT_MERGE_AUTOEDIT support + Git 1.7.9.6 + + +Version v1.7.9.5; changes since v1.7.9.4: +----------------------------------------- + +Jakub Narebski (1): + gitweb: Fix actionless dispatch for non-existent objects + +Jonathan Nieder (2): + fast-import: leakfix for 'ls' of dirty trees + fast-import: don't allow 'ls' of path with empty components + +Junio C Hamano (2): + i18n of multi-line advice messages + Git 1.7.9.5 + +Kirill Smelkov (1): + t/Makefile: Use $(sort ...) explicitly where needed + +Mark Lodato (1): + grep doc: add --break / --heading / -W to synopsis + +Martin Stenberg (1): + config: report errors at the EOL with correct line number + +Nelson Benitez Leon (1): + documentation: fix alphabetic ordered list for git-rebase man page + +Phil Hord (1): + rerere: Document 'rerere remaining' + +Rodrigo Silva (MestreLion) (1): + Documentation: improve description of GIT_EDITOR and preference order + + +Version v1.7.9.4; changes since v1.7.9.3: +----------------------------------------- + +Jakub Narebski (1): + gitweb: Fix fixed string (non-regexp) project search + +Junio C Hamano (6): + am -3: allow nonstandard -p option + test: "am -3" can accept non-standard -p + t4011: modernise style + t4011: illustrate "diff-index -p" on stat-dirty paths + diff -p: squelch "diff --git" header for stat-dirty paths + Git 1.7.9.4 + +Thomas Rast (5): + t5510: refactor bundle->pack conversion + t5510: ensure we stay in the toplevel test dir + bundle: keep around names passed to add_pending_object() + Document the --histogram diff option + t5704: fix nonportable sed/grep usages + + +Version v1.7.9.3; changes since v1.7.9.2: +----------------------------------------- + +Andrew Wong (1): + rebase -m: only call "notes copy" when rewritten exists and is non-empty + +Carlos Martín Nieto (2): + branch: don't assume the merge filter ref exists + Documentation: use {asterisk} in rev-list-options.txt when needed + +Clemens Buchacher (1): + http.proxy: also mention https_proxy and all_proxy + +Dmitry V. Levin (1): + Makefile: add thread-utils.h to LIB_H + +Jakub Narebski (2): + gitweb: Fix "heads" view when there is no current branch + gitweb: Handle invalid regexp in regexp search + +Jeff King (4): + disconnect from remote helpers more gently + teach convert_to_git a "dry run" mode + teach dry-run convert_to_git not to require a src buffer + do not stream large files to pack when filters are in use + +Jehan Bing (1): + Ignore SIGPIPE when running a filter driver + +Jim Meyering (1): + am: don't infloop for an empty input file + +John Szakmeister (1): + configure: don't use -lintl when there is no gettext support + +Jonathan Nieder (1): + mergetools/meld: Use --help output to detect --output support + +Junio C Hamano (9): + refresh_index: do not show unmerged path that is outside pathspec + Documentation/merge-options.txt: group "ff" related options together + Document merge.branchdesc configuration variable + Git 1.7.8.5 + Document accumulated fixes since 1.7.9.2 + Update draft release notes to 1.7.9.3 + Documentation: do not assume that n > 1 in ~$n + Update draft release notes to 1.7.9.3 for the last time + Git 1.7.9.3 + +Libor Pechacek (1): + Documentation fixes in git-config + +Matthieu Moy (1): + README: point to Documentation/SubmittingPatches + +Michael Haggerty (2): + post-receive-email: remove unused variable + post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly + +Michael J Gruber (1): + t0300: work around bug in dash 0.5.6 + +Michał Kiedrowicz (1): + grep -P: Fix matching ^ and $ + +Nguyễn Thái Ngọc Duy (2): + rev-list: remove BISECT_SHOW_TRIED flag + rev-list: fix --verify-objects --quiet becoming --objects + +Pete Wyckoff (4): + git-p4: set useClientSpec variable on initial clone + git-p4: fix submit regression with clientSpec and subdir clone + git-p4: remove bash-ism in t9809 + git-p4: remove bash-ism in t9800 + +Philip Jägenstedt (1): + remote: fix set-branches usage and documentation + +Stefano Lattarini (1): + tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh + +Thomas Rast (6): + merge: add instructions to the commit message when editing + bundle: put strbuf_readline_fd in strbuf.c with adjustments + bundle: use a strbuf to scan the log for boundary commits + strbuf: improve strbuf_get*line documentation + t5704: match tests to modern style + fast-import: zero all of 'struct tag' to silence valgrind + +Tim Henigan (2): + CodingGuidelines: Add a note about spaces after redirection + CodingGuidelines: do not use 'which' in shell scripts + +Tom Grennan (1): + t5512 (ls-remote): modernize style + + +Version v1.7.9.2; changes since v1.7.9.1: +----------------------------------------- + +Christian Hammerl (1): + completion: Allow dash as the first character for __git_ps1 + +Clemens Buchacher (4): + git rev-list: fix invalid typecast + push/fetch/clone --no-progress suppresses progress output + t5541: check error message against the real port number used + do not override receive-pack errors + +Felipe Contreras (3): + completion: work around zsh option propagation bug + completion: use ls -1 instead of rolling a loop to do that ourselves + completion: simplify __gitcomp and __gitcomp_nl implementations + +Jakub Narebski (2): + gitweb: Allow UTF-8 encoded CGI query parameters and path_info + gitweb: Fix 'grep' search for multiple matches in file + +Jeff King (12): + grep: make locking flag global + grep: move sha1-reading mutex into low-level code + grep: refactor the concept of "grep source" into an object + convert git-grep to use grep_source interface + grep: drop grep_buffer's "name" parameter + grep: cache userdiff_driver in grep_source + grep: respect diff attributes for binary-ness + grep: load file data after checking binary-ness + grep: pre-load userdiff drivers when threaded + standardize and improve lookup rules for external local repos + prompt: clean up strbuf usage + prompt: fall back to terminal if askpass fails + +Jiang Xin (2): + i18n: git-commit whence_s "merge/cherry-pick" message + i18n: format_tracking_info "Your branch is behind" message + +Johannes Sixt (1): + Makefile: fix syntax for older make + +Junio C Hamano (8): + mailmap: always return a plain mail address from map_user() + git checkout -b: allow switching out of an unborn branch + commit: ignore intent-to-add entries instead of refusing + diff --stat: show bars of same length for paths with same amount of changes + Update draft release notes to 1.7.9.2 + Update draft release notes to 1.7.9.2 + Update draft release notes to 1.7.9.2 + Git 1.7.9.2 + +Matthieu Moy (1): + fsck: give accurate error message on empty loose object files + +Namhyung Kim (2): + ctype.c only wants git-compat-util.h + ctype: implement islower/isupper macro + +Nguyễn Thái Ngọc Duy (3): + sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry() + find_pack_entry(): do not keep packed_git pointer locally + Use correct grammar in diffstat summary line + +Philip Jägenstedt (2): + completion: remove stale "to submit patches" documentation + completion: use tabs for indentation + +Ralf Thielow (2): + completion: --edit-description option for git-branch + completion: --list option for git-branch + +Theodore Ts'o (1): + Fix build problems related to profile-directed optimization + +Zbigniew Jędrzejewski-Szmek (2): + pager: find out the terminal width before spawning the pager + man: rearrange git synopsis to fit in 80 lines + +Дилян Палаузов (1): + Makefile: introduce CHARSET_LIB to link with -lcharset + + +Version v1.7.9.1; changes since v1.7.9: +--------------------------------------- + +Adrian Weimann (1): + completion: --edit and --no-edit for git-merge + +Albert Yale (1): + grep: fix -l/-L interaction with decoration lines + +Ben Walton (1): + Drop system includes from inet_pton/inet_ntop compatibility wrappers + +Clemens Buchacher (2): + fix push --quiet: add 'quiet' capability to receive-pack + dashed externals: kill children on exit + +David Aguilar (1): + mergetool: Provide an empty file when needed + +Jakub Narebski (1): + git.spec: Workaround localized messages not put in any RPM + +Jeff King (4): + run-command: optionally kill children on exit + imap-send: remove dead code + tag: fix output of "tag -n" when errors occur + tag: die when listing missing or corrupt objects + +Jens Lehmann (1): + submodule add: fix breakage when re-adding a deep submodule + +Johannes Schindelin (1): + add -e: do not show difference in a submodule that is merely dirty + +Junio C Hamano (15): + server_supports(): parse feature list more carefully + Making pathspec limited log play nicer with --first-parent + request-pull: explicitly ask tags/$name to be pulled + tests: add write_script helper function + parse_date(): allow ancient git-timestamp + parse_date(): '@' prefix forces git-timestamp + merge: do not create a signed tag merge under --ff-only option + branch --edit-description: protect against mistyped branch name + Git 1.7.6.6 + Prepare for 1.7.9.1 + tag: do not show non-tag contents with "-n" + merge: do not launch an editor on "--no-edit $tag" + Update draft release notes to 1.7.9.1 + Update draft release notes to 1.7.9.1 + Git 1.7.9.1 + +Michael J Gruber (1): + t5541: avoid TAP test miscounting + +Michael Palimaka (1): + Explicitly set X to avoid potential build breakage + +Shawn O. Pearce (1): + remote-curl: Fix push status report when all branches fail + +Ævar Arnfjörð Bjarmason (3): + Makefile: Change the default compiler from "gcc" to "cc" + Remove Git's support for smoke testing + t: use sane_unset instead of unset + + +Version v1.7.9; changes since v1.7.9-rc2: +----------------------------------------- + +Felipe Contreras (1): + git-completion: workaround zsh COMPREPLY bug + +Jeff King (1): + docs: minor grammar fixes for v1.7.9 release notes + +Junio C Hamano (2): + INSTALL: warn about recent Fedora breakage + Git 1.7.9 + +Michael Haggerty (1): + Fix typo in 1.7.9 release notes + + +Version v1.7.9-rc2; changes since v1.7.9-rc1: +--------------------------------------------- + +Jakub Narebski (2): + gitweb: Fix file links in "grep" search + gitweb: Harden "grep" search against filenames with ':' + +Jeff King (3): + unix-socket: handle long socket pathnames + credential-cache: report more daemon connection errors + credential-cache: ignore "connection refused" errors + +Jonathan Nieder (1): + unix-socket: do not let close() or chdir() clobber errno during cleanup + +Junio C Hamano (4): + pulling signed tag: add howto document + Git 1.7.7.6 + Git 1.7.8.4 + Git 1.7.9-rc2 + +Michael Haggerty (2): + git-show-ref: fix escaping in asciidoc source + git-show-ref doc: typeset regexp in fixed width font + +Nguyễn Thái Ngọc Duy (3): + Document limited recursion pathspec matching with wildcards + diff-index: enable recursive pathspec matching in unpack_trees + diff-index: enable recursive pathspec matching in unpack_trees + +Thomas Rast (1): + word-diff: ignore '\ No newline at eof' marker + + +Version v1.7.9-rc1; changes since v1.7.9-rc0: +--------------------------------------------- + +Ben Walton (1): + Use perl instead of sed for t8006-blame-textconv test + +Carlos Martín Nieto (1): + archive: re-allow HEAD:Documentation on a remote invocation + +Clemens Buchacher (1): + credentials: unable to connect to cache daemon + +Jeff King (5): + send-email: multiedit is a boolean config option + attr: don't confuse prefixes with leading directories + attr: drop misguided defensive coding + attr: fix leak in free_attr_elem + thin-pack: try harder to use preferred base objects as base + +Junio C Hamano (11): + attr.c: make bootstrap_attr_stack() leave early + attr.c: clarify the logic to pop attr_stack + Documentation: rerere's rr-cache auto-creation and rerere.enabled + Prepare for 1.7.6.6 + Prepare for 1.7.7.6 + Prepare for 1.7.8.4 + request-pull: use the real fork point when preparing the message + Update draft release notes to 1.7.6.6 + Update draft release notes to 1.7.7.6 + Update draft release notes to 1.7.8.4 + Git 1.7.9-rc1 + +Matthieu Moy (1): + gitweb: accept trailing "/" in $project_list + +Michael Haggerty (3): + receive-pack: move more work into write_head_info() + show_ref(): remove unused "flag" and "cb_data" arguments + write_head_info(): handle "extra refs" locally + +Nguyễn Thái Ngọc Duy (1): + t2203: fix wrong commit command + +Sebastian Schuberth (2): + t9200: On MSYS, do not pass Windows-style paths to CVS + git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS + +Thomas Rast (1): + mailinfo documentation: accurately describe non -k case + + +Version v1.7.9-rc0; changes since v1.7.8.6: +------------------------------------------- + +Anders Kaseorg (2): + gitk: Remove unused $cdate array + gitk: Remember time zones from author and commit timestamps + +Bert Wesarg (14): + git-gui: fix multi selected file operation + git-gui: handle config booleans without value + git-gui: add smart case search mode in searchbar + git-gui: add regexp search mode to the searchbar + git-gui: add search history to searchbar + git-gui: fix unintended line break in message string + git-gui: use "untracked" for files which are not known to git + git-gui: new config to control staging of untracked files + git-gui: fix display of path in browser title + git-gui: use a tristate to control the case mode in the searchbar + git-gui: span widgets over the full file output area in the blame view + git-gui: include the file path in guitools confirmation dialog + git-gui: make config gui.warndetachedcommit a boolean + git-gui: don't warn for detached head when rebasing + +Dejan Ribič (1): + git-gui: fix spelling error in sshkey.tcl + +Gary Gibbons (5): + git-p4: ensure submit clientPath exists before chdir + git-p4: use absolute directory for PWD env var + git-p4: fix test for unsupported P4 Client Views + git-p4: sort client views by reverse View number + git-p4: support single file p4 client view maps + +Gustaf Hendeby (1): + Add built-in diff patterns for MATLAB code + +Jakub Narebski (6): + gitweb: Refactor diff body line classification + gitweb: Extract formatting of diff chunk header + gitweb: Give side-by-side diff extra CSS styling + t9500: Add test for handling incomplete lines in diff by gitweb + t9500: Add basic sanity tests for side-by-side diff in gitweb + gitweb: Use href(-replay=>1,...) for formats links in "commitdiff" + +Jeff King (28): + prune: handle --progress/no-progress + reachable: per-object progress + upload-archive: use start_command instead of fork + test-lib: add test_config_global variant + t5550: fix typo + introduce credentials API + credential: add function for parsing url components + http: use credential API to get passwords + credential: apply helper config + credential: add credential.*.username + credential: make relevance of http path configurable + docs: end-user documentation for the credential subsystem + credentials: add "cache" helper + strbuf: add strbuf_add*_urlencode + imap-send: avoid buffer overflow + imap-send: don't check return value of git_getpass + move git_getpass to its own source file + refactor git_getpass into generic prompt function + add generic terminal prompt function + credentials: add "store" helper + prompt: use git_terminal_prompt + t: add test harness for external credential helpers + credential: use git_prompt instead of git_getpass + Makefile: linux has /dev/tty + Makefile: OS X has /dev/tty + contrib: add credential helper for OS X Keychain + test-lib: redirect stdin of tests + pretty: give placeholders to reflog identity + +Joey Hess (1): + write first for-merge ref to FETCH_HEAD first + +Johannes Sixt (1): + Makefile: unix sockets may not available on some platforms + +Jonathan Nieder (6): + gitk: Make vi-style keybindings more vi-like + test: add missing "&&" after echo command + test: remove a porcelain test that hard-codes commit names + t7501 (commit): modernize style + test: commit --amend should honor --no-edit + test: errors preparing for a test are not special + +Jonathon Mah (1): + stash: Don't fail if work dir contains file named 'HEAD' + +Junio C Hamano (50): + branch: add read_branch_desc() helper function + format-patch: use branch description in cover letter + branch: teach --edit-description option + request-pull: modernize style + request-pull: state what commit to expect + request-pull: use the branch description + fmt-merge-msg: use branch.$name.description + write_pack_header(): a helper function + create_tmp_packfile(): a helper function + finish_tmp_packfile(): a helper function + Split GPG interface into its own helper library + merge: notice local merging of tags and keep it unwrapped + fetch: allow "git fetch $there v1.0" to fetch a tag + refs DWIMmery: use the same rule for both "git fetch" and others + fmt-merge-msg: avoid early returns + fmt-merge-msg: package options into a structure + fmt-merge-msg: Add contents of merged tag in the merge message + merge: make usage of commit->util more extensible + merge: record tag objects without peeling in MERGE_HEAD + request-pull: use the annotated tag contents + commit: copy merged signed tags to headers of merge commit + merge: force edit and no-ff mode when merging a tag object + commit: teach --amend to carry forward extra headers + commit-tree: update the command line parsing + commit-tree: teach -m/-F options to read logs from elsewhere + commit: teach --gpg-sign option + log: --show-signature + test "commit -S" and "log --show-signature" + pretty: %G[?GS] placeholders + gpg-interface: allow use of a custom GPG binary + csum-file: introduce sha1file_checkpoint + bulk-checkin: replace fast-import based implementation + Kick-off the 1.7.9 cycle + commit: honour --no-edit + Update draft release notes for 1.7.9 + Update draft release notes to 1.7.9 + request-pull: update the "pull" command generation logic + Update draft release notes to 1.7.9 + request-pull: do not emit "tag" before the tagname + Update draft release notes to 1.7.9 + commit: do not lose mergetag header when not amending + Update draft release notes to 1.7.9 + Update draft release notes in preparation for 1.7.9-rc0 + Update draft release notes to 1.7.9 + verify_signed_buffer: fix stale comment + commit --amend -S: strip existing gpgsig headers + log-tree.c: small refactor in show_signature() + log-tree: show mergetag in log --show-signature output + log --show-signature: reword the common two-head merge case + Git 1.7.9-rc0 + +Kato Kazuyoshi (2): + gitweb: Add a feature to show side-by-side diff + gitweb: Add navigation to select side-by-side diff + +Kirill A. Shutemov (1): + git-tag: introduce --cleanup option + +Linus Torvalds (1): + fetch: do not store peeled tag object names in FETCH_HEAD + +Martin von Zweigbergk (10): + gitk: Fix file highlight when run in subdirectory + gitk: Fix "show origin of this line" with separate work tree + gitk: Fix "blame parent commit" with separate work tree + gitk: Fix "External diff" with separate work tree + gitk: Put temporary directory inside .git + gitk: Run 'git rev-parse --git-dir' only once + gitk: Simplify calculation of gitdir + gitk: Show modified files with separate work tree + t3401: modernize style + t3401: use test_commit in setup + +Michael Haggerty (16): + struct ref_entry: document name member + refs: rename "refname" variables + refs: rename parameters result -> sha1 + clear_ref_array(): rename from free_ref_array() + is_refname_available(): remove the "quiet" argument + parse_ref_line(): add docstring + add_ref(): add docstring + is_dup_ref(): extract function from sort_ref_array() + refs: change signatures of get_packed_refs() and get_loose_refs() + get_ref_dir(): change signature + resolve_gitlink_ref(): improve docstring + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions + resolve_gitlink_ref_recursive(): change to work with struct ref_cache + repack_without_ref(): remove temporary + create_ref_entry(): extract function from add_ref() + add_ref(): take a (struct ref_entry *) parameter + +Nguyễn Thái Ngọc Duy (14): + fsck: return error code when verify_pack() goes wrong + verify_packfile(): check as many object as possible in a pack + fsck: avoid reading every object twice + fsck: print progress + prune: show progress while marking reachable objects + Convert many resolve_ref() calls to read_ref*() and ref_exists() + checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore + Copy resolve_ref() return value for longer use + revert: convert resolve_ref() to read_ref_full() + Convert resolve_ref+xstrdup to new resolve_refdup function + Rename resolve_ref() to resolve_ref_unsafe() + merge: abort if fails to commit + Convert commit_tree() to take strbuf as message + commit_tree(): refuse commit messages that contain NULs + +Pat Thoyts (11): + git-gui: include the number of untracked files to stage when asking the user + git-gui: theme the search and line-number entry fields on blame screen + git-gui: catch invalid or complete regular expressions and treat as no match. + git-gui: enable the smart case sensitive search only if gui.search.smartcase is true + git-gui: set suitable extended window manager hints. + git-gui: support underline style when parsing diff output + git-gui: sort the numeric ansi codes + git-gui: set whitespace warnings appropriate to this project + git-gui: added config gui.gcwarning to disable the gc hint message + git-gui: handle shell script text filters when loading for blame. + git-gui 0.16 + +Paul Mackerras (1): + gitk: Update copyright + +Pete Wyckoff (18): + git-p4: introduce skipSubmitEdit + git-p4: submit test for auto-creating clientPath + git-p4: test for absolute PWD problem + git-p4: fix skipSubmitEdit regression + rename git-p4 tests + git-p4: introduce asciidoc documentation + git-p4: clone does not use --git-dir + git-p4: test cloning with two dirs, clarify doc + git-p4: document and test clone --branch + git-p4: honor --changesfile option and test + git-p4: document and test --import-local + git-p4: test --max-changes + git-p4: test --keep-path + git-p4: test and document --use-client-spec + git-p4: document and test submit options + git-p4: test client view handling + git-p4: rewrite view handling + git-p4: view spec documentation + +Ramkumar Ramachandra (11): + t3200 (branch): fix '&&' chaining + test: fix '&&' chaining + t3030 (merge-recursive): use test_expect_code + t1510 (worktree): fix '&&' chaining + t3040 (subprojects-basic): fix '&&' chaining, modernize style + revert: free msg in format_todo() + revert: make commit subjects in insn sheet optional + revert: tolerate extra spaces, tabs in insn sheet + revert: simplify getting commit subject in format_todo() + t3510 (cherry-pick-sequencer): use exit status + t3502, t3510: clarify cherry-pick -m failure + +Ramsay Allan Jones (3): + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning + environment.c: Fix an sparse "symbol not declared" warning + fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error + +Raphael Zimmerer (1): + gitk: When a commit contains a note, mark it with a yellow box + +René Scharfe (5): + read-cache.c: allocate index entries individually + cache.h: put single NUL at end of struct cache_entry + use struct sha1_array in diff_tree_combined() + pass struct commit to diff_tree_combined_merge() + submodule: use diff_tree_combined_merge() instead of diff_tree_combined() + +SZEDER Gábor (9): + completion: document __gitcomp() + completion: optimize refs completion + completion: make refs completion consistent for local and remote repos + completion: improve ls-remote output filtering in __git_refs() + completion: support full refs from remote repositories + completion: query only refs/heads/ in __git_refs_remotes() + completion: improve ls-remote output filtering in __git_refs_remotes() + completion: fast initial completion for config 'remote.*.fetch' value + completion: remove broken dead code from __git_heads() and __git_tags() + +Samuel Bronson (1): + git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming. + +Steven Walter (1): + git-svn.perl: close the edit for propedits even with no mods + +Thomas Rast (5): + grep: load funcname patterns for -W + grep: enable threading with -p and -W using lazy attribute lookup + grep: disable threading in non-worktree case + test-terminal: set output terminals to raw mode + bash completion: use read -r everywhere + +Tilman Vogel (1): + git-gui: add config value gui.diffopts for passing additional diff options + +Vincent van Ravesteijn (4): + Compile fix for MSVC: Do not include sys/resources.h + Compile fix for MSVC: Include + MSVC: Remove unneeded header stubs + Show error for 'git merge' with unset merge.defaultToUpstream + +Yggy King (1): + gitk: Make "touching paths" search support backslashes + +Ævar Arnfjörð Bjarmason (5): + pull: introduce a pull.rebase option to enable --rebase + i18n: add infrastructure for translating Git with gettext + Fix an enum assignment issue spotted by Sun Studio + Fix a bitwise negation assignment issue spotted by Sun Studio + Appease Sun Studio by renaming "tmpfile" + + +Version v1.7.8.6; changes since v1.7.8.5: +----------------------------------------- + +Carlos Martín Nieto (1): + Documentation: use {asterisk} in rev-list-options.txt when needed + +Clemens Buchacher (1): + t5541: check error message against the real port number used + +D Waitzman (1): + Documentation/gitweb: trivial English fixes + +Jakub Narebski (1): + gitweb: Fix actionless dispatch for non-existent objects + +Johannes Sixt (1): + t0090: be prepared that 'wc -l' writes leading blanks + +Jonathan Nieder (1): + bundle: remove stray single-quote from error message + +Junio C Hamano (4): + i18n of multi-line advice messages + fetch/receive: remove over-pessimistic connectivity check + Git 1.7.7.7 + Git 1.7.8.6 + +Kirill Smelkov (1): + t/Makefile: Use $(sort ...) explicitly where needed + +Phil Hord (1): + rerere: Document 'rerere remaining' + +Shawn O. Pearce (1): + remote-curl: Fix push status report when all branches fail + +Thomas Rast (13): + Add test-scrap-cache-tree + Test the current state of the cache-tree optimization + Refactor cache_tree_update idiom from commit + commit: write cache-tree data when writing index anyway + reset: update cache-tree data when appropriate + bundle: put strbuf_readline_fd in strbuf.c with adjustments + bundle: use a strbuf to scan the log for boundary commits + strbuf: improve strbuf_get*line documentation + t5704: match tests to modern style + t5510: refactor bundle->pack conversion + t5510: ensure we stay in the toplevel test dir + bundle: keep around names passed to add_pending_object() + Document the --histogram diff option + + +Version v1.7.8.5; changes since v1.7.8.4: +----------------------------------------- + +Andrew Wong (1): + rebase -m: only call "notes copy" when rewritten exists and is non-empty + +Dmitry V. Levin (1): + Makefile: add thread-utils.h to LIB_H + +Jeff King (1): + imap-send: remove dead code + +Jim Meyering (1): + am: don't infloop for an empty input file + +Junio C Hamano (2): + Git 1.7.6.6 + Git 1.7.8.5 + +Michał Kiedrowicz (1): + grep -P: Fix matching ^ and $ + + +Version v1.7.8.4; changes since v1.7.8.3: +----------------------------------------- + +Jeff King (5): + send-email: multiedit is a boolean config option + attr: don't confuse prefixes with leading directories + attr: drop misguided defensive coding + attr: fix leak in free_attr_elem + thin-pack: try harder to use preferred base objects as base + +Junio C Hamano (11): + attr.c: make bootstrap_attr_stack() leave early + attr.c: clarify the logic to pop attr_stack + Documentation: rerere's rr-cache auto-creation and rerere.enabled + Prepare for 1.7.6.6 + Prepare for 1.7.7.6 + Prepare for 1.7.8.4 + Update draft release notes to 1.7.6.6 + Update draft release notes to 1.7.7.6 + Update draft release notes to 1.7.8.4 + Git 1.7.7.6 + Git 1.7.8.4 + +Nguyễn Thái Ngọc Duy (2): + t2203: fix wrong commit command + diff-index: enable recursive pathspec matching in unpack_trees + + +Version v1.7.8.3; changes since v1.7.8.2: +----------------------------------------- + +Brian Harring (1): + fix hang in git fetch if pointed at a 0 length bundle + +Clemens Buchacher (2): + Documentation: read-tree --prefix works with existing subtrees + t5550: repack everything into one file + +Jack Nagel (1): + Add MYMETA.json to perl/.gitignore + +Jakub Narebski (1): + gitweb: Fix fallback mode of to_utf8 subroutine + +Jens Lehmann (1): + docs: describe behavior of relative submodule URLs + +Junio C Hamano (1): + Git 1.7.8.3 + +Jürgen Kreileder (3): + gitweb: Call to_utf8() on input string in chop_and_escape_str() + gitweb: esc_html() site name for title in OPML + gitweb: Output valid utf8 in git_blame_common('data') + +Nguyễn Thái Ngọc Duy (1): + Catch invalid --depth option passed to clone or fetch + +Thomas Rast (1): + Documentation: rerere.enabled is the primary way to configure rerere + + +Version v1.7.8.2; changes since v1.7.8.1: +----------------------------------------- + +Andrew Wong (1): + rebase -i: interrupt rebase when "commit --amend" failed during "reword" + +Conrad Irwin (1): + Update documentation for stripspace + +Eric Wong (1): + enable SO_KEEPALIVE for connected TCP sockets + +Erik Faye-Lund (2): + compat/setenv.c: update errno when erroring out + compat/setenv.c: error if name contains '=' + +Jeff King (20): + read-cache: let refresh_cache_ent pass up changed flags + refresh_index: rename format variables + refresh_index: make porcelain output more specific + compat/snprintf: don't look at va_list twice + docs: mention "-k" for both forms of "git mv" + mv: honor --verbose flag + mv: make non-directory destination error more clear + mv: improve overwrite warning + mv: be quiet about overwriting + drop "match" parameter from get_remote_heads + t5500: give fully-qualified refs to fetch-pack + fetch-pack: match refs exactly + connect.c: drop path_match function + t5540: test DAV push with authentication + http-push: enable "proactive auth" + use custom rename score during --follow + docs: brush up obsolete bits of git-fsck manpage + make "git push -v" actually verbose + commit, merge: initialize static strbuf + remote-curl: don't pass back fake refs + +Jelmer Vernooij (1): + Fix an incorrect reference to --set-all. + +Johan Herland (3): + t9301: Fix testcase covering up a bug in fast-import's notes fanout handling + t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling + fast-import: Fix incorrect fanout level when modifying existing notes refs + +Johannes Sixt (1): + Compatibility: declare strtoimax() under NO_STRTOUMAX + +Jonathan Nieder (9): + branch: allow a no-op "branch -M HEAD" + Allow checkout -B to update the current branch + revert: give --continue handling its own function + revert: allow cherry-pick --continue to commit before resuming + revert: pass around rev-list args in already-parsed form + revert: allow single-pick in the middle of cherry-pick sequence + revert: do not remove state until sequence is finished + Revert "reset: Make reset remove the sequencer state" + revert: stop creating and removing sequencer-old directory + +Junio C Hamano (5): + checkout -m: no need to insist on having all 3 stages + checkout_merged(): squelch false warning from some gcc + lf_to_crlf_filter(): resurrect CRLF->CRLF hack + advice: Document that they all default to true + Git 1.7.8.2 + +Nick Alcock (2): + Add strtoimax() compatibility function. + Support sizes >=2G in various config options accepting 'g' sizes. + +Pete Harlan (1): + Test 'checkout -m -- path' + +Thomas Jarosch (1): + imap-send: Remove unused 'use_namespace' variable + +Thomas Rast (1): + git-sh-setup: make require_clean_work_tree part of the interface + +Ævar Arnfjörð Bjarmason (1): + t/t2023-checkout-m.sh: fix use of test_must_fail + + +Version v1.7.8.1; changes since v1.7.8: +--------------------------------------- + +Brandon Casey (2): + t/t4131-apply-fake-ancestor.sh: fix broken test + builtin/apply.c: report error on failure to recognize input + +Carlos Martín Nieto (2): + convert: track state in LF-to-CRLF filter + clone: the -o option has nothing to do with + +Erik Faye-Lund (1): + mingw: give waitpid the correct signature + +Jack Nagel (1): + Documentation: fix formatting error in merge-options.txt + +Jeff King (5): + http: drop "local" member from request struct + archive: don't let remote clients get unreachable commits + stripspace: fix outdated comment + fetch: create status table using strbuf + blame: don't overflow time buffer + +Jens Lehmann (1): + diff/status: print submodule path when looking for changes fails + +Junio C Hamano (9): + get_tree_entry(): do not call find_tree_entry() on an empty tree + unpack_object_header_buffer(): clear the size field upon error + receive-pack, fetch-pack: reject bogus pack that records objects twice + pack-object: tolerate broken packs that have duplicated objects + Git 1.7.6.5 + Git 1.7.7.5 + Update draft release notes for 1.7.8.1 + lf_to_crlf_filter(): tell the caller we added "\n" when draining + Git 1.7.8.1 + +Martin von Zweigbergk (1): + am: don't persist keepcr flag + +Michael Haggerty (1): + git symbolic-ref: documentation fix + +Michael Schubert (2): + builtin/commit: add missing '/' in help message + builtin/log: remove redundant initialization + +Mika Fischer (3): + http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping + http.c: Use timeout suggested by curl instead of fixed 50ms timeout + http.c: Rely on select instead of tracking whether data was received + +Nguyễn Thái Ngọc Duy (5): + tree-walk.c: do not leak internal structure in tree_entry_len() + read_directory_recursive: reduce one indentation level + tree_entry_interesting(): give meaningful names to return values + tree_entry_interesting: make use of local pointer "item" + checkout,merge: loosen overwriting untracked file check based on info/exclude + +Sebastian Morr (1): + Add MYMETA.yml to perl/.gitignore + +Thomas Rast (1): + userdiff: allow * between cpp funcname words + +Ævar Arnfjörð Bjarmason (3): + apply: get rid of useless x < 0 comparison on a size_t type + cast variable in call to free() in builtin/diff.c and submodule.c + builtin/init-db.c: eliminate -Wformat warning on Solaris + + +Version v1.7.8; changes since v1.7.8-rc4: +----------------------------------------- + +Junio C Hamano (1): + Git 1.7.8 + + +Version v1.7.8-rc4; changes since v1.7.8-rc3: +--------------------------------------------- + +Johannes Sixt (1): + Fix revert --abort on Windows + +Jonathan Nieder (11): + do not let git_path clobber errno when reporting errors + notes merge: eliminate OUTPUT macro + Makefile: add missing header file dependencies + Makefile: add option to disable automatic dependency generation + revert: rename --reset option to --quit + revert: rearrange pick_revisions() for clarity + revert: improve error message for cherry-pick during cherry-pick + revert: write REVERT_HEAD pseudoref during conflicted revert + revert: introduce --abort to cancel a failed cherry-pick + revert: remove --reset compatibility option + revert --abort: do not leave behind useless sequencer-old directory + +Junio C Hamano (5): + name-rev --all: do not even attempt to describe non-commit object + Git 1.7.7.4 + Hopefully final update of release notes before 1.7.8 final + Update 1.7.8 draft release notes in preparation for rc4 + Git 1.7.8-rc4 + +Marc-André Lureau (1): + mailmap: xcalloc mailmap_info + +Nguyễn Thái Ngọc Duy (1): + revert: do not pass non-literal string as format to git_path() + +Ramkumar Ramachandra (4): + http: remove unused function hex() + convert: don't mix enum with int + sha1_file: don't mix enum with int + git-compat-util: don't assume value for undefined variable + +Ramsay Allan Jones (3): + t5501-*.sh: Fix url passed to clone in setup test + config.c: Fix a static buffer overwrite bug by avoiding mkpath() + convert.c: Fix return type of git_path_check_eol() + +Thomas Hochstein (1): + documentation fix: git difftool uses diff tools, not merge tools. + +Vincent van Ravesteijn (2): + builtin-branch: Fix crash on invalid use of --force + builtin-reset: Documentation update + + +Version v1.7.8-rc3; changes since v1.7.8-rc2: +--------------------------------------------- + +Junio C Hamano (3): + Revert "upload-archive: use start_command instead of fork" + refs: loosen over-strict "format" check + Git 1.7.8-rc3 + +Ramkumar Ramachandra (1): + revert: prettify fatal messages + + +Version v1.7.8-rc2; changes since v1.7.8-rc1: +--------------------------------------------- + +Felipe Contreras (1): + remote: fix remote set-url usage + +Jeff King (1): + docs: don't mention --quiet or --exit-code in git-log(1) + +Junio C Hamano (5): + remote: fix set-branches usage + docs: Update install-doc-quick + Git 1.7.7.3 + Update draft release notes to 1.7.8 + Git 1.7.8-rc2 + +Liu Yuan (1): + mktree: fix a memory leak in write_tree() + +SZEDER Gábor (1): + completion: don't leak variable from the prompt into environment + + +Version v1.7.8-rc1; changes since v1.7.8-rc0: +--------------------------------------------- + +Dan McGee (4): + pack-objects: mark add_to_write_order() as inline + pack-objects: use unsigned int for counter and offset values + pack-objects: rewrite add_descendants_to_write_order() iteratively + pack-objects: don't traverse objects unnecessarily + +Erik Faye-Lund (4): + mingw: move poll out of sys-folder + compat/win32/poll.c: upgrade from upstream + upload-archive: use start_command instead of fork + mingw: poll.h is no longer in sys/ + +Johannes Sixt (1): + name-hash.c: always initialize dir_next pointer + +Junio C Hamano (5): + (squash) test for previous + Git 1.7.7.2 + Update draft release notes to 1.7.8 + receive-pack: do not expect object 0{40} to exist + Git 1.7.8-rc1 + +Nguyễn Thái Ngọc Duy (2): + pretty.c: free get_header() return value + pretty.c: use original commit message if reencoding fails + +Pat Thoyts (1): + t7511: avoid use of reserved filename on Windows. + +Pete Wyckoff (1): + git-p4: ignore apple filetype + +Sebastian Schuberth (2): + blame.c: Properly initialize strbuf after calling, textconv_object() + blame.c: Properly initialize strbuf after calling textconv_object(), again + +Stefan Naewe (2): + t3200: add test case for 'branch -m' + http: don't always prompt for password + +Tay Ray Chuan (1): + branch -m: handle no arg properly + +Ted Percival (1): + svn: Quote repository root in regex match + +Ævar Arnfjörð Bjarmason (2): + t/t6030-bisect-porcelain.sh: use test_i18ngrep + t/t7508-status.sh: use test_i18ncmp + + +Version v1.7.8-rc0; changes since v1.7.7.7: +------------------------------------------- + +Bert Wesarg (7): + grep: do not use --index in the short usage output + grep --no-index: don't use git standard exclusions + git-gui: search and linenumber input are mutual exclusive in the blame view + git-gui: only accept numbers in the goto-line input + git-gui: clear the goto line input when hiding + git-gui: incremental goto line in blame view + grep: fix the error message that mentions --exclude + +Brad King (2): + submodule: Demonstrate known breakage during recursive merge + submodule: Search for merges only at end of recursive merge + +Brandon Casey (8): + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp + git-stash.sh: fix typo in error message + t/t3905: add missing '&&' linkage + git-stash: remove untracked/ignored directories when stashed + refs.c: ensure struct whose member may be passed to realloc is initialized + refs.c: abort ref search if ref array is empty + refs.c: free duplicate entries in the ref array instead of leaking them + t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script + +Carlos Martín Nieto (1): + Documentation: update [section.subsection] to reflect what git does + +Chris Packham (1): + git-web--browse: avoid the use of eval + +Christoffer Pettersson (1): + git-gui: Corrected a typo in the Swedish translation of 'Continue' + +Clemens Buchacher (5): + remove prefix argument from pathspec_prefix + rename pathspec_prefix() to common_prefix() and move to dir.[ch] + send-email: add option -h + use -h for synopsis and --help for manpage consistently + use test number as port number + +Cord Seele (3): + Add Git::config_path() + use new Git::config_path() for aliasesfile + send-email: Fix %config_path_settings handling + +Dan McGee (2): + tree-walk: drop unused parameter from match_dir_prefix + tree-walk: micro-optimization in tree_entry_interesting + +David Aguilar (1): + Makefile: Improve compiler header dependency check + +David Fries (2): + git-gui: Enable jumping to a specific line number in blame view. + git-gui: Add keyboard shortcuts for search and goto commands in blame view. + +Dmitry Ivankov (3): + Fix typo: existant->existent + fast-import: don't allow to tag empty branch + fast-import: don't allow to note on empty branch + +Drew Northup (1): + gitweb: Add gitweb.conf(5) manpage for gitweb configuration files + +Erik Faye-Lund (2): + enter_repo: do not modify input + mingw: avoid using strbuf in syslog + +Fredrik Gustafsson (2): + rev-parse: add option --resolve-git-dir + Move git-dir for submodules + +Fredrik Kuivinen (1): + Makefile: Use computed header dependencies if the compiler supports it + +Frédéric Heitzmann (1): + git svn dcommit: new option --interactive. + +Giuseppe Bilotta (1): + am: preliminary support for hg patches + +Heiko Voigt (4): + git-gui: warn when trying to commit on a detached head + submodule: move update configuration variable further up + add update 'none' flag to disable update of submodule by default + git-gui: deal with unknown files when pressing the "Stage Changed" button + +Hui Wang (1): + sha1_file: normalize alt_odb path before comparing and storing + +Jakub Narebski (5): + gitweb: Add gitweb(1) manpage for gitweb itself + Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages + Documentation: Add gitweb config variables to git-config(1) + gitweb: Add gitweb manpages to 'gitweb' package in git.spec + Add simple test for Git::config_path() in t/t9700-perl-git.sh + +Jay Soffian (5): + Teach '--cached' option to check-attr + log --children + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so + cherry-pick: do not give irrelevant advice when cherry-pick punted + Teach merge the '[-e|--edit]' option + +Jeff King (20): + url: decode buffers that are not NUL-terminated + improve httpd auth tests + remote-curl: don't retry auth failures with dumb protocol + http: retry authentication failures for all http requests + t7004: factor out gpg setup + t6300: add more body-parsing tests + for-each-ref: refactor subject and body placeholder parsing + for-each-ref: handle multiline subjects like --pretty + t3200: clean up checks for file existence + fix phantom untracked files when core.ignorecase is set + t1300: put git invocations inside test function + t1300: test mixed-case variable retrieval + pack-objects: protect against disappearing packs + downgrade "packfile cannot be accessed" errors to warnings + daemon: give friendlier error messages to clients + http_init: accept separate URL parameter + contrib: add diff highlight script + tests: add missing executable bits + contrib: add git-jump script + completion: match ctags symbol names in grep patterns + +Jeremie Nikaes (1): + Add a remote helper to interact with mediawiki (fetch & push) + +Johannes Schindelin (5): + Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile + t1020: disable the pwd test on MinGW + t9001: do not fail only due to CR/LF issues + t9300: do not run --cat-blob-fd related tests on MinGW + git grep: be careful to use mutexes only when they are initialized + +Johannes Sixt (2): + t1402-check-ref-format: skip tests of refs beginning with slash on Windows + t1300: attempting to remove a non-existent .git/config is not an error + +Jonathan Nieder (3): + ident: check /etc/mailname if email is unknown + ident: do not retrieve default ident when unnecessary + Makefile: fix permissions of mergetools/ checked out with permissive umask + +Julian Phillips (2): + Don't sort ref_list too early + refs: Use binary search to lookup refs faster + +Junio C Hamano (47): + rev-list: fix finish_object() call + revision.c: add show_object_with_name() helper function + revision.c: update show_object_with_name() without using malloc() + list-objects: pass callback data to show_objects() + rev-list --verify-object + fetch: verify we have everything we need before updating our ref + fetch.fsckobjects: verify downloaded objects + transfer.fsckobjects: unify fetch/receive.fsckobjects + test: fetch/receive with fsckobjects + consolidate pathspec_prefix and common_prefix + fetch: verify we have everything we need before updating our ref + check_everything_connected(): refactor to use an iterator + check_everything_connected(): libify + receive-pack: check connectivity before concluding "git push" + builtin/revert.c: make commit_list_append() static + refs.c: make create_cached_refs() static + send-pack: typofix error message + rename "match_refs()" to "match_push_refs()" + Allow git merge ":/" + ls-remote: a lone "-h" is asking for help + t0003: remove extra whitespaces + parse-options: deprecate OPT_BOOLEAN + archive.c: use OPT_BOOL() + url.c: simplify is_url() + grep: teach --untracked and --exclude-standard options + Post 1.7.7 first wave + Update draft release notes to 1.7.8 + refs.c: move dwim_ref()/dwim_log() from sha1_name.c + Update draft release notes to 1.7.8 + bundle: allowing to read from an unseekable fd + bundle: add parse_bundle_header() helper function + Update draft release notes to 1.7.8 + t7800: avoid arithmetic expansion notation + Update draft release notes to 1.7.8 + resolve_gitlink_packed_ref(): fix mismerge + Update draft release notes to 1.7.8 + Makefile: ask "ls-files" to list source files if available + libperl-git: refactor Git::config_* + Update draft release notes to 1.7.8 + resolve_ref(): expose REF_ISBROKEN flag + resolve_ref(): report breakage to the caller without warning + Update draft release notes to 1.7.8 + builtin/grep: make lock/unlock into static inline functions + builtin/grep: simplify lock_and_read_sha1_file() + Update draft release notes to 1.7.8 + Update draft release notes to 1.7.8 + Git 1.7.8-rc0 + +Luke Diamand (1): + git-p4: handle files with shell metacharacters + +Lénaïc Huard (1): + gitweb: provide a way to customize html headers + +Matthieu Moy (6): + git-remote-mediawiki: allow push to set MediaWiki metadata + git-remote-mediawiki: trivial fixes + git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts + git-remote-mediawiki: obey advice.pushNonFastForward + git-remote-mediawiki: allow a domain to be set for authentication + git-remote-mediawiki: don't include HTTP login/password in author + +Michael Haggerty (36): + Extract a function clear_cached_refs() + Access reference caches only through new function get_cached_refs() + Change the signature of read_packed_refs() + Allocate cached_refs objects dynamically + Store the submodule name in struct cached_refs + Retain caches of submodule refs + get_sha1_hex(): do not read past a NUL character + t1402: add some more tests + git check-ref-format: add options --allow-onelevel and --refspec-pattern + Change bad_ref_char() to return a boolean value + Change check_ref_format() to take a flags argument + Refactor check_refname_format() + Do not allow ".lock" at the end of any refname component + Make collapse_slashes() allocate memory for its result + Inline function refname_format_print() + Change check_refname_format() to reject unnormalized refnames + resolve_ref(): explicitly fail if a symlink is not readable + resolve_ref(): use prefixcmp() + resolve_ref(): only follow a symlink that contains a valid, normalized refname + resolve_ref(): turn buffer into a proper string as soon as possible + resolve_ref(): extract a function get_packed_ref() + resolve_ref(): do not follow incorrectly-formatted symbolic refs + remote: use xstrdup() instead of strdup() + remote: avoid passing NULL to read_ref() + resolve_ref(): verify that the input refname has the right format + resolve_ref(): emit warnings for improperly-formatted references + resolve_ref(): also treat a too-long SHA1 as invalid + resolve_ref(): expand documentation + add_ref(): verify that the refname is formatted correctly + invalidate_ref_cache(): rename function from invalidate_cached_refs() + invalidate_ref_cache(): take the submodule as parameter + invalidate_ref_cache(): expose this function in the refs API + clear_ref_cache(): rename parameter + clear_ref_cache(): extract two new functions + write_ref_sha1(): only invalidate the loose ref cache + clear_ref_cache(): inline function + +Michael J Gruber (7): + t6040: test branch -vv + git-tag: introduce long forms for the options + git-branch: introduce missing long forms for the options + branch: introduce --list option + branch: allow pattern arguments + branch: -v does not automatically imply --list + http: use hostname in credential description + +Michael W. Olson (1): + git-svn: Allow certain refs to be ignored + +Michał Górny (1): + for-each-ref: add split message parts to %(contents:*). + +Nguyễn Thái Ngọc Duy (6): + sparse checkout: show error messages when worktree shaping fails + Add explanation why we do not allow to sparse checkout to empty working tree + pack-protocol: document "ERR" line + daemon: return "access denied" if a service is not allowed + daemon: log errors if we could not use some sockets + t5403: convert leading spaces to tabs + +Pang Yan Han (1): + receive-pack: don't pass non-existent refs to post-{receive,update} hooks + +Pat Thoyts (6): + git-gui: updated translator README for current procedures. + Fix tooltip display with multiple monitors on windows. + git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. + mergetools: use the correct tool for Beyond Compare 3 on Windows + mingw: ensure sockets are initialized before calling gethostname + t9901: fix line-ending dependency on windows + +Pete Wyckoff (5): + git-p4 tests: refactor and cleanup + git-p4: handle utf16 filetype properly + git-p4: recognize all p4 filetypes + git-p4: stop ignoring apple filetype + git-p4: keyword flattening fixes + +Peter Oberndorfer (1): + "rebase -i": support special-purpose editor to edit insn sheet + +Phil Hord (3): + Learn to handle gitfiles in enter_repo + Teach transport about the gitfile mechanism + Add test showing git-fetch groks gitfiles + +Ramkumar Ramachandra (18): + advice: Introduce error_resolve_conflict + config: Introduce functions to write non-standard file + revert: Simplify and inline add_message_to_msg + revert: Don't check lone argument in get_encoding + revert: Rename no_replay to record_origin + revert: Eliminate global "commit" variable + revert: Introduce struct to keep command-line options + revert: Separate cmdline parsing from functional code + revert: Don't create invalid replay_opts in parse_args + revert: Save data for continuing after conflict resolution + revert: Save command-line options for continuing operation + revert: Make pick_commits functionally act on a commit list + revert: Introduce --reset to remove sequencer state + reset: Make reset remove the sequencer state + revert: Remove sequencer state when no commits are pending + revert: Don't implicitly stomp pending sequencer operation + revert: Introduce --continue to continue the operation + revert: Propagate errors upwards from do_pick_commit + +Ramsay Allan Jones (5): + Makefile: Make dependency directory creation less noisy + sparse: Fix an "Using plain integer as NULL pointer" warning + obstack.c: Fix some sparse warnings + Fix some "variable might be used uninitialized" warnings + gitweb/Makefile: Remove static/gitweb.js in the clean target + +René Scharfe (23): + parseopt: add OPT_NOOP_NOARG + revert: use OPT_NOOP_NOARG + apply: use OPT_NOOP_NOARG + checkout: check for "Previous HEAD" notice in t2020 + revision: factor out add_pending_sha1 + checkout: use add_pending_{object,sha1} in orphan check + revision: add leak_pending flag + bisect: use leak_pending flag + bundle: use leak_pending flag + checkout: use leak_pending flag + commit: factor out clear_commit_marks_for_object_array + test-ctype: macrofy + test-ctype: add test for is_pathspec_magic + name-rev: split usage string + pickaxe: plug diff filespec leak with empty needle + pickaxe: plug regex leak + pickaxe: plug regex/kws leak + pickaxe: factor out has_changes + pickaxe: pass diff_options to contains and has_changes + pickaxe: give diff_grep the same signature as has_changes + pickaxe: factor out pickaxe + xdiff: factor out get_func_line() + diff: add option to show whole functions as context + +SZEDER Gábor (2): + completion: unite --reuse-message and --reedit-message for 'notes' + completion: unite --format and --pretty for 'log' and 'show' + +Sebastian Schuberth (2): + git-svn: On MSYS, escape and quote SVN_SSH also if set by the user + inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables + +Sitaram Chamarty (1): + git-difftool: allow skipping file by typing 'n' at prompt + +Stefan Naewe (1): + completion: fix issue with process substitution not working on Git for Windows + +Tay Ray Chuan (3): + fetch: plug two leaks on error exit in store_updated_refs + submodule: whitespace fix + submodule::module_clone(): silence die() message from module_name() + +Teemu Matilainen (3): + completion: unite --reuse-message and --reedit-message handling + completion: commit --fixup and --squash + completion: push --set-upstream + +Zbigniew Jędrzejewski-Szmek (1): + send-email: auth plain/login fix + + +Version v1.7.7.7; changes since v1.7.7.6: +----------------------------------------- + +Jeff King (1): + imap-send: remove dead code + +Jonathan Nieder (1): + bundle: remove stray single-quote from error message + +Junio C Hamano (2): + Git 1.7.6.6 + Git 1.7.7.7 + +Thomas Rast (1): + Document the --histogram diff option + + +Version v1.7.7.6; changes since v1.7.7.5: +----------------------------------------- + +Clemens Buchacher (1): + Documentation: read-tree --prefix works with existing subtrees + +Jack Nagel (1): + Add MYMETA.json to perl/.gitignore + +Jeff King (4): + attr: don't confuse prefixes with leading directories + attr: drop misguided defensive coding + attr: fix leak in free_attr_elem + thin-pack: try harder to use preferred base objects as base + +Jens Lehmann (1): + docs: describe behavior of relative submodule URLs + +Junio C Hamano (8): + attr.c: make bootstrap_attr_stack() leave early + attr.c: clarify the logic to pop attr_stack + Documentation: rerere's rr-cache auto-creation and rerere.enabled + Prepare for 1.7.6.6 + Prepare for 1.7.7.6 + Update draft release notes to 1.7.6.6 + Update draft release notes to 1.7.7.6 + Git 1.7.7.6 + +Nguyễn Thái Ngọc Duy (2): + t2203: fix wrong commit command + diff-index: enable recursive pathspec matching in unpack_trees + +Thomas Rast (1): + Documentation: rerere.enabled is the primary way to configure rerere + + +Version v1.7.7.5; changes since v1.7.7.4: +----------------------------------------- + +Erik Faye-Lund (1): + mingw: give waitpid the correct signature + +Jeff King (3): + stripspace: fix outdated comment + fetch: create status table using strbuf + blame: don't overflow time buffer + +Junio C Hamano (2): + Git 1.7.6.5 + Git 1.7.7.5 + +Martin von Zweigbergk (1): + am: don't persist keepcr flag + +Michael Haggerty (1): + git symbolic-ref: documentation fix + +Nguyễn Thái Ngọc Duy (1): + checkout,merge: loosen overwriting untracked file check based on info/exclude + +Sebastian Morr (1): + Add MYMETA.yml to perl/.gitignore + +Thomas Hochstein (1): + documentation fix: git difftool uses diff tools, not merge tools. + +Ævar Arnfjörð Bjarmason (2): + apply: get rid of useless x < 0 comparison on a size_t type + cast variable in call to free() in builtin/diff.c and submodule.c + + +Version v1.7.7.4; changes since v1.7.7.3: +----------------------------------------- + +Jonathan Nieder (2): + notes merge: eliminate OUTPUT macro + Makefile: add missing header file dependencies + +Junio C Hamano (2): + name-rev --all: do not even attempt to describe non-commit object + Git 1.7.7.4 + +Marc-André Lureau (1): + mailmap: xcalloc mailmap_info + + +Version v1.7.7.3; changes since v1.7.7.2: +----------------------------------------- + +Dan McGee (4): + pack-objects: mark add_to_write_order() as inline + pack-objects: use unsigned int for counter and offset values + pack-objects: rewrite add_descendants_to_write_order() iteratively + pack-objects: don't traverse objects unnecessarily + +Jeff King (1): + docs: don't mention --quiet or --exit-code in git-log(1) + +Julien Muchembled (1): + gitweb: fix regression when filtering out forks + +Junio C Hamano (3): + branch -m/-M: remove undocumented RENAMED-REF + docs: Update install-doc-quick + Git 1.7.7.3 + + +Version v1.7.7.2; changes since v1.7.7.1: +----------------------------------------- + +Brandon Casey (4): + attr.c: avoid inappropriate access to strbuf "buf" member + cleanup: use internal memory allocation wrapper functions everywhere + builtin/mv.c: plug miniscule memory leak + attr.c: respect core.ignorecase when matching attribute patterns + +Carlos Martín Nieto (6): + Remove 'working copy' from the documentation and C code + fetch: free all the additional refspecs + t5510: add tests for fetch --prune + remote: separate out the remote_find_tracking logic into query_refspecs + fetch: honor the user-provided refspecs when pruning refs + fetch: treat --tags like refs/tags/*:refs/tags/* when pruning + +Christian Couder (1): + bisect: fix exiting when checkout failed in bisect_start() + +Haitao Li (1): + date.c: Support iso8601 timezone formats + +Jakub Narebski (1): + gitweb: Strip non-printable characters from syntax highlighter output + +Jeff King (8): + add sha1_array API docs + quote.h: fix bogus comment + refactor argv_array into generic code + quote: provide sq_dequote_to_argv_array + bisect: use argv_array API + checkout: use argv_array API + run_hook: use argv_array API + pull,rebase: handle GIT_WORK_TREE better + +Jim Meyering (1): + make the sample pre-commit hook script reject names with newlines, too + +Jonathan Nieder (2): + http: remove extra newline in error message + http: avoid empty error messages for some curl errors + +Jonathon Mah (1): + mergetool: Use args as pathspec to unmerged files + +Junio C Hamano (5): + refactor run_receive_hook() + diff: teach --stat/--numstat to honor -U$num + mergetool: no longer need to save standard input + attr: read core.attributesfile from git_default_core_config + Git 1.7.7.2 + +Martin von Zweigbergk (4): + remote: write correct fetch spec when renaming remote 'remote' + remote: "rename o foo" should not rename ref "origin/bar" + remote rename: warn when refspec was not updated + remote: only update remote-tracking branch if updating refspec + +Matthew Daley (1): + send-email: Honour SMTP domain when using TLS + +Michael Haggerty (1): + notes_merge_commit(): do not pass temporary buffer to other function + +Michael J Gruber (3): + unpack-trees: print "Aborting" to stderr + git-read-tree.txt: language and typography fixes + git-read-tree.txt: correct sparse-checkout and skip-worktree description + +Nguyễn Thái Ngọc Duy (2): + git-read-tree.txt: update sparse checkout examples + Reindent closing bracket using tab instead of spaces + +Pat Thoyts (1): + t7511: avoid use of reserved filename on Windows. + +Peter Stuge (1): + gitweb: Fix links to lines in blobs when javascript-actions are enabled + +Ramsay Allan Jones (1): + t9159-*.sh: skip for mergeinfo test for svn <= 1.4 + +René Scharfe (1): + read-cache.c: fix index memory allocation + +Richard Hartmann (1): + clone: Quote user supplied path in a single quote pair + +Shawn O. Pearce (1): + remote-curl: Fix warning after HTTP failure + +Stefan Naewe (1): + Documentation/git-update-index: refer to 'ls-files' + +Thomas Rast (1): + Documentation: basic configuration of notes.rewriteRef + + +Version v1.7.7.1; changes since v1.7.7: +--------------------------------------- + +Brad King (1): + rev-list: Demonstrate breakage with --ancestry-path --all + +Brandon Casey (1): + strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() + +Ilari Liusvaara (1): + Support ERR in remote archive like in fetch/push + +Jay Soffian (1): + merge-one-file: fix "expr: non-numeric argument" + +Jeff King (2): + fetch: avoid quadratic loop checking for updated submodules + filter-branch: use require_clean_work_tree + +Jim Meyering (1): + fix "git apply --index ..." not to deref NULL + +Jonathan Nieder (2): + Makefile: do not set setgid bit on directories on GNU/kFreeBSD + RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting + +Junio C Hamano (14): + revision: keep track of the end-user input from the command line + revision: do not include sibling history in --ancestry-path output + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree + traverse_trees(): allow pruning with pathspec + unpack-trees: allow pruning with pathspec + diff-index: pass pathspec down to unpack-trees machinery + fsck: do not abort upon finding an empty blob + Teach progress eye-candy to fetch_refs_from_bundle() + apply --whitespace=error: correctly report new blank lines at end + checkout $tree $path: do not clobber local changes in $path not in $tree + diff: resurrect XDF_NEED_MINIMAL with --minimal + Prepare for 1.7.7.1 + Almost ready for 1.7.7.1 + Git 1.7.7.1 + +Matthieu Moy (2): + rebase -i: clean error message for --continue after failed exec + config: display key_delim for config --bool --get-regexp + +Michael Schubert (1): + patch-id.c: use strbuf instead of a fixed buffer + +Nguyễn Thái Ngọc Duy (4): + merge: keep stash[] a local variable + merge: use return value of resolve_ref() to determine if HEAD is invalid + merge: remove global variable head[] + Accept tags in HEAD or MERGE_HEAD + +Nicolas Morey-Chaisemartin (1): + grep: Fix race condition in delta_base_cache + +René Scharfe (2): + Revert removal of multi-match discard heuristic in 27af01 + t1304: fall back to $USER if $LOGNAME is not defined + +Thomas Rast (2): + Symlink mergetools scriptlets into valgrind wrappers + t6019: avoid refname collision on case-insensitive systems + + +Version v1.7.7; changes since v1.7.7-rc3: +----------------------------------------- + +Gerrit Pape (2): + contrib/hooks: adapt comment about Debian install location for contrib hooks + templates/hooks--*: remove sample hooks without any functionality + +Junio C Hamano (2): + Documentation/gitnamespaces.txt: cater to older asciidoc + Git 1.7.7 + + +Version v1.7.7-rc3; changes since v1.7.7-rc2: +--------------------------------------------- + +Allan Caffee (1): + describe: Refresh the index when run with --dirty + +Jay Soffian (1): + git-mergetool: check return value from read + +Jeff King (1): + t4014: clean up format.thread config after each test + +Junio C Hamano (3): + Git 1.7.6.4 + merge-recursive: Do not look at working tree during a virtual ancestor merge + Git 1.7.7-rc3 + + +Version v1.7.7-rc2; changes since v1.7.7-rc1: +--------------------------------------------- + +Bryan Jacobs (1): + git-svn: teach git-svn to populate svn:mergeinfo + +Frédéric Heitzmann (1): + Disambiguate duplicate t9160* tests + +Junio C Hamano (2): + branch --set-upstream: regression fix + Git 1.7.7-rc2 + +Pang Yan Han (1): + format-patch: ignore ui.color + + +Version v1.7.7-rc1; changes since v1.7.7-rc0: +--------------------------------------------- + +Ben Walton (2): + Documentation: Grammar correction, wording fixes and cleanup + Mark http-fetch without -a as deprecated + +Brandon Casey (1): + t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh + +Brian Gernhardt (1): + t5540-http-test: shorten grep pattern + +Bryan Jacobs (1): + git-svn: Teach dcommit --mergeinfo to handle multiple lines + +Conrad Irwin (2): + Prevent force-updating of the current branch + Show interpreted branch name in error messages + +Dmitry Ivankov (11): + fast-import: add input format tests + fast-import: don't fail on omitted committer name + fast-import: check committer name more strictly + fsck: add a few committer name tests + fsck: improve committer/author check + fast-import: add a test for tree delta base corruption + fast-import: prevent producing bad delta + fast-import: count and report # of calls to diff_delta in stats + fast-import: treat cat-blob as a delta base hint for next blob + fast-import: add tests for tagging blobs + fast-import: allow to tag newly created objects + +Elijah Newren (55): + t6042: Add a testcase where git deletes an untracked file + t6042: Add failing testcase for rename/modify/add-source conflict + t6042: Add a pair of cases where undetected renames cause issues + t6042: Add a testcase where undetected rename causes silent file deletion + t6042: Add tests for content issues with modify/rename/directory conflicts + t6042: Ensure rename/rename conflicts leave index and workdir in sane state + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts + t6036: Add differently resolved modify/delete conflict in criss-cross test + t6036: criss-cross with weird content can fool git into clean merge + t6036: tests for criss-cross merges with various directory/file conflicts + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify + t6022: Remove unnecessary untracked files to make test cleaner + t6022: New tests checking for unnecessary updates of files + t6022: Add testcase for merging a renamed file with a simple change + merge-recursive: Make BUG message more legible by adding a newline + merge-recursive: Correct a comment + merge-recursive: Mark some diff_filespec struct arguments const + merge-recursive: Consolidate different update_stages functions + merge-recursive: Remember to free generated unique path names + merge-recursive: Avoid working directory changes during recursive case + merge-recursive: Fix recursive case with D/F conflict via add/add conflict + merge-recursive: Fix sorting order and directory change assumptions + merge-recursive: Fix code checking for D/F conflicts still being present + merge-recursive: Save D/F conflict filenames instead of unlinking them + merge-recursive: Split was_tracked() out of would_lose_untracked() + merge-recursive: Allow make_room_for_path() to remove D/F entries + merge-recursive: Split update_stages_and_entry; only update stages at end + merge-recursive: Fix deletion of untracked file in rename/delete conflicts + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead + merge-recursive: Add comments about handling rename/add-source cases + merge-recursive: Improve handling of rename target vs. directory addition + merge-recursive: Consolidate process_entry() and process_df_entry() + merge-recursive: Cleanup and consolidation of rename_conflict_info + merge-recursive: Provide more info in conflict markers with file renames + merge-recursive: When we detect we can skip an update, actually skip it + merge-recursive: Fix modify/delete resolution in the recursive case + merge-recursive: Introduce a merge_file convenience function + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base + merge-recursive: Small cleanups for conflict_rename_rename_1to2 + merge-recursive: Defer rename/rename(2to1) handling until process_entry + merge-recursive: Record more data needed for merging with dual renames + merge-recursive: Create function for merging with branchname:file markers + merge-recursive: Consider modifications in rename/rename(2to1) conflicts + merge-recursive: Make modify/delete handling code reusable + merge-recursive: Have conflict_rename_delete reuse modify/delete code + merge-recursive: add handling for rename/rename/add-dest/add-dest + merge-recursive: Fix working copy handling for rename/rename/add/add + t6022: Add testcase for spurious "refusing to lose untracked" messages + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages + t6022: Additional tests checking for unnecessary updates of files + merge-recursive: Avoid unnecessary file rewrites + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest + merge-recursive: Don't re-sort a list whose order we depend upon + +Eric Wong (1): + git-svn: fix fetch with moved path when using rewriteRoot + +Fredrik Gustafsson (1): + push: Don't push a repository with unpushed submodules + +Fredrik Kuivinen (6): + Add obstack.[ch] from EGLIBC 2.10 + Add string search routines from GNU grep + Adapt the kwset code to Git + Use kwset in pickaxe + Use kwset in grep + obstack: Fix portability issues + +Giuseppe Bilotta (2): + am: format is in $patch_format, not parse_patch + am: fix stgit patch mangling + +Jeff King (12): + t3030: fix accidental success in symlink rename + t7006: modernize calls to unset + test-lib: add helper functions for config + t7006: use test_config helpers + setup_pager: set GIT_PAGER_IN_USE + diff: refactor COLOR_DIFF from a flag into an int + git_config_colorbool: refactor stdout_is_tty handling + color: delay auto-color decision until point of use + config: refactor get_colorbool function + diff: don't load color config in plumbing + want_color: automatically fallback to color.ui + support pager.* for external commands + +Jens Lehmann (1): + fetch: skip on-demand checking when no submodules are configured + +Johannes Sixt (2): + string-list: Add API to remove an item from an unsorted list + t3005: do not assume a particular order of stdout and stderr of git-ls-files + +Jon Seymour (1): + bisect: take advantage of gettextln, eval_gettextln. + +Jonathan Nieder (1): + Documentation/remote-helpers: explain capabilities first + +Junio C Hamano (14): + combine-diff: support format_callback + read_gitfile_gently(): rename misnamed function to read_gitfile() + clone: allow more than one --reference + clone: clone from a repository with relative alternates + Update draft release notes to 1.7.7 + Documentation: clarify "git clean -e " + Update draft release notes to 1.7.7 + Revert "Merge branch 'cb/maint-quiet-push' into maint" + Git 1.7.6.2 + Update draft release notes to 1.7.7 + Minor update to how-to maintain git + Prepare for 1.7.6.3 maintenance release + Git 1.7.6.3 + Git 1.7.7-rc1 + +Matthieu Moy (2): + Documentation/git-remote-helpers: explain how import works with multiple refs + (short) documentation for the testgit remote helper + +Michael Haggerty (9): + Add a file comment + Document struct match_attr + Increment num_attr in parse_attr_line(), not parse_attr() + Change parse_attr() to take a pointer to struct attr_state + Determine the start of the states outside of the pass loop + Change while loop into for loop + Unroll the loop over passes + check-ref-format --print: Normalize refnames that start with slashes + Forbid DEL characters in reference names + +Michael J Gruber (3): + git-notes.txt: clarify -C vs. copy and -F + log: Do not decorate replacements with --no-replace-objects + RelNotes/1.7.7: minor fixes + +Michael Stapelberg (1): + git-daemon.txt: specify --timeout in seconds + +Namhyung Kim (1): + branch -v: honor core.abbrev + +Nguyễn Thái Ngọc Duy (6): + decoration: do not mis-decorate refs with same prefix + Add for_each_commit_graft() to iterate all grafts + Move write_shallow_commits to fetch-pack.c + log: decorate grafted commits with "grafted" + log: decorate "replaced" on to replaced commits + clone: allow to clone from .git file + +Pete Wyckoff (1): + git-p4: simple branch tests edits + +Ray Chen (1): + git-svn: New flag to emulate empty directories + +Sverre Rabbelier (1): + SubmittingPathces: remove Cogito reference + +Tay Ray Chuan (2): + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() + +Thomas Rast (8): + Use memmove in ident_to_git + t4014: check for empty files from git format-patch --stdout + t4014: invoke format-patch with --stdout where intended + t4014: "no-add-headers" is actually called "no-add-header" + Document negated forms of format-patch --to --cc --add-headers + strbuf_grow(): maintain nul-termination even for new buffer + Documentation: clarify effects of -- arguments + t3903: fix misquoted rev-parse invocation + +Vitor Antunes (9): + git-p4: Allow setting rename/copy detection threshold + git-p4: Add description of rename/copy detection options + git-p4: Add test case for rename detection + git-p4: Add test case for copy detection + git-p4: Process detectCopiesHarder with --bool + git-p4: Correct branch base depot path detection + git-p4: Allow filtering Perforce branches by user + git-p4: Allow branch definition with git config + git-p4: Add simple test case for branch import + + +Version v1.7.7-rc0; changes since v1.7.6.5: +------------------------------------------- + +Allan Caffee (1): + describe: Refresh the index when run with --dirty + +Andi Kleen (2): + Add profile feedback build to git + Add explanation of the profile feedback build to the README + +Clemens Buchacher (1): + commit: allow partial commits with relative paths + +David Aguilar (8): + setup: Provide GIT_PREFIX to built-ins + git: Remove handling for GIT_PREFIX + git-mergetool--lib: Make vimdiff retain the current directory + t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests + difftool--helper: Make style consistent with git + mergetool--lib: Make style consistent with git + mergetool--lib: Refactor tools into separate files + mergetools/meld: Use '--output' when available + +David Barr (1): + am: ignore leading whitespace before patch + +David Caldwell (1): + stash: Add --include-untracked option to stash and remove all untracked files + +Dmitry Ivankov (4): + remote-helpers: export GIT_DIR variable to helpers + parse-options: export opterr, optbug + Reduce parse-options.o dependencies + doc/fast-import: document feature import-marks-if-exists + +Duncan Brown (1): + http: pass http.cookiefile using CURLOPT_COOKIEFILE + +Erik Faye-Lund (2): + verify_path: consider dos drive prefix + connect: only log if all attempts failed (ipv4) + +Fredrik Gustafsson (2): + git-sh-setup: add die_with_status + submodule update: continue when a checkout fails + +Jakub Narebski (14): + gitweb.js: No need for inProgress in blame_incremental.js + gitweb.js: No need for loop in blame_incremental's handleResponse() + gitweb.js: use setTimeout rather than setInterval in blame_incremental.js + gitweb: Check permissions first in git_search + gitweb: Split body of git_search into subroutines + gitweb: Clean up code in git_search_* subroutines + gitweb: Make git_search_* subroutines render whole pages + gitweb: Refactor git_header_html + git-instaweb: Extract configuring web server into configure_httpd + git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf + git-instaweb: Move all actions at the end of script + git-instaweb: Check that correct config file exists for (re)start + gitweb: Introduce common system-wide settings for convenience + gitweb: Git config keys are case insensitive, make config search too + +Jeff King (28): + t: add tests for cloning remotes with detached HEAD + consider only branches in guess_remote_head + make copy_ref globally available + clone: always fetch remote HEAD + limit "contains" traversals based on commit timestamp + default core.clockskew variable to one day + archive: reorder option parsing and config reading + archive-tar: don't reload default config options + archive: refactor list of archive formats + archive: pass archiver struct to write_archive callback + archive: move file extension format-guessing lower + archive: refactor file extension format-guessing + archive: implement configurable tar filters + archive: provide builtin .tar.gz filter + upload-archive: allow user to turn off filters + parse-options: add OPT_STRING_LIST helper + remote: use new OPT_STRING_LIST + config: make git_config_parse_parameter a public function + clone: accept config options on the command line + git skew: a tool to find how big a clock skew exists in the history + transport-helper: fix minor leak in push_refs_with_export + t5800: factor out some ref tests + t5800: document some non-functional parts of remote helpers + git-remote-testgit: import non-HEAD refs + transport-helper: don't feed bogus refs to export push + git_remote_helpers: push all refs during a non-local export + streaming: free git_istream upon closing + docs: put listed example commands in backticks + +Jens Lehmann (1): + Documentation/submodule: add command references and update options + +Jim Meyering (1): + sha1_file: use the correct type (ssize_t, not size_t) for read-style function + +Johannes Sixt (7): + sh-i18n--envsubst: do not crash when no arguments are given + mingw.c: move definition of mingw_getenv down + Windows: teach getenv to do a case-sensitive search + rebase: do not print lots of usage hints after an obvious error message + Make test number unique + Skip archive --remote tests on Windows + t3900: do not reference numbered arguments from the test script + +Jon Jensen (1): + Add option hooks.diffopts to customize change summary in post-receive-email + +Jon Seymour (16): + bisect: move argument parsing before state modification. + bisect: use && to connect statements that are deferred with eval. + bisect: add tests to document expected behaviour in presence of broken trees. + bisect: introduce support for --no-checkout option. + bisect: introduce --no-checkout support into porcelain. + bisect: add tests for the --no-checkout option. + bisect: add documentation for --no-checkout option. + bisect: cleanup whitespace errors in git-bisect.sh. + bisect: replace "; then" with "\n*then" + misc-sh: fix up whitespace in some other .sh files. + gettext: add gettextln, eval_gettextln to encode common idiom + git-am: take advantage of gettextln and eval_gettextln. + pull: take advantage of eval_gettextln + stash: take advantage of eval_gettextln + submodule: take advantage of gettextln and eval_gettextln. + bisect: add support for bisecting bare repositories + +Jonathan Nieder (4): + test: simplify return value of test_run_ + test: cope better with use of return for errors + revert: plug memory leak in "cherry-pick root commit" codepath + merge-recursive: take advantage of hardcoded empty tree + +Josh Triplett (5): + Fix prefix handling in ref iteration functions + ref namespaces: infrastructure + ref namespaces: Support remote repositories via upload-pack and receive-pack + ref namespaces: documentation + ref namespaces: tests + +Junio C Hamano (52): + index-pack: group the delta-base array entries also by type + write_idx_file: introduce a struct to hold idx customization options + index-pack: --verify + write_idx_file: need_large_offset() helper function + index-pack --verify: read anomalous offsets from v2 idx file + packed_object_info_detail(): do not return a string + sha1_object_info_extended(): expose a bit more info + sha1_object_info_extended(): hint about objects in delta-base cache + unpack_object_header(): make it public + write_entry(): separate two helper functions out + streaming: a new API to read from the object store + streaming_write_entry(): use streaming API in write_entry() + convert: CRLF_INPUT is a no-op in the output codepath + streaming_write_entry(): support files with holes + streaming: read non-delta incrementally from a pack + sha1_file.c: expose helpers to read loose objects + streaming: read loose objects incrementally + checkout: make advice when reattaching the HEAD less loud + merge: reword the final message + convert.h: move declarations for conversion from cache.h + Add streaming filter API + stream filter: add "no more input" to the filters + Add LF-to-CRLF streaming conversion + streaming filter: ident filter + streaming: filter cascading + t0021: test application of both crlf and ident + diff --stat-count: finishing touches + index-pack: a miniscule refactor + index-pack: start learning to emulate "verify-pack -v" + index-pack: show histogram when emulating "verify-pack -v" + verify-pack: use index-pack --verify + verify_path(): simplify check at the directory boundary + git-submodule.sh: clarify the "should we die now" logic + Add option to disable NORETURN + Start 1.7.7 cycle + core: log offset pack data accesses happened + pack-objects: optimize "recency order" + diff-lib: simplify do_diff_cache() + diff-lib: refactor run_diff_index() and do_diff_cache() + Revert clock-skew based attempt to optimize tag --contains traversal + Update draft release notes to 1.7.7 + Update draft release notes to 1.7.7 + bisect: further style nitpicks + filter-branch.sh: de-dent usage string + Update draft release notes to 1.7.7 + test: consolidate definition of $LF + Sync with "maint" + Update draft release notes to 1.7.7 + Update draft release notes to 1.7.7 + commit: reduce use of redundant global variables + Update draft release notes to 1.7.7 + Git 1.7.7-rc0 + +Ludwig Nussel (1): + gitweb: allow space as delimiter in mime.types + +Markus Duft (1): + Update the Interix default build configuration. + +Michael Haggerty (29): + doc: Add a link from gitattributes(5) to git-check-attr(1) + doc: Correct git_attr() calls in example code + Remove anachronism from comment + Disallow the empty string as an attribute name + git-check-attr: Add missing "&&" + git-check-attr: Add tests of command-line parsing + Provide access to the name attribute of git_attr + git-check-attr: Use git_attr_name() + Teach prepare_attr_stack() to figure out dirlen itself + Extract a function collect_all_attrs() + Remove redundant call to bootstrap_attr_stack() + Remove redundant check + Allow querying all attributes on a file + git-check-attr: Extract a function output_attr() + git-check-attr: Introduce a new variable + git-check-attr: Extract a function error_with_usage() + git-check-attr: Handle each error separately + git-check-attr: Process command-line args more systematically + git-check-attr: Error out if no pathnames are specified + git-check-attr: Add an --all option to show all attributes + git-check-attr: Drive two tests using the same raw data + git-check-attr: Fix command-line handling to match docs + Rename git_checkattr() to git_check_attr() + git-check-attr: test that no output is written to stderr + git-check-attr: Demonstrate problems with unnormalized paths + git-check-attr: Demonstrate problems with relative paths + git-check-attr: Normalize paths + test-path-utils: Add subcommand "absolute_path" + test-path-utils: Add subcommand "prefix_path" + +Michael J Gruber (3): + diff.c: omit hidden entries from namelen calculation with --stat + diff: introduce --stat-lines to limit the stat lines + diff-options.txt: describe --stat-{width,name-width,count} + +Pete Wyckoff (4): + git-p4: use test_when_finished in tests + git-p4: add missing && in test + git-p4: one test missing config git-p4.skipSubmitEditCheck + git-p4: commit time should be most recent p4 change time + +Ramsay Allan Jones (3): + help.c: Fix detection of custom merge strategy on cygwin + t1301-*.sh: Fix the 'forced modes' test on cygwin + config.c: Make git_config() work correctly when called recursively + +René Scharfe (6): + t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test + grep: fix coloring of hunk marks between files + grep: add --break + grep: add --heading + grep: add option to show whole function as context + grep: long context options + +Roberto Tyley (1): + Tolerate zlib deflation with window size < 32Kb + +Sverre Rabbelier (14): + t5800: use skip_all instead of prereq + remote-curl: accept empty line as terminator + git-remote-testgit: only push for non-local repositories + git-remote-testgit: fix error handling + fast-import: introduce 'done' command + fast-export: support done feature + transport-helper: factor out push_update_refs_status + transport-helper: check status code of finish_command + transport-helper: use the new done feature where possible + transport-helper: update ref status after push with export + transport-helper: change import semantics + transport-helper: Use capname for refspec capability too + transport-helper: implement marks location as capability + transport-helper: die early on encountering deleted refs + +Tay Ray Chuan (13): + xdiff/xprepare: use memset() + xdiff/xprepare: refactor abort cleanups + xdiff/xpatience: factor out fall-back-diff function + t4033-diff-patience: factor out tests + teach --histogram to diff + xdiff/xprepare: skip classification + xdiff/xprepare: use a smaller sample size for histogram diff + xdiff: do away with xdl_mmfile_next() + http.c: fix an invalid free() + Makefile: some changes for http-related flag documentation + xdiff/xhistogram: rework handling of recursed results + xdiff/xhistogram: rely on xdl_trim_ends() + xdiff/xhistogram: drop need for additional variable + +Theo Niessink (3): + A Windows path starting with a backslash is absolute + real_path: do not assume '/' is the path seperator + verify_dotfile(): do not assume '/' is the path seperator + +Thomas Cort (1): + Makefile: add Minix configuration options. + +maximilian attems (2): + am: pass exclude down to apply + am: Document new --exclude= option + +Ævar Arnfjörð Bjarmason (48): + i18n: git-am add git-sh-i18n + i18n: git-am one-line gettext $msg; echo + i18n: git-am multi-line getttext $msg; echo + i18n: git-am eval_gettext messages + i18n: git-am gettext + gettext to stderr message + i18n: git-am die messages + i18n: git-am cannot_fallback messages + i18n: git-am clean_abort messages + i18n: git-am "Apply?" message + i18n: git-am "Falling back" say message + i18n: git-am core say messages + i18n: git-am printf(1) message to eval_gettext + i18n: git-pull add git-sh-i18n + i18n: git-pull die messages + i18n: git-pull eval_gettext + die message + i18n: git-pull eval_gettext + warning message + i18n: git-submodule add git-sh-i18n + i18n: git-submodule echo + eval_gettext messages + i18n: git-submodule say + eval_gettext messages + i18n: git-submodule die + eval_gettext messages + i18n: git-submodule $update_module say + die messages + i18n: git-submodule "cached cannot be used" message + i18n: git-submodule "Submodule change[...]" messages + i18n: git-submodule $errmsg messages + i18n: git-submodule "Entering [...]" message + i18n: git-submodule "[...] path is ignored" message + i18n: git-submodule "path not initialized" message + i18n: git-submodule "blob" and "submodule" messages + i18n: git-stash add git-sh-i18n + i18n: git-stash echo + gettext message + i18n: git-stash say + gettext messages + i18n: git-stash die + gettext messages + i18n: git-stash die + eval_gettext messages + i18n: git-stash die + eval_gettext $* messages + i18n: git-stash die + eval_gettext $1 messages + i18n: git-stash "unknown option" message + i18n: git-stash drop_stash say/die messages + i18n: git-bisect add git-sh-i18n + i18n: git-bisect gettext + echo message + i18n: git-bisect echo + gettext messages + i18n: git-bisect echo + eval_gettext message + i18n: git-bisect die + gettext messages + i18n: git-bisect die + eval_gettext messages + i18n: git-bisect bisect_run + $@ messages + i18n: git-bisect bisect_reset + $1 messages + i18n: git-bisect bisect_replay + $1 messages + i18n: git-bisect [Y/n] messages + i18n: git-bisect bisect_next_check "You need to" message + +张忠山 (1): + gitweb: pass string after encoding in utf-8 to syntax highlighter + + +Version v1.7.6.5; changes since v1.7.6.4: +----------------------------------------- + +Haitao Li (1): + date.c: Support iso8601 timezone formats + +Jeff King (3): + stripspace: fix outdated comment + fetch: create status table using strbuf + blame: don't overflow time buffer + +Jim Meyering (1): + make the sample pre-commit hook script reject names with newlines, too + +Jonathon Mah (1): + mergetool: Use args as pathspec to unmerged files + +Junio C Hamano (3): + mergetool: no longer need to save standard input + name-rev --all: do not even attempt to describe non-commit object + Git 1.7.6.5 + +Marc-André Lureau (1): + mailmap: xcalloc mailmap_info + +Martin von Zweigbergk (4): + remote: write correct fetch spec when renaming remote 'remote' + remote: "rename o foo" should not rename ref "origin/bar" + remote rename: warn when refspec was not updated + remote: only update remote-tracking branch if updating refspec + +Michael Haggerty (1): + notes_merge_commit(): do not pass temporary buffer to other function + +Michael J Gruber (3): + unpack-trees: print "Aborting" to stderr + git-read-tree.txt: language and typography fixes + git-read-tree.txt: correct sparse-checkout and skip-worktree description + +Nguyễn Thái Ngọc Duy (2): + git-read-tree.txt: update sparse checkout examples + Reindent closing bracket using tab instead of spaces + +Peter Stuge (1): + gitweb: Fix links to lines in blobs when javascript-actions are enabled + +Ramsay Allan Jones (1): + t9159-*.sh: skip for mergeinfo test for svn <= 1.4 + +Sebastian Morr (1): + Add MYMETA.yml to perl/.gitignore + +Stefan Naewe (1): + Documentation/git-update-index: refer to 'ls-files' + +Thomas Rast (1): + Documentation: basic configuration of notes.rewriteRef + + +Version v1.7.6.4; changes since v1.7.6.3: +----------------------------------------- + +Allan Caffee (1): + describe: Refresh the index when run with --dirty + +Clemens Buchacher (1): + ls-files: fix pathspec display on error + +Giuseppe Bilotta (1): + am: format is in $patch_format, not parse_patch + +Jay Soffian (1): + git-mergetool: check return value from read + +Johannes Sixt (1): + t3005: do not assume a particular order of stdout and stderr of git-ls-files + +Junio C Hamano (4): + read_gitfile_gently(): rename misnamed function to read_gitfile() + clone: allow more than one --reference + clone: clone from a repository with relative alternates + Git 1.7.6.4 + +Michael Haggerty (2): + check-ref-format --print: Normalize refnames that start with slashes + Forbid DEL characters in reference names + +Michael J Gruber (1): + branch.c: use the parsed branch name + +Nguyễn Thái Ngọc Duy (1): + clone: allow to clone from .git file + + +Version v1.7.6.3; changes since v1.7.6.2: +----------------------------------------- + +Dave Zarzycki (1): + Do not log unless all connect() attempts fail + +Jeff King (9): + status: fix bug with missing --ignore files + tag: speed up --contains calculation + strbuf_split: add a max parameter + fix "git -c" parsing of values with equals signs + config: die on error in command-line config + config: avoid segfault when parsing command-line config + strbuf: allow strbuf_split to work on non-strbufs + config: use strbuf_split_str instead of a temporary strbuf + reset: give better reflog messages + +Jens Lehmann (1): + fetch: skip on-demand checking when no submodules are configured + +Jonathan Nieder (2): + Documentation: quote double-dash for AsciiDoc + Documentation/i18n: quote double-dash for AsciiDoc + +Junio C Hamano (4): + git status --ignored: tests and docs + mergetool: check return value from read + Prepare for 1.7.6.3 maintenance release + Git 1.7.6.3 + +Michael Schubert (1): + reflog: actually default to subcommand 'show' + +Sverre Rabbelier (1): + SubmittingPathces: remove Cogito reference + +Vitaliy Ivanov (1): + tests: cleanup binary test vector files + + +Version v1.7.6.2; changes since v1.7.6.1: +----------------------------------------- + +Junio C Hamano (3): + whitespace: have SP on both sides of an assignment "=" + Revert "Merge branch 'cb/maint-quiet-push' into maint" + Git 1.7.6.2 + +Pang Yan Han (1): + update-ref: whitespace fix + +Thomas Rast (1): + Documentation: clarify effects of -- arguments + + +Version v1.7.6.1; changes since v1.7.6: +--------------------------------------- + +Alex Neronskiy (2): + Fix documentation of fetch-pack that implies that the client can disconnect after sending wants. + Document the underlying protocol used by shallow repositories and --depth commands. + +Andrew Wong (1): + rebase -i -p: include non-first-parent commits in todo list + +Bert Wesarg (1): + Documentation: clearly specify what refs are honored by core.logAllRefUpdates + +Brandon Casey (2): + t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin + git-submodule.sh: preserve stdin for the command spawned by foreach + +Brian Harring (1): + get_indexed_object can return NULL if nothing is in that slot; check for it + +Carlos Martín Nieto (1): + Documentation: clarify the invalidated tree entry format + +Clemens Buchacher (3): + error_routine: use parent's stderr if exec fails + propagate --quiet to send-pack/receive-pack + notice error exit from pager + +Dmitry Ivankov (1): + doc/fast-import: clarify notemodify command + +Emilio G. Cota (2): + Documentation: ignore *.pdf files + Documentation/Makefile: add *.pdf to `clean' target + +Erik Faye-Lund (1): + connect: correctly number ipv6 network adapter + +Fredrik Kuivinen (1): + Makefile: Track changes to LDFLAGS and relink when necessary + +Heiko Voigt (2): + add gitignore entry to description about how to write a builtin + add technical documentation about ref iteration + +Jack Nagel (1): + Documentation: minor grammatical fix in rev-list-options.txt + +Jakub Narebski (2): + gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss + gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss + +Jeff King (10): + combine-diff: split header printing into its own function + combine-diff: calculate mode_differs earlier + combine-diff: handle binary files as binary + refactor get_textconv to not require diff_filespec + combine-diff: respect textconv attributes + tag: accept multiple patterns for --list + docs: document --textconv diff option + t7400: fix bogus test failure with symlinked trash + fast-export: quote paths in output + am: refresh the index at start and --resolved + +Jens Lehmann (7): + submodule add: test failure when url is not configured in superproject + submodule add: allow relative repository path even when no url is set + submodule add: clean up duplicated code + fetch: Also fetch submodules in subdirectories in on-demand mode + submodule add: always initialize .git/config entry + tests: print failed test numbers at the end of the test run + submodule: update and add must honor --quiet flag + +Johannes Schindelin (1): + get_pwd_cwd(): Do not trust st_dev/st_ino blindly + +Jon Seymour (2): + Add a test to check that git ls-tree sets non-zero exit code on error. + Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. + +Julian Phillips (1): + remote-curl: Add a format check to parsing of info/refs + +Junio C Hamano (29): + diff-index --quiet: learn the "stop feeding the backend early" logic + checkout -b : correctly detect existing branch + sha1_file.c: "legacy" is really the current format + zlib wrapper: refactor error message formatter + zlib: wrap remaining calls to direct inflate/inflateEnd + zlib: wrap inflateInit2 used to accept only for gzip format + zlib: wrap deflate side of the API + zlib: wrap deflateBound() too + zlib: zlib can only process 4GB at a time + zlib: allow feeding more than 4GB in one go + t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met + cygwin: trust executable bit by default + git-remote.txt: avoid sounding as if loose refs are the only ones in the world + check-ref-format doc: de-emphasize the implementation detail of a ref + git.txt: de-emphasize the implementation detail of a ref + glossary: update description of "tag" + glossary: update description of head and ref + glossary: clarify description of HEAD + submodule sync: do not auto-vivify uninteresting submodule + "branch -d" can remove more than one branches + test: skip clean-up when running under --immediate mode + checkout: do not write bogus reflog entry out + reset [] paths...: do not mishandle unmerged paths + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" + receive-pack: do not overstep command line argument array + helping smart-http/stateless-rpc fetch race + Prepare for 1.7.6.1 + Update draft release notes for 1.7.6.1 + Git 1.7.6.1 + +Martin von Zweigbergk (2): + Documentation: use [verse] for SYNOPSIS sections + rebase: clarify "restore the original branch" + +Michael Haggerty (6): + git-svn: Demonstrate a bug with root commits in mergeinfo ranges + git-svn: Disambiguate rev-list arguments to improve error message + git-svn: Correctly handle root commits in mergeinfo ranges + gitattributes: Clarify discussion of attribute macros + gitattributes: Reword "attribute macro" to "macro attribute" + Do not use C++-style comments + +Michael Schubert (1): + help_unknown_cmd: do not propose an "unknown" cmd + +Michael Witten (1): + filter-branch: Export variable `workdir' for --commit-filter + +Namhyung Kim (1): + git-remote.txt: fix wrong remote refspec + +Nguyễn Thái Ngọc Duy (3): + Break down no-lstat() condition checks in verify_uptodate() + checkout-index: remove obsolete comment + fetch-pack: check for valid commit from server + +Ori Avtalion (1): + pull: remove extra space from reflog message + +Pavan Kumar Sunkara (1): + git-config: Remove extra whitespaces + +Peter Collingbourne (1): + Documentation: git-filter-branch honors replacement refs + + +Version v1.7.6; changes since v1.7.6-rc3: +----------------------------------------- + +Junio C Hamano (1): + Git 1.7.6 + +Namhyung Kim (1): + completion: replace core.abbrevguard to core.abbrev + + +Version v1.7.6-rc3; changes since v1.7.6-rc2: +--------------------------------------------- + +Andreas Schwab (1): + builtin/gc.c: add missing newline in message + +Brandon Casey (1): + sh-i18n--envsubst.c: do not #include getopt.h + +Christof Krüger (1): + Documentation: git diff --check respects core.whitespace + +Dmitry Ivankov (1): + Fix typo: existant->existent + +Jakub Narebski (1): + gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled + +Jeff King (2): + t/Makefile: pass test opts to valgrind target properly + tests: link shell libraries into valgrind directory + +Jim Meyering (1): + plug a few coverity-spotted leaks + +Junio C Hamano (2): + t7810: avoid unportable use of "echo" + Git 1.7.6-rc3 + + +Version v1.7.6-rc2; changes since v1.7.6-rc1: +--------------------------------------------- + +Jonathan Nieder (1): + gitweb: do not misparse nonnumeric content tag files that contain a digit + +Junio C Hamano (1): + Git 1.7.6-rc2 + + +Version v1.7.6-rc1; changes since v1.7.6-rc0: +--------------------------------------------- + +Alex Riesen (1): + t3703: skip more tests using colons in file names on Windows + +Brandon Casey (2): + t7508: demonstrate status's failure to use --porcelain format with -z + builtin/commit.c: set status_format _after_ option parsing + +Jakub Narebski (4): + gitweb: Move information about installation from README to INSTALL + gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL + gitweb: Move "Requirements" up in gitweb/INSTALL + gitweb: Fix usability of $prevent_xss + +Jeff King (1): + diff_tree: disable QUICK optimization with diff filter + +Jim Meyering (1): + fetch: do not leak a refspec + +Junio C Hamano (2): + diff: futureproof "stop feeding the backend early" logic + Git 1.7.6-rc1 + + +Version v1.7.6-rc0; changes since v1.7.5.4: +------------------------------------------- + +Boris Faure (1): + Do not strip empty lines / trailing spaces from a commit message template + +Carlos Martín Nieto (1): + log: convert to parse-options + +Conrad Irwin (5): + Use a temporary index for git commit --interactive + Allow git commit --interactive with paths + Add support for -p/--patch to git-commit + Add commit to list of config.singlekey commands + Test atomic git-commit --interactive + +Csaba Henk (1): + rebase: create HEAD reflog entry when aborting + +Dan McGee (4): + Share color list between graph and show-branch + http: make curl callbacks match contracts from curl header + http-push: use const for strings in signatures + http-push: refactor curl_easy_setup madness + +Elijah Newren (3): + t6022: New test checking for unnecessary updates of renamed+modified files + t6022: New test checking for unnecessary updates of files in D/F conflicts + merge-recursive: When we detect we can skip an update, actually skip it + +Erik Faye-Lund (2): + strbuf: make sure buffer is zero-terminated + config: support values longer than 1023 bytes + +Heiko Voigt (1): + test that git status works with merge conflict in, .gitmodules + +Ingo Molnar (1): + hashcmp(): inline memcmp() by hand to optimize + +Jakub Narebski (13): + gitweb: Restructure projects list generation + gitweb: Change the way "content tags" ('ctags') are handled + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo) + gitweb: Split JavaScript for maintability, combining on build + gitweb.js: Update and improve comments in JavaScript files + gitweb.js: Provide default values for padding in padLeftStr and padLeft + gitweb.js: Extract and improve datetime handling + gitweb.js: Introduce code to handle cookies from JavaScript + gitweb.js: Provide getElementsByClassName method (if it not exists) + gitweb: Refactor generating of long dates into format_timestamp_html + gitweb: Unify the way long timestamp is displayed + gitweb: Make JavaScript ability to adjust timezones configurable + gitweb: Refactor reading and parsing config file into read_config_file + +Jay Soffian (2): + "git log -h": typofix misspelled 'suppress' + Add log.abbrevCommit config variable + +Jeff King (26): + notes: make expand_notes_ref globally accessible + revision.c: refactor notes ref expansion + notes: refactor display notes extra refs field + notes: refactor display notes default handling + revision.c: support --notes command-line option + revision.c: make --no-notes reset --notes list + format-patch: wrap email addresses after long names + add tests for various blame formats + blame: refactor porcelain output + blame: add --line-porcelain output format + t7501.8: feed a meaningful command + fetch: avoid repeated commits in mark_complete + Makefile: sort TEST_PROGRAMS list + refactor refs_from_alternate_cb to allow passing extra data + bisect: refactor sha1_array into a generic sha1 list + receive-pack: eliminate duplicate .have refs + doc: discuss textconv versus external diff drivers + remote: allow "-t" with fetch mirrors + read_in_full: always report errors + t: test subject handling in format-patch / am pipeline + mailinfo: always clean up rfc822 header folding + pretty: add pp_commit_easy function for simple callers + clean up calling conventions for pretty.c functions + format-patch: preserve subject newlines with -k + rebase: write a reflog entry when finishing + format-patch: make zero-length subject prefixes prettier + +Jens Lehmann (3): + Submodules: Don't parse .gitmodules when it contains, merge conflicts + unpack-trees: add the dry_run flag to unpack_trees_options + Teach read-tree the -n|--dry-run option + +Jim Meyering (2): + diffcore-rename.c: avoid set-but-not-used warning + plug a DIR buffer leak in rerere.c + +Johan Herland (10): + log/pretty-options: Document --[no-]notes and deprecate old notes options + Make "git notes add" more user-friendly when there are existing notes + Add several testcases for --dirstat and friends + Make --dirstat=0 output directories that contribute < 0.1% of changes + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file + Add config variable for specifying default --dirstat behavior + Allow specifying --dirstat cut-off percentage as a floating point number + New --dirstat=lines mode, doing dirstat analysis based on diffstat + Improve error handling when parsing dirstat parameters + Mark dirstat error messages for translation + +Johannes Sixt (3): + t3703: Skip tests using directory name ":" on Windows + Tweak t3102-ls-tree-wildcards to run on Windows + Windows: add a wrapper for the shutdown() system call + +John 'Warthog9' Hawley (2): + gitweb: JavaScript ability to adjust time based on timezone + gitweb.js: Add UI for selecting common timezone to display dates + +Jon Seymour (1): + git: add --info-path and --man-path options + +Jonathan Nieder (15): + revisions: split out handle_revision_pseudo_opt function + revisions: allow --glob and friends in parse_options-enabled commands + Documentation: clarify meaning of --html-path, --man-path, and --info-path + tests: eliminate unnecessary setup test assertions + tests: teach verify_parents to check for extra parents + tests: check git does not barf on merge.ff values for future versions of git + completion: move private shopt shim for zsh to __git_ namespace + t4018 (funcname patterns): make .gitattributes state easier to track + t4018 (funcname patterns): make configuration easier to track + t4018 (funcname patterns): minor cleanups + userdiff/perl: anchor "sub" and "package" patterns on the left + userdiff/perl: match full line of POD headers + userdiff/perl: catch sub with brace on second line + tests: make test_expect_code quieter on success + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters + +Junio C Hamano (53): + merge-recursive: tweak magic band-aid + git diff -D: omit the preimage of deletes + pathspec: rename per-item field has_wildcard to use_wildcard + magic pathspec: add tentative ":/path/from/top/level" pathspec support + merge: allow "-" as a short-hand for "previous branch" + magic pathspec: futureproof shorthand form + magic pathspec: add ":(icase)path" to match case insensitively + Start 1.7.6 cycle + Update draft release notes to 1.7.6 + Update draft release notes to 1.7.6 + Update draft release notes to 1.7.6 + Update draft release notes to 1.7.6 + merge: introduce merge.ff configuration variable + rerere: libify rerere_clear() and rerere_gc() + index_fd(): turn write_object and format_check arguments into one flag + index_fd(): split into two helper functions + convert: rename the "eol" global variable to "core_eol" + convert: give saner names to crlf/eol variables, types and functions + convert: make it safer to add conversion attributes + convert: make it harder to screw up adding a conversion attribute + git-grep: do not die upon -F/-P when grep.extendedRegexp is set. + Revert "magic pathspec: add ":(icase)path" to match case insensitively" + pathspec: drop "lone : means no pathspec" from get_pathspec() + grep: use get_pathspec() correctly + fix overstrict : diagnosis + fix overslow :/no-such-string-ever-existed diagnostics + rev/path disambiguation: further restrict "misspelled index entry" diag + Revert "completion: don't declare 'local words' to make zsh happy" + Update draft release notes to 1.7.6 + revision.c: leave a note for "a lone :" enhancement + Update draft release notes to 1.7.6 + Bigfile: teach "git add" to send a large file straight to a pack + Declare lookup_replace_object() in cache.h, not in commit.h + t6050: make sure we test not just commit replacement + read_sha1_file(): get rid of read_sha1_file_repl() madness + inline lookup_replace_object() calls + read_sha1_file(): allow selective bypassing of replacement mechanism + Sync release notes for 1.7.6 to exclude what are in maintenance track + git-grep: update tests now regexp type is "last one wins" + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS + Update release notes to 1.7.6 + notes remove: allow removing more than one + notes remove: --ignore-missing + notes remove: --stdin reads from the standard input + show: --ignore-missing + Revert "Merge branch 'en/merge-recursive'" + Update draft release notes to 1.7.6 + Update 1.7.6 draft release notes + require-work-tree wants more than what its name says + compat/fnmatch/fnmatch.c: give a fall-back definition for NULL + Update 1.7.6 draft release notes + log: --quiet should serve as synonym to -s + Update draft release notes to 1.7.6 + +Luke Diamand (3): + git-p4: add option to preserve user names + git-p4: small improvements to user-preservation + git-p4: warn if git authorship won't be retained + +Marius Storm-Olsen (1): + Automatically autoload bashcompinit for ZSH, when needed + +Martin von Zweigbergk (34): + rebase: clearer names for directory variables + rebase: refactor reading of state + rebase: read state outside loop + rebase: remove unused rebase state 'prev_head' + rebase: improve detection of rebase in progress + rebase: act on command line outside parsing loop + rebase: stricter check of standalone sub command + rebase: align variable names + rebase: align variable content + rebase: factor out command line option processing + rebase -i: remove now unnecessary directory checks + rebase: reorder validation steps + rebase: factor out reference parsing + rebase: factor out clean work tree check + rebase: factor out call to pre-rebase hook + rebase -i: support --stat + rebase: remove $branch as synonym for $orig_head + rebase: extract merge code to new source file + rebase: extract am code to new source file + rebase: show consistent conflict resolution hint + rebase -i: align variable names + rebase: make -v a tiny bit more verbose + rebase: factor out sub command handling + rebase: extract code for writing basic state + rebase: remember verbose option + rebase: remember strategy and strategy options + rebase -m: remember allow_rerere_autoupdate option + rebase -m: don't print exit code 2 when merge fails + git-rebase--am: remove unnecessary --3way option + rebase -i: don't read unused variable preserve_merges + rebase -i: remove unnecessary state rebase-root + rebase: use @{upstream} if no upstream specified + Makefile: do not install sourced rebase scripts + rebase: define options in OPTIONS_SPEC + +Mathias Lafeldt (1): + t/test-lib.sh: minor readability improvements + +Michael Haggerty (1): + git-svn: add an option to skip the creation of empty directories + +Michael J Gruber (7): + contrib/completion: --notes, --no-notes + rev-list --count: separate count for --cherry-mark + t1020: test !alias in subdirectory + handle_alias: provide GIT_PREFIX to !alias + config: define and document exit codes + config: Give error message when not changing a multivar + sh-18n: quell "unused variable" warning + +Michael Schubert (2): + tag: disallow '-' as tag name + ls-remote: the --exit-code option reports "no matching refs" + +Michał Kiedrowicz (11): + Documentation: Add --line-number to git-grep synopsis + contrib/completion: --line-number to git grep + grep: Put calls to fixmatch() and regmatch() into patmatch() + grep: Fix a typo in a comment + grep: Extract compile_regexp_failed() from compile_regexp() + git-grep: Learn PCRE + configure: Check for libpcre + grep: Add basic tests + git-grep: Bail out when -P is used with -F or -E + git-grep: Update tests (mainly for -P) + git-grep: Fix problems with recently added tests + +Namhyung Kim (1): + blame: add --abbrev command line option and make it honor core.abbrev + +Nguyễn Thái Ngọc Duy (8): + Reimplement read_tree_recursive() using tree_entry_interesting() + Convert read_tree{,_recursive} to support struct pathspec + Improve tree_entry_interesting() handling code + setup: return correct prefix if worktree is '/' + Kill off get_relative_cwd() + t1011: fix sparse-checkout initialization and add new file + sparse checkout: do not eagerly decide the fate for whole directory + t3703, t4208: add test cases for magic pathspec + +Nicolas Morey-Chaisemartin (1): + submodule: Add --force option for git submodule update + +Rafael Gieschke (1): + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd + +Ramsay Allan Jones (9): + Makefile: Use cgcc rather than sparse in the check target + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning + sparse: Fix some "Using plain integer as NULL pointer" warnings + sparse: Fix an "symbol 'format_subject' not declared" warning + sparse: Fix an "symbol 'merge_file' not decared" warning + sparse: Fix errors due to missing target-specific variables + sparse: Fix some "symbol not declared" warnings + setup.c: Fix some "symbol not declared" sparse warnings + config.c: Remove unused git_config_global() function + +René Scharfe (1): + strbuf: clarify assertion in strbuf_setlen() + +SZEDER Gábor (3): + completion: don't modify the $cur variable in completion functions + completion: remove unnecessary _get_comp_words_by_ref() invocations + completion: don't declare 'local words' to make zsh happy + +Sebastien Cevey (3): + gitweb: Split git_project_list_body in two functions + gitweb: Modularized git_get_project_description to be more generic + gitweb: Optional grouping of projects by category + +Tay Ray Chuan (1): + t5541-http-push: add test for chunked + +Ævar Arnfjörð Bjarmason (5): + git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() + git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers + git-sh-i18n.sh: add GIT_GETTEXT_POISON support + Makefile: add xgettext target for *.sh files + git-sh-i18n--envsubst: add SYNOPSIS section to the documentation + + +Version v1.7.5.4; changes since v1.7.5.3: +----------------------------------------- + +Brandon Casey (2): + Documentation/technical/api-diff.txt: correct name of diff_unmerge() + git-submodule.sh: separate parens by a space to avoid confusing some shells + +Jeff King (8): + config: make environment parsing routines static + git_config: don't peek at global config_parameters + config: always parse GIT_CONFIG_PARAMETERS during git_config + read_gitfile_gently: use ssize_t to hold read result + docs: minor grammar fixes to git-status + docs: update status --porcelain format + docs: make sure literal "->" isn't converted to arrow + docs: fix some antique example output + +Jim Meyering (3): + rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' + remove tests of always-false condition + diffcore-rename.c: avoid set-but-not-used warning + +Jonathan Nieder (3): + tests: check error message from run_command + run-command: handle short writes and EINTR in die_child + Documentation: do not misinterpret refspecs as bold text + +Junio C Hamano (26): + builtin/diff.c: remove duplicated call to diff_result_code() + diffcore-rename: refactor "too many candidates" logic + diffcore-rename: record filepair for rename src + diffcore-rename: fall back to -C when -C -C busts the rename limit + i18n: do not overuse C_LOCALE_OUTPUT + i18n: .git file is not a human readable message (t5601) + i18n: use test_i18ncmp in t1200 and t2200 + i18n: do not overuse C_LOCALE_OUTPUT (grep) + i18n: use test_i18ngrep in lib-httpd and t2019 + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 + i18n: use test_i18ngrep in t7201 + i18n: use test_i18ncmp in t7500 + i18n: use test_i18ngrep in t7501 + i18n: use test_i18ngrep and test_i18ncmp in t7502 + i18n: use test_i18ngrep in t7506 + i18n: use test_i18n{grep,cmp} in t7508 + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 + handle_options(): do not miscount how many arguments were used + userformat_find_requirements(): find requirement for the correct format + config.mak.in: allow "configure --sysconfdir=/else/where" + Start 1.7.5.4 draft release notes + Git 1.7.5.4 + +Mathias Lafeldt (1): + t/README: unify documentation of test function args + +Ramkumar Ramachandra (4): + Documentation: Add filter..* to config + Documentation: Move diff..* from config.txt to diff-config.txt + Documentation: Add diff..* to config + Documentation: Allow custom diff tools to be specified in 'diff.tool' + +Thomas Rast (1): + add -i: ignore terminal escape sequences + +Valentin Haenel (5): + config.txt: 'interactive.singlekey; is used by... + git-add.txt: document 'interactive.singlekey' + git-stash.txt: better docs for '--patch' + git-checkout.txt: better docs for '--patch' + git-reset.txt: better docs for '--patch' + +Ævar Arnfjörð Bjarmason (7): + i18n: mark merge "Could not read from" message for translation + i18n: mark merge "upstream" messages for translation + i18n: mark merge CHERRY_PICK_HEAD messages for translation + i18n: mark clone nonexistent repository message for translation + i18n: mark checkout --detach messages for translation + i18n: mark checkout plural warning for translation + i18n: mark init-db messages for translation + + +Version v1.7.5.3; changes since v1.7.5.2: +----------------------------------------- + +Felipe Contreras (1): + git-completion: fix regression in zsh support + +Fraser Tweedale (1): + gitweb: supply '-n' to gzip for identical output + +Jeff King (8): + send-pack: unbreak push over stateless rpc + cherry-pick: handle root commits with external strategies + revert: allow reverting a root commit + t3503: test cherry picking and reverting root commits + connect: treat generic proxy processes like ssh processes + connect: let callers know if connection is a socket + send-pack: avoid deadlock on git:// push with failed pack-objects + test core.gitproxy configuration + +Jim Meyering (1): + do not read beyond end of malloc'd buffer + +Johannes Sixt (3): + Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird + send-pack: avoid deadlock when pack-object dies early + Honor $(prefix) set in config.mak* when defining ETC_GIT* + +Jonathan Nieder (5): + Revert "t0081 (line-buffer): add buffering tests" + Documentation: explain how to check for patch corruption + Documentation: hints for sending patches inline with Thunderbird + Documentation: publicize KMail hints for sending patches inline + Documentation: publicize hints for sending patches with GMail + +Junio C Hamano (4): + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" + setup_revisions(): take pathspec from command line and --stdin correctly + sideband_demux(): fix decl-after-stmt + Git 1.7.5.3 + +Kacper Kornet (1): + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir + +Michael J Gruber (2): + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff + git-svn: Fix git svn log --show-commit + +Nguyễn Thái Ngọc Duy (1): + init/clone: remove short option -L and document --separate-git-dir + +Rafael Gieschke (1): + copy_gecos: fix not adding nlen to len when processing "&" + +Stefan Sperling (1): + remove noise and inaccuracies from git-svn docs + + +Version v1.7.5.2; changes since v1.7.5.1: +----------------------------------------- + +Andrew Wong (1): + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff + +Brian Gernhardt (1): + t/annotate-tests: Use echo & cat instead of sed + +Carlos Martín Nieto (2): + format-patch: don't pass on the --quiet flag + format-patch: document --quiet option + +Ciaran Jessup (1): + Pass empty file to p4merge where no base is suitable. + +Dima Sharov (1): + shell: add missing initialization of argv0_path + +Guy Rouillier (1): + Look for password in both CVS and CVSNT password files. + +Jakub Narebski (2): + git-instaweb: Simplify build dependency on gitweb + Remove gitweb/gitweb.cgi and other legacy targets from main Makefile + +Jeff King (3): + pretty: quote rfc822 specials in email addresses + add tests for merge-index / merge-one-file + merge-one-file: fix broken merges with alternate work trees + +Jim Meyering (1): + Documentation/git-fsck.txt: fix typo: unreadable -> unreachable + +Johan Herland (1): + t5400: Fix a couple of typos + +Jonathan Nieder (4): + Restructure documentation for git-merge-base. + Documentation: describe the format of messages with inline patches + add, merge, diff: do not use strcasecmp to compare config variable names + provide a copy of the LGPLv2.1 + +Jonathon Mah (1): + mergetool: Teach about submodules + +Josh Stone (1): + blame: tolerate bogus e-mail addresses a bit better + +João Britto (1): + Remove duplicated "is a" + +Junio C Hamano (19): + test: use $_z40 from test-lib + diff.c: return filepair from diff_unmerge() + diff: remove often unused parameters from diff_unmerge() + diff-files: show unmerged entries correctly + Fix "add -u" that sometimes fails to resolve unmerged paths + add -p: 'q' should really quit + t3701: Editing a split hunk in an "add -p" session + add--interactive.perl: factor out repeated --recount option + "add -p": work-around an old laziness that does not coalesce hunks + t3701: fix here document + merge: make branch..mergeoptions correctly override merge.