From 97afde15f58728138f8e178b2acb7c72473f7d96 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 26 Apr 2012 00:53:59 -0500 Subject: bundle: remove stray single-quote from error message After running rev-list --boundary to retrieve the list of boundary commits, "git bundle create" runs its own revision walk. If in this stage git encounters an unfamiliar option, it writes a message with an unbalanced quotation mark: error: unrecognized argument: --foo' Drop the stray quote to match the "unrecognized argument: %s" message used elsewhere and save translators some work. This is mostly a futureproofing measure: for now, the "rev-list --boundary" command catches most strange arguments on its own and the above message is not seen unless you try something esoteric like "git bundle create test.bundle --header HEAD". Reported-by: Junio C Hamano Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- bundle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.c b/bundle.c index 6bf849740..5364cbfa0 100644 --- a/bundle.c +++ b/bundle.c @@ -256,7 +256,7 @@ int create_bundle(struct bundle_header *header, const char *path, argc = setup_revisions(argc, argv, &revs, NULL); if (argc > 1) - return error("unrecognized argument: %s'", argv[1]); + return error("unrecognized argument: %s", argv[1]); object_array_remove_duplicates(&revs.pending); -- cgit v1.2.1 From 8258858493ad3504630c3bfa7dfde61df811994a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Apr 2012 09:41:52 -0700 Subject: Git 1.7.7.7 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.7.7.txt | 13 +++++++++++++ Documentation/git.txt | 4 +++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.7.7.7.txt diff --git a/Documentation/RelNotes/1.7.7.7.txt b/Documentation/RelNotes/1.7.7.7.txt new file mode 100644 index 000000000..e79118d06 --- /dev/null +++ b/Documentation/RelNotes/1.7.7.7.txt @@ -0,0 +1,13 @@ +Git v1.7.7.7 Release Notes +========================== + +Fixes since v1.7.7.6 +-------------------- + + * An error message from 'git bundle' had an unmatched single quote pair in it. + + * 'git diff --histogram' option was not described. + + * 'git imap-send' carried an unused dead code. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index 6803e1309..9c3e51c4b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.7.5/git.html[documentation for release 1.7.7.5] +* link:v1.7.7.7/git.html[documentation for release 1.7.7.7] * release notes for + link:RelNotes/1.7.7.7.txt[1.7.7.7], + link:RelNotes/1.7.7.6.txt[1.7.7.6], link:RelNotes/1.7.7.5.txt[1.7.7.5], link:RelNotes/1.7.7.4.txt[1.7.7.4], link:RelNotes/1.7.7.3.txt[1.7.7.3], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2feae5882..0b68ab888 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.7.6 +DEF_VER=v1.7.7.7 LF=' ' diff --git a/RelNotes b/RelNotes index 472b95854..81eb3c227 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.7.6.txt \ No newline at end of file +Documentation/RelNotes/1.7.7.7.txt \ No newline at end of file -- cgit v1.2.1