From d627de6b13138257dac3fcb4d7778d8afdcab974 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 15 Apr 2007 03:01:29 -0700 Subject: [PATCH 1/3] git-svn: respect lower bound of -r/--revision when following parent When an explicit --revision argument is specified, do not fetch past the specified range into the beginning of history. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-svn.perl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index ac44f60b8..7ebd07b79 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1682,7 +1682,10 @@ sub find_parent_branch { } my ($r0, $parent) = $gs->find_rev_before($r, 1); if (!defined $r0 || !defined $parent) { - $gs->fetch(0, $r); + my ($base, $head) = parse_revision_argument(0, $r); + if ($base <= $r) { + $gs->fetch($base, $r); + } ($r0, $parent) = $gs->last_rev_commit; } if (defined $r0 && defined $parent) { From c284914a7c6646ddf999d3df7924b10f06ac6979 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 17 Apr 2007 02:41:43 -0700 Subject: [PATCH 2/3] git-svn: quiet some warnings when run only with --version/--help These are harmless but annoying. They were introduced in 512b620bd9fef7f170562ecad835e37479f051ce Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-svn.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 7ebd07b79..4d3c453bf 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -168,14 +168,14 @@ BEGIN my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd); read_repo_config(\%opts); -Getopt::Long::Configure('pass_through') if $cmd eq 'log'; +Getopt::Long::Configure('pass_through') if ($cmd && $cmd eq 'log'); my $rv = GetOptions(%opts, 'help|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 ne 'log'); +exit 1 if (!$rv && $cmd && $cmd ne 'log'); usage(0) if $_help; version() if $_version; From ab6029415b7e8acbc1beff7363c74bb94c3f0d9d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 17 Apr 2007 17:32:23 -0700 Subject: [PATCH 3/3] Start preparing for 1.5.1.2 --- Documentation/RelNotes-1.5.1.2.txt | 37 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.5.1.2.txt diff --git a/Documentation/RelNotes-1.5.1.2.txt b/Documentation/RelNotes-1.5.1.2.txt new file mode 100644 index 000000000..f58268f6b --- /dev/null +++ b/Documentation/RelNotes-1.5.1.2.txt @@ -0,0 +1,37 @@ +GIT v1.5.1.2 Release Notes (draft) +========================== + +Fixes since v1.5.1.1 +-------------------- + +* Bugfixes + + - "git diff a/ b/" incorrectly fell in "diff between two + filesystem objects" codepath, when the user most likely + wanted to limit the extent of output to two tracked + directories. + + - git-quiltimport had the same bug as we fixed for + git-applymbox in v1.5.1.1 -- it gave an alarming "did not + have any patch" message (but did not actually fail and was + harmless). + + - various git-svn fixes. + + - Sample update hook incorrectly always refused requests to + delete branches through push. + + - git-blame on a very long working tree path had buffer + overrun problem. + +* Documentation updates + + - Various documentation updates from J. Bruce Fields, Frank + Lichtenheld, Alex Riesen and others. Andrew Ruder started a + war on undocumented options. + +--- +exec >/var/tmp/1 +O=v1.5.1.1-31-g0220f1e +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/RelNotes b/RelNotes index 59e7391e0..09f5a7413 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.1.1.txt \ No newline at end of file +Documentation/RelNotes-1.5.1.2.txt \ No newline at end of file