Revision a4dded0189191db1aa572bdc45419182db8ae652 authored by Junio C Hamano on 22 March 2017, 22:12:07 UTC, committed by Junio C Hamano on 22 March 2017, 22:39:51 UTC
There are three issues with the test: * The syntax of the here-doc was wrong, such that the entire test was sucked into the here-doc, which is why the test succeeded. * The variable $submodulesha1 was not expanded as it was inside a quoted here text. We do not want to quote EOF marker for this. * The redirection from the git command to the output file for comparison was wrong as the -C operator from git doesn't apply to the redirect path. Also we're interested in stderr of that command. Noticed-by: Jan Palus <jan.palus@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e7b37ca
copy.c
#include "cache.h"
int copy_fd(int ifd, int ofd)
{
while (1) {
char buffer[8192];
ssize_t len = xread(ifd, buffer, sizeof(buffer));
if (!len)
break;
if (len < 0)
return COPY_READ_ERROR;
if (write_in_full(ofd, buffer, len) < 0)
return COPY_WRITE_ERROR;
}
return 0;
}
static int copy_times(const char *dst, const char *src)
{
struct stat st;
struct utimbuf times;
if (stat(src, &st) < 0)
return -1;
times.actime = st.st_atime;
times.modtime = st.st_mtime;
if (utime(dst, ×) < 0)
return -1;
return 0;
}
int copy_file(const char *dst, const char *src, int mode)
{
int fdi, fdo, status;
mode = (mode & 0111) ? 0777 : 0666;
if ((fdi = open(src, O_RDONLY)) < 0)
return fdi;
if ((fdo = open(dst, O_WRONLY | O_CREAT | O_EXCL, mode)) < 0) {
close(fdi);
return fdo;
}
status = copy_fd(fdi, fdo);
switch (status) {
case COPY_READ_ERROR:
error_errno("copy-fd: read returned");
break;
case COPY_WRITE_ERROR:
error_errno("copy-fd: write returned");
break;
}
close(fdi);
if (close(fdo) != 0)
return error_errno("%s: close error", dst);
if (!status && adjust_shared_perm(dst))
return -1;
return status;
}
int copy_file_with_time(const char *dst, const char *src, int mode)
{
int status = copy_file(dst, src, mode);
if (!status)
return copy_times(dst, src);
return status;
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...