diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/git-add--interactive.perl | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/git-add--interactive.perl')
| -rwxr-xr-x | third_party/git/git-add--interactive.perl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/third_party/git/git-add--interactive.perl b/third_party/git/git-add--interactive.perl index 10fd30ae16..c20ae9e210 100755 --- a/third_party/git/git-add--interactive.perl +++ b/third_party/git/git-add--interactive.perl @@ -177,9 +177,7 @@ sub run_cmd_pipe { } else { my $fh = undef; open($fh, '-|', @_) or die; - my @out = <$fh>; - close $fh || die "Cannot close @_ ($!)"; - return @out; + return <$fh>; } } @@ -226,7 +224,7 @@ my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path')) sub get_empty_tree { return $empty_tree if defined $empty_tree; - ($empty_tree) = run_cmd_pipe(qw(git hash-object -t tree /dev/null)); + $empty_tree = run_cmd_pipe(qw(git hash-object -t tree /dev/null)); chomp $empty_tree; return $empty_tree; } @@ -1129,7 +1127,7 @@ aborted and the hunk is left unchanged. EOF2 close $fh; - chomp(my ($editor) = run_cmd_pipe(qw(git var GIT_EDITOR))); + chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR))); system('sh', '-c', $editor.' "$@"', $editor, $hunkfile); if ($? != 0) { @@ -1543,7 +1541,7 @@ sub patch_update_file { for (@{$hunk[$ix]{DISPLAY}}) { print; } - print colored $prompt_color, "(", ($ix+1), "/$num) ", + print colored $prompt_color, sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other); my $line = prompt_single_character; |