Browse Source
There's a number of tricky conflicts between master and this topic right now due to the rewrite of builtin-push. Junio must have handled these via rerere; I'd rather not deal with them again so I'm pre-merging master into the topic. Besides this topic somehow started to depend on the strbuf series that was in next, but is now in master. It no longer compiles on its own without the strbuf API. * master: (184 commits) Whip post 1.5.3.4 maintenance series into shape. Minor usage update in setgitperms.perl manual: use 'URL' instead of 'url'. manual: add some markup. manual: Fix example finding commits referencing given content. Fix wording in push definition. Fix some typos, punctuation, missing words, minor markup. manual: Fix or remove em dashes. Add a --dry-run option to git-push. Add a --dry-run option to git-send-pack. Fix in-place editing functions in convert.c instaweb: support for Ruby's WEBrick server instaweb: allow for use of auto-generated scripts Add 'git-p4 commit' as an alias for 'git-p4 submit' hg-to-git speedup through selectable repack intervals git-svn: respect Subversion's [auth] section configuration values gtksourceview2 support for gitview fix contrib/hooks/post-receive-email hooks.recipients error message Support cvs via git-shell rebase -i: use diff plumbing instead of porcelain ... Conflicts: Makefile builtin-push.c rsh.cmaint
Shawn O. Pearce
18 years ago
164 changed files with 4642 additions and 2998 deletions
@ -0,0 +1,31 @@
@@ -0,0 +1,31 @@
|
||||
GIT v1.5.3.3 Release Notes |
||||
========================== |
||||
|
||||
Fixes since v1.5.3.2 |
||||
-------------------- |
||||
|
||||
* git-quiltimport did not like it when a patch described in the |
||||
series file does not exist. |
||||
|
||||
* p4 importer missed executable bit in some cases. |
||||
|
||||
* The default shell on some FreeBSD did not execute the |
||||
argument parsing code correctly and made git unusable. |
||||
|
||||
* git-svn incorrectly spawned pager even when the user user |
||||
explicitly asked not to. |
||||
|
||||
* sample post-receive hook overquoted the envelope sender |
||||
value. |
||||
|
||||
* git-am got confused when the patch contained a change that is |
||||
only about type and not contents. |
||||
|
||||
* git-mergetool did not show our and their version of the |
||||
conflicted file when started from a subdirectory of the |
||||
project. |
||||
|
||||
* git-mergetool did not pass correct options when invoking diff3. |
||||
|
||||
* git-log sometimes invoked underlying "diff" machinery |
||||
unnecessarily. |
||||
@ -0,0 +1,35 @@
@@ -0,0 +1,35 @@
|
||||
GIT v1.5.3.4 Release Notes |
||||
========================== |
||||
|
||||
Fixes since v1.5.3.3 |
||||
-------------------- |
||||
|
||||
* Change to "git-ls-files" in v1.5.3.3 that was introduced to support |
||||
partial commit of removal better had a segfaulting bug, which was |
||||
diagnosed and fixed by Keith and Carl. |
||||
|
||||
* Performance improvements for rename detection has been backported |
||||
from the 'master' branch. |
||||
|
||||
* "git-for-each-ref --format='%(numparent)'" was not working |
||||
correctly at all, and --format='%(parent)' was not working for |
||||
merge commits. |
||||
|
||||
* Sample "post-receive-hook" incorrectly sent out push |
||||
notification e-mails marked as "From: " the committer of the |
||||
commit that happened to be at the tip of the branch that was |
||||
pushed, not from the person who pushed. |
||||
|
||||
* "git-remote" did not exit non-zero status upon error. |
||||
|
||||
* "git-add -i" did not respond very well to EOF from tty nor |
||||
bogus input. |
||||
|
||||
* "git-rebase -i" squash subcommand incorrectly made the |
||||
author of later commit the author of resulting commit, |
||||
instead of taking from the first one in the squashed series. |
||||
|
||||
* "git-stash apply --index" was not documented. |
||||
|
||||
* autoconfiguration learned that "ar" command is found as "gas" on |
||||
some systems. |
||||
@ -0,0 +1,25 @@
@@ -0,0 +1,25 @@
|
||||
GIT v1.5.3.5 Release Notes |
||||
========================== |
||||
|
||||
Fixes since v1.5.3.4 |
||||
-------------------- |
||||
|
||||
* "git-config" silently ignored options after --list; now it wilh |
||||
error out with a usage message. |
||||
|
||||
* "git-config --file" failed if the argument used a relative path |
||||
as it changed directories before opening the file. |
||||
|
||||
* "git-add -i" did not handle single line hunks correctly. |
||||
|
||||
* "git-log --follow" did not work unless diff generation (e.g. -p) |
||||
was also requested. |
||||
|
||||
* "git-log" printed extra newlines between commits when a diff |
||||
was generated internally (e.g. -S or --follow) but not displayed. |
||||
|
||||
* Documention updates for supported (but previously undocumented) |
||||
options of "git-archive" and "git-reflog". |
||||
|
||||
* "make clean" no longer deletes the configure script that ships |
||||
with the git tarball, making multiple architecture builds easier. |
||||
@ -0,0 +1,214 @@
@@ -0,0 +1,214 @@
|
||||
#!/usr/bin/perl |
||||
# |
||||
# Copyright (c) 2006 Josh England |
||||
# |
||||
# This script can be used to save/restore full permissions and ownership data |
||||
# within a git working tree. |
||||
# |
||||
# To save permissions/ownership data, place this script in your .git/hooks |
||||
# directory and enable a `pre-commit` hook with the following lines: |
||||
# #!/bin/sh |
||||
# SUBDIRECTORY_OK=1 . git-sh-setup |
||||
# $GIT_DIR/hooks/setgitperms.perl -r |
||||
# |
||||
# To restore permissions/ownership data, place this script in your .git/hooks |
||||
# directory and enable a `post-merge` and `post-checkout` hook with the |
||||
# following lines: |
||||
# #!/bin/sh |
||||
# SUBDIRECTORY_OK=1 . git-sh-setup |
||||
# $GIT_DIR/hooks/setgitperms.perl -w |
||||
# |
||||
use strict; |
||||
use Getopt::Long; |
||||
use File::Find; |
||||
use File::Basename; |
||||
|
||||
my $usage = |
||||
"Usage: setgitperms.perl [OPTION]... <--read|--write> |
||||
This program uses a file `.gitmeta` to store/restore permissions and uid/gid |
||||
info for all files/dirs tracked by git in the repository. |
||||
|
||||
---------------------------------Read Mode------------------------------------- |
||||
-r, --read Reads perms/etc from working dir into a .gitmeta file |
||||
-s, --stdout Output to stdout instead of .gitmeta |
||||
-d, --diff Show unified diff of perms file (XOR with --stdout) |
||||
|
||||
---------------------------------Write Mode------------------------------------ |
||||
-w, --write Modify perms/etc in working dir to match the .gitmeta file |
||||
-v, --verbose Be verbose |
||||
|
||||
\n"; |
||||
|
||||
my ($stdout, $showdiff, $verbose, $read_mode, $write_mode); |
||||
|
||||
if ((@ARGV < 0) || !GetOptions( |
||||
"stdout", \$stdout, |
||||
"diff", \$showdiff, |
||||
"read", \$read_mode, |
||||
"write", \$write_mode, |
||||
"verbose", \$verbose, |
||||
)) { die $usage; } |
||||
die $usage unless ($read_mode xor $write_mode); |
||||
|
||||
my $topdir = `git-rev-parse --show-cdup` or die "\n"; chomp $topdir; |
||||
my $gitdir = $topdir . '.git'; |
||||
my $gitmeta = $topdir . '.gitmeta'; |
||||
|
||||
if ($write_mode) { |
||||
# Update the working dir permissions/ownership based on data from .gitmeta |
||||
open (IN, "<$gitmeta") or die "Could not open $gitmeta for reading: $!\n"; |
||||
while (defined ($_ = <IN>)) { |
||||
chomp; |
||||
if (/^(.*) mode=(\S+)\s+uid=(\d+)\s+gid=(\d+)/) { |
||||
# Compare recorded perms to actual perms in the working dir |
||||
my ($path, $mode, $uid, $gid) = ($1, $2, $3, $4); |
||||
my $fullpath = $topdir . $path; |
||||
my (undef,undef,$wmode,undef,$wuid,$wgid) = lstat($fullpath); |
||||
$wmode = sprintf "%04o", $wmode & 07777; |
||||
if ($mode ne $wmode) { |
||||
$verbose && print "Updating permissions on $path: old=$wmode, new=$mode\n"; |
||||
chmod oct($mode), $fullpath; |
||||
} |
||||
if ($uid != $wuid || $gid != $wgid) { |
||||
if ($verbose) { |
||||
# Print out user/group names instead of uid/gid |
||||
my $pwname = getpwuid($uid); |
||||
my $grpname = getgrgid($gid); |
||||
my $wpwname = getpwuid($wuid); |
||||
my $wgrpname = getgrgid($wgid); |
||||
$pwname = $uid if !defined $pwname; |
||||
$grpname = $gid if !defined $grpname; |
||||
$wpwname = $wuid if !defined $wpwname; |
||||
$wgrpname = $wgid if !defined $wgrpname; |
||||
|
||||
print "Updating uid/gid on $path: old=$wpwname/$wgrpname, new=$pwname/$grpname\n"; |
||||
} |
||||
chown $uid, $gid, $fullpath; |
||||
} |
||||
} |
||||
else { |
||||
warn "Invalid input format in $gitmeta:\n\t$_\n"; |
||||
} |
||||
} |
||||
close IN; |
||||
} |
||||
elsif ($read_mode) { |
||||
# Handle merge conflicts in the .gitperms file |
||||
if (-e "$gitdir/MERGE_MSG") { |
||||
if (`grep ====== $gitmeta`) { |
||||
# Conflict not resolved -- abort the commit |
||||
print "PERMISSIONS/OWNERSHIP CONFLICT\n"; |
||||
print " Resolve the conflict in the $gitmeta file and then run\n"; |
||||
print " `.git/hooks/setgitperms.perl --write` to reconcile.\n"; |
||||
exit 1; |
||||
} |
||||
elsif (`grep $gitmeta $gitdir/MERGE_MSG`) { |
||||
# A conflict in .gitmeta has been manually resolved. Verify that |
||||
# the working dir perms matches the current .gitmeta perms for |
||||
# each file/dir that conflicted. |
||||
# This is here because a `setgitperms.perl --write` was not |
||||
# performed due to a merge conflict, so permissions/ownership |
||||
# may not be consistent with the manually merged .gitmeta file. |
||||
my @conflict_diff = `git show \$(cat $gitdir/MERGE_HEAD)`; |
||||
my @conflict_files; |
||||
my $metadiff = 0; |
||||
|
||||
# Build a list of files that conflicted from the .gitmeta diff |
||||
foreach my $line (@conflict_diff) { |
||||
if ($line =~ m|^diff --git a/$gitmeta b/$gitmeta|) { |
||||
$metadiff = 1; |
||||
} |
||||
elsif ($line =~ /^diff --git/) { |
||||
$metadiff = 0; |
||||
} |
||||
elsif ($metadiff && $line =~ /^\+(.*) mode=/) { |
||||
push @conflict_files, $1; |
||||
} |
||||
} |
||||
|
||||
# Verify that each conflict file now has permissions consistent |
||||
# with the .gitmeta file |
||||
foreach my $file (@conflict_files) { |
||||
my $absfile = $topdir . $file; |
||||
my $gm_entry = `grep "^$file mode=" $gitmeta`; |
||||
if ($gm_entry =~ /mode=(\d+) uid=(\d+) gid=(\d+)/) { |
||||
my ($gm_mode, $gm_uid, $gm_gid) = ($1, $2, $3); |
||||
my (undef,undef,$mode,undef,$uid,$gid) = lstat("$absfile"); |
||||
$mode = sprintf("%04o", $mode & 07777); |
||||
if (($gm_mode ne $mode) || ($gm_uid != $uid) |
||||
|| ($gm_gid != $gid)) { |
||||
print "PERMISSIONS/OWNERSHIP CONFLICT\n"; |
||||
print " Mismatch found for file: $file\n"; |
||||
print " Run `.git/hooks/setgitperms.perl --write` to reconcile.\n"; |
||||
exit 1; |
||||
} |
||||
} |
||||
else { |
||||
print "Warning! Permissions/ownership no longer being tracked for file: $file\n"; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
# No merge conflicts -- write out perms/ownership data to .gitmeta file |
||||
unless ($stdout) { |
||||
open (OUT, ">$gitmeta.tmp") or die "Could not open $gitmeta.tmp for writing: $!\n"; |
||||
} |
||||
|
||||
my @files = `git-ls-files`; |
||||
my %dirs; |
||||
|
||||
foreach my $path (@files) { |
||||
chomp $path; |
||||
# We have to manually add stats for parent directories |
||||
my $parent = dirname($path); |
||||
while (!exists $dirs{$parent}) { |
||||
$dirs{$parent} = 1; |
||||
next if $parent eq '.'; |
||||
printstats($parent); |
||||
$parent = dirname($parent); |
||||
} |
||||
# Now the git-tracked file |
||||
printstats($path); |
||||
} |
||||
|
||||
# diff the temporary metadata file to see if anything has changed |
||||
# If no metadata has changed, don't overwrite the real file |
||||
# This is just so `git commit -a` doesn't try to commit a bogus update |
||||
unless ($stdout) { |
||||
if (! -e $gitmeta) { |
||||
rename "$gitmeta.tmp", $gitmeta; |
||||
} |
||||
else { |
||||
my $diff = `diff -U 0 $gitmeta $gitmeta.tmp`; |
||||
if ($diff ne '') { |
||||
rename "$gitmeta.tmp", $gitmeta; |
||||
} |
||||
else { |
||||
unlink "$gitmeta.tmp"; |
||||
} |
||||
if ($showdiff) { |
||||
print $diff; |
||||
} |
||||
} |
||||
close OUT; |
||||
} |
||||
# Make sure the .gitmeta file is tracked |
||||
system("git add $gitmeta"); |
||||
} |
||||
|
||||
|
||||
sub printstats { |
||||
my $path = $_[0]; |
||||
$path =~ s/@/\@/g; |
||||
my (undef,undef,$mode,undef,$uid,$gid) = lstat($path); |
||||
$path =~ s/%/\%/g; |
||||
if ($stdout) { |
||||
print $path; |
||||
printf " mode=%04o uid=$uid gid=$gid\n", $mode & 07777; |
||||
} |
||||
else { |
||||
print OUT $path; |
||||
printf OUT " mode=%04o uid=$uid gid=$gid\n", $mode & 07777; |
||||
} |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue