Lines Matching refs:GIT
29 # Merge and resolve ChangeLog conflicts for svn and git repositories
63 my $GIT = "git";
94 print STDERR "ERROR: --continue may only be used with a git repository\n";
97 print STDERR "ERROR: --fix-merged may only be used with a git repository\n";
100 print STDERR "ERROR: --merge-driver may only be used with a git repository\n";
111 -c|--[no-]continue run "git rebase --continue" after fixing ChangeLog
113 -f|--fix-merged [revision-range] fix git-merged ChangeLog entries; if a revision-range
114 is specified, run git filter-branch on the range
115 -m|--merge-driver %O %A %B act as a git merge-driver on files %O %A %B
136 exec qw(git merge-file -L THEIRS -L BASE -L OURS), $theirs, $base, $ours;
153 print "Unmerged files; skipping '$GIT rebase --continue'.\n";
155 print "Running '$GIT rebase --continue'...\n";
156 print `$GIT rebase --continue`;
209 my $gitPrefix = `$GIT rev-parse --show-prefix`;
211 open GIT, "-|", $GIT, "ls-files", "--unmerged", $file or die $!;
212 while (my $line = <GIT>) {
227 system("$GIT cat-file blob :${stage}:${gitPrefix}${file} > $outputFile");
230 close GIT or die $!;
261 $statCommand = "$GIT diff -r --name-status --diff-filter=U -C -C -M";
290 print; # error output from git diff
306 open GIT, "-|", $GIT, "diff", "--name-only", $revisionRange or die $!;
307 push @changedFiles, <GIT>;
308 close GIT or die $!;
316 system("$GIT filter-branch --tree-filter 'PREVIOUS_COMMIT=\`$GIT rev-parse \$GIT_COMMIT^\` && MAPPED_PREVIOUS_COMMIT=\`map \$PREVIOUS_COMMIT\` \"$0\" -f \"" . join('" "', @changeLogs) . "\"' $revisionRange");
320 rmtree(qw(.git/refs/original));
332 open GIT, "-|", $GIT, "diff", ($ENV{GIT_COMMIT} || "HEAD") . "^", $file or die $!;
333 $patch = <GIT>;
334 close GIT or die $!;
338 system($GIT, "checkout", $ENV{MAPPED_PREVIOUS_COMMIT} || "HEAD^", $file);
379 # Run "git add" on the fixed ChangeLog file
380 system($GIT, "add", $file);
386 system($GIT, "checkout", $ENV{GIT_COMMIT} || "HEAD", $file);
394 my $output = `$GIT ls-files --unmerged`;
467 system($GIT, "add", $file);
483 system($GIT, "diff", @args, $file);
