diff options
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | git.c | 2 | ||||
| -rw-r--r-- | receive-pack.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 10 | ||||
| -rw-r--r-- | show-branch.c | 4 |
5 files changed, 10 insertions, 10 deletions
@@ -487,7 +487,7 @@ int git_config_set_multivar(const char* key, const char* value, store.value_regex = (regex_t*)malloc(sizeof(regex_t)); if (regcomp(store.value_regex, value_regex, REG_EXTENDED)) { - fprintf(stderr, "Invalid pattern: %s", + fprintf(stderr, "Invalid pattern: %s\n", value_regex); free(store.value_regex); return 6; @@ -278,7 +278,7 @@ int main(int argc, char **argv, char **envp) if (*exec_path != '/') { if (!getcwd(git_command, sizeof(git_command))) { fprintf(stderr, - "git: cannot determine current directory"); + "git: cannot determine current directory\n"); exit(1); } len = strlen(git_command); diff --git a/receive-pack.c b/receive-pack.c index cbe37e7239..92878ecac3 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -79,7 +79,7 @@ static int run_update_hook(const char *refname, case -ERR_RUN_COMMAND_WAITPID_WRONG_PID: die("waitpid is confused"); case -ERR_RUN_COMMAND_WAITPID_SIGNAL: - fprintf(stderr, "%s died of signal", update_hook); + fprintf(stderr, "%s died of signal\n", update_hook); return -1; case -ERR_RUN_COMMAND_WAITPID_NOEXIT: die("%s died strangely", update_hook); diff --git a/sha1_file.c b/sha1_file.c index fa22e9c71a..601147351d 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -464,7 +464,7 @@ struct packed_git *add_packed_git(char *path, int path_len, int local) p->pack_last_used = 0; p->pack_use_cnt = 0; p->pack_local = local; - if (!get_sha1_hex(path + path_len - 40 - 4, sha1)) + if ((path_len > 44) && !get_sha1_hex(path + path_len - 44, sha1)) memcpy(p->sha1, sha1, 20); return p; } @@ -1274,7 +1274,7 @@ int move_temp_to_file(const char *tmpfile, char *filename) unlink(tmpfile); if (ret) { if (ret != EEXIST) { - fprintf(stderr, "unable to write sha1 filename %s: %s", filename, strerror(ret)); + fprintf(stderr, "unable to write sha1 filename %s: %s\n", filename, strerror(ret)); return -1; } /* FIXME!!! Collision check here ? */ @@ -1313,7 +1313,7 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha } if (errno != ENOENT) { - fprintf(stderr, "sha1 file %s: %s", filename, strerror(errno)); + fprintf(stderr, "sha1 file %s: %s\n", filename, strerror(errno)); return -1; } @@ -1321,7 +1321,7 @@ int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha fd = mkstemp(tmpfile); if (fd < 0) { - fprintf(stderr, "unable to create temporary sha1 filename %s: %s", tmpfile, strerror(errno)); + fprintf(stderr, "unable to create temporary sha1 filename %s: %s\n", tmpfile, strerror(errno)); return -1; } @@ -1410,7 +1410,7 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1) size = write(fd, buf + posn, objsize - posn); if (size <= 0) { if (!size) { - fprintf(stderr, "write closed"); + fprintf(stderr, "write closed\n"); } else { perror("write "); } diff --git a/show-branch.c b/show-branch.c index c7422460be..3fe62b7177 100644 --- a/show-branch.c +++ b/show-branch.c @@ -303,7 +303,7 @@ static int append_ref(const char *refname, const unsigned char *sha1) return 0; if (MAX_REVS <= ref_name_cnt) { fprintf(stderr, "warning: ignoring %s; " - "cannot handle more than %d refs", + "cannot handle more than %d refs\n", refname, MAX_REVS); return 0; } @@ -537,7 +537,7 @@ int main(int ac, char **av) if (MAX_REVS <= num_rev) die("cannot handle more than %d revs.", MAX_REVS); if (get_sha1(ref_name[num_rev], revkey)) - die("'%s' is not a valid ref.\n", ref_name[num_rev]); + die("'%s' is not a valid ref.", ref_name[num_rev]); commit = lookup_commit_reference(revkey); if (!commit) die("cannot find commit %s (%s)", |