undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/undash-in-tree-git-callers'

Browse Source 
A handful of places in in-tree code still relied on being able to
execute the git subcommands, especially built-ins, in "git-foo"
form, which have been corrected.

* jc/undash-in-tree-git-callers:
  credential-cache: use child_process.args
  cvsexportcommit: do not run git programs in dashed form
  transport-helper: do not run git-remote-ext etc. in dashed form
This commit is contained in:
Junio C Hamano 2020-09-03 12:37:03 -07:00
commit 18aff08e04
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/credential-cache.c
View File

@ -42,13 +42,13 @@ static int send_request(const char *socket, const struct strbuf *out)
static void spawn_daemon(const char *socket) static void spawn_daemon(const char *socket)
{ {
struct child_process daemon = CHILD_PROCESS_INIT; struct child_process daemon = CHILD_PROCESS_INIT;
const char *argv[] = { NULL, NULL, NULL };
char buf[128]; char buf[128];
int r; int r;
argv[0] = "git-credential-cache--daemon"; strvec_pushl(&daemon.args,
argv[1] = socket; "credential-cache--daemon", socket,
daemon.argv = argv; NULL);
daemon.git_cmd = 1;
daemon.no_stdin = 1; daemon.no_stdin = 1;
daemon.out = -1; daemon.out = -1;

16
git-cvsexportcommit.perl
View File

@ -30,7 +30,7 @@ if ($opt_w || $opt_W) {
# Remember where GIT_DIR is before changing to CVS checkout # Remember where GIT_DIR is before changing to CVS checkout
unless ($ENV{GIT_DIR}) { unless ($ENV{GIT_DIR}) {
# No GIT_DIR set. Figure it out for ourselves # No GIT_DIR set. Figure it out for ourselves
my $gd =`git-rev-parse --git-dir`; my $gd =`git rev-parse --git-dir`;
chomp($gd); chomp($gd);
$ENV{GIT_DIR} = $gd; $ENV{GIT_DIR} = $gd;
} }
@ -66,7 +66,7 @@ if ($opt_d) {
# resolve target commit # resolve target commit
my $commit; my $commit;
$commit = pop @ARGV; $commit = pop @ARGV;
$commit = safe_pipe_capture('git-rev-parse', '--verify', "$commit^0"); $commit = safe_pipe_capture('git', 'rev-parse', '--verify', "$commit^0");
chomp $commit; chomp $commit;
if ($?) { if ($?) {
die "The commit reference $commit did not resolve!"; die "The commit reference $commit did not resolve!";
@ -76,7 +76,7 @@ if ($?) {
my $parent; my $parent;
if (@ARGV) { if (@ARGV) {
$parent = pop @ARGV; $parent = pop @ARGV;
$parent = safe_pipe_capture('git-rev-parse', '--verify', "$parent^0"); $parent = safe_pipe_capture('git', 'rev-parse', '--verify', "$parent^0");
chomp $parent; chomp $parent;
if ($?) { if ($?) {
die "The parent reference did not resolve!"; die "The parent reference did not resolve!";
@ -84,7 +84,7 @@ if (@ARGV) {
} }
# find parents from the commit itself # find parents from the commit itself
my @commit = safe_pipe_capture('git-cat-file', 'commit', $commit); my @commit = safe_pipe_capture('git', 'cat-file', 'commit', $commit);
my @parents; my @parents;
my $committer; my $committer;
my $author; my $author;
@ -162,9 +162,9 @@ if ($opt_a) {
close MSG; close MSG;
if ($parent eq $noparent) { if ($parent eq $noparent) {
`git-diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; `git diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
} else { } else {
`git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; `git diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
} }
## apply non-binary changes ## apply non-binary changes
@ -178,7 +178,7 @@ my $context = $opt_p ? '' : '-C1';
print "Checking if patch will apply\n"; print "Checking if patch will apply\n";
my @stat; my @stat;
open APPLY, "GIT_INDEX_FILE=$tmpdir/index git-apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch"; open APPLY, "GIT_INDEX_FILE=$tmpdir/index git apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
@stat=<APPLY>; @stat=<APPLY>;
close APPLY || die "Cannot patch"; close APPLY || die "Cannot patch";
my (@bfiles,@files,@afiles,@dfiles); my (@bfiles,@files,@afiles,@dfiles);
@ -333,7 +333,7 @@ print "Applying\n";
if ($opt_W) { if ($opt_W) {
system("git checkout -q $commit^0") && die "cannot patch"; system("git checkout -q $commit^0") && die "cannot patch";
} else { } else {
`GIT_INDEX_FILE=$tmpdir/index git-apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch"; `GIT_INDEX_FILE=$tmpdir/index git apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
} }
print "Patch applied successfully. Adding new files and directories to CVS\n"; print "Patch applied successfully. Adding new files and directories to CVS\n";

4
transport-helper.c
View File

@ -128,10 +128,10 @@ static struct child_process *get_helper(struct transport *transport)
helper->in = -1; helper->in = -1;
helper->out = -1; helper->out = -1;
helper->err = 0; helper->err = 0;
strvec_pushf(&helper->args, "git-remote-%s", data->name); strvec_pushf(&helper->args, "remote-%s", data->name);
strvec_push(&helper->args, transport->remote->name); strvec_push(&helper->args, transport->remote->name);
strvec_push(&helper->args, remove_ext_force(transport->url)); strvec_push(&helper->args, remove_ext_force(transport->url));
helper->git_cmd = 0; helper->git_cmd = 1;
helper->silent_exec_failure = 1; helper->silent_exec_failure = 1;
if (have_git_dir()) if (have_git_dir())