Revision 6ab149ea89fe5790630c5750af0e3245a7a5e06e authored by Gerrit Pape on 24 February 2009, 09:00:06 UTC, committed by Junio C Hamano on 25 February 2009, 08:49:13 UTC
When run without --author and it fails to determine an author, git quiltimport tries `read patch_author` to get user input, but standard input has been redirected to the patch series file. This commit lets quiltimport read the series file through file descriptor 3 so that the standard input is preserved. Reported by Uwe Kleine-König through http://bugs.debian.org/515910 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6a0861a
csum-file.h
#ifndef CSUM_FILE_H
#define CSUM_FILE_H
struct progress;
/* A SHA1-protected file */
struct sha1file {
int fd;
unsigned int offset;
git_SHA_CTX ctx;
off_t total;
struct progress *tp;
const char *name;
int do_crc;
uint32_t crc32;
unsigned char buffer[8192];
};
/* sha1close flags */
#define CSUM_CLOSE 1
#define CSUM_FSYNC 2
extern struct sha1file *sha1fd(int fd, const char *name);
extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
extern int sha1close(struct sha1file *, unsigned char *, unsigned int);
extern int sha1write(struct sha1file *, void *, unsigned int);
extern void sha1flush(struct sha1file *f);
extern void crc32_begin(struct sha1file *);
extern uint32_t crc32_end(struct sha1file *);
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...