Merge branch 'sp/keep-pack' into np/index-pack

* sp/keep-pack: (29 commits)
Remove unused variable in receive-pack.
Teach git-index-pack how to keep a pack file.
Only repack active packs by skipping over kept packs.
Allow short pack names to git-pack-objects --unpacked=.
git-send-email: Read the default SMTP server from the GIT config file
git-send-email: Document support for local sendmail instead of SMTP server
Swap the porcelain and plumbing commands in the git man page
Mention that pull can work locally in the synopsis
gitweb: Add "next" link to commitdiff view
gitweb: Move git_get_last_activity subroutine earlier
Documentation: fix git-format-patch mark-up and link it from git.txt
Documentation: Update information about <format> in git-for-each-ref
Bash completion support for aliases
gitweb: Fix up bogus $stylesheet declarations
tests: merge-recursive is usable without Python
gitweb: Check git base URLs before generating URL from it
Documentation: add git in /etc/services.
Documentation: add upload-archive service to git-daemon.
git-cherry: document limit and add diagram
diff-format.txt: Correct information about pathnames quoting in patch format
...

diff --git a/fetch-clone.c b/fetch-clone.c
index 96cdab43c9038b10ee3e7eba3e3db5efbfbef74b..f629d8dacc1e9c83819641fa30fb09219a260148 100644 (file)
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -46,7 +46,7 @@ static int get_pack(int xd[2], const char *me, int sideband, const char **argv)
        side_pid = setup_sideband(sideband, me, fd, xd);
        pid = fork();
        if (pid < 0)
-               die("%s: unable to fork off git-unpack-objects", me);
+               die("%s: unable to fork off %s", me, argv[0]);
        if (!pid) {
                dup2(fd[0], 0);
                close(fd[0]);