mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow forcing of a parent commit, even if the parent is not a direct one.

Browse Source 
This can be used to compress multiple changesets into one, for example
like

	git cvsexportcommit -P cvshead mybranch

without having to do so in git first.

Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Simon 'corecode' Schubert
2007-02-01 11:43:39 +01:00
committed by Junio C Hamano
parent 4c55068683
commit ca28370a35
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-cvsexportcommit.perl
View File

@ -15,9 +15,9 @@ unless ($ENV{GIT_DIR} && -r $ENV{GIT_DIR}){
die "GIT_DIR is not defined or is unreadable";
}
our ($opt_h, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m );
our ($opt_h, $opt_P, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m );
getopts('hpvcfam:');
getopts('hPpvcfam:');
$opt_h && usage();
@ -89,7 +89,7 @@ if ($parent) {
last;
}; # found it
}
die "Did not find $parent in the parents for this commit!" if !$found;
die "Did not find $parent in the parents for this commit!" if !$found and !$opt_P;
} else { # we don't have a parent from the cmdline...
if (@parents == 1) { # it's safe to get it from the commit
$parent = $parents[0];