Lines Matching refs:GIT
29 # Merge and resolve ChangeLog conflicts for svn and git repositories
63 my $GIT = "git";
92 print STDERR "ERROR: --continue may only be used with a git repository\n";
95 print STDERR "ERROR: --fix-merged may only be used with a git repository\n";
103 -c|--[no-]continue run "git rebase --continue" after fixing ChangeLog
105 -f|--fix-merged [revision-range] fix git-merged ChangeLog entries; if a revision-range
106 is specified, run git filter-branch on the range
136 print "Unmerged files; skipping '$GIT rebase --continue'.\n";
138 print "Running '$GIT rebase --continue'...\n";
139 print `$GIT rebase --continue`;
192 my $gitPrefix = `$GIT rev-parse --show-prefix`;
194 open GIT, "-|", $GIT, "ls-files", "--unmerged", $file or die $!;
195 while (my $line = <GIT>) {
210 system("$GIT cat-file blob :${stage}:${gitPrefix}${file} > $outputFile");
213 close GIT or die $!;
244 $statCommand = "$GIT diff -r --name-status --diff-filter=U -C -C -M";
273 print; # error output from git diff
289 open GIT, "-|", $GIT, "diff", "--name-only", $revisionRange or die $!;
290 push @changedFiles, <GIT>;
291 close GIT or die $!;
299 system("$GIT filter-branch --tree-filter 'PREVIOUS_COMMIT=\`$GIT rev-parse \$GIT_COMMIT^\` && MAPPED_PREVIOUS_COMMIT=\`map \$PREVIOUS_COMMIT\` \"$0\" -f \"" . join('" "', @changeLogs) . "\"' $revisionRange");
303 rmtree(qw(.git/refs/original));
315 open GIT, "-|", $GIT, "diff", ($ENV{GIT_COMMIT} || "HEAD") . "^", $file or die $!;
316 $patch = <GIT>;
317 close GIT or die $!;
321 system($GIT, "checkout", $ENV{MAPPED_PREVIOUS_COMMIT} || "HEAD^", $file);
362 # Run "git add" on the fixed ChangeLog file
363 system($GIT, "add", $file);
369 system($GIT, "checkout", $ENV{GIT_COMMIT} || "HEAD", $file);
377 my $output = `$GIT ls-files --unmerged`;
499 system($GIT, "add", $file);
515 system($GIT, "diff", @args, $file);
