Merge bundle error message fix in
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
commit
210a75c38c
50
Documentation/RelNotes/1.7.10.1.txt
Normal file
50
Documentation/RelNotes/1.7.10.1.txt
Normal file
@ -0,0 +1,50 @@
|
||||
Git v1.7.10.1 Release Notes
|
||||
===========================
|
||||
|
||||
Fixes since v1.7.10
|
||||
-------------------
|
||||
|
||||
* "git add -p" is not designed to deal with unmerged paths but did
|
||||
not exclude them and tried to apply funny patches only to fail.
|
||||
|
||||
* When PATH contains an unreadable directory, alias expansion code
|
||||
did not kick in, and failed with an error that said "git-subcmd"
|
||||
was not found.
|
||||
|
||||
* "git clean -d -f" (not "-d -f -f") is supposed to protect nested
|
||||
working trees of independent git repositories that exist in the
|
||||
current project working tree from getting removed, but the
|
||||
protection applied only to such working trees that are at the
|
||||
top-level of the current project by mistake.
|
||||
|
||||
* "git commit --author=$name" did not tell the name that was being
|
||||
recorded in the resulting commit to hooks, even though it does do
|
||||
so when the end user overrode the authorship via the
|
||||
"GIT_AUTHOR_NAME" environment variable.
|
||||
|
||||
* When "git commit --template F" errors out because the user did not
|
||||
touch the message, it claimed that it aborts due to "empty
|
||||
message", which was utterly wrong.
|
||||
|
||||
* The regexp configured with diff.wordregex was incorrectly reused
|
||||
across files.
|
||||
|
||||
* An age-old corner case bug in combine diff (only triggered with -U0
|
||||
and the hunk at the beginning of the file needs to be shown) has
|
||||
been fixed.
|
||||
|
||||
* Rename detection logic used to match two empty files as renames
|
||||
during merge-recursive, leading to unnatural mismerges.
|
||||
|
||||
* Running "notes merge --commit" failed to perform correctly when run
|
||||
from any directory inside $GIT_DIR/. When "notes merge" stops with
|
||||
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
|
||||
to resolve it.
|
||||
|
||||
* The 'push to upstream' implementation was broken in some corner
|
||||
cases. "git push $there" without refspec, when the current branch
|
||||
is set to push to a remote different from $there, used to push to
|
||||
$there using the upstream information to a remote unreleated to
|
||||
$there.
|
||||
|
||||
Also contains minor fixes and documentation updates.
|
13
Documentation/RelNotes/1.7.7.7.txt
Normal file
13
Documentation/RelNotes/1.7.7.7.txt
Normal file
@ -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.
|
22
Documentation/RelNotes/1.7.8.6.txt
Normal file
22
Documentation/RelNotes/1.7.8.6.txt
Normal file
@ -0,0 +1,22 @@
|
||||
Git v1.7.8.6 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.8.5
|
||||
--------------------
|
||||
|
||||
* An error message from 'git bundle' had an unmatched single quote pair in it.
|
||||
|
||||
* 'git diff --histogram' option was not described.
|
||||
|
||||
* Documentation for 'git rev-list' had minor formatting errors.
|
||||
|
||||
* 'git imap-send' carried an unused dead code.
|
||||
|
||||
* The way 'git fetch' implemented its connectivity check over
|
||||
received objects was overly pessimistic, and wasted a lot of
|
||||
cycles.
|
||||
|
||||
* Various minor backports of fixes from the 'master' and the 'maint'
|
||||
branch.
|
||||
|
||||
Also contains minor fixes and documentation updates.
|
13
Documentation/RelNotes/1.7.9.7.txt
Normal file
13
Documentation/RelNotes/1.7.9.7.txt
Normal file
@ -0,0 +1,13 @@
|
||||
Git v1.7.9.7 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.9.6
|
||||
--------------------
|
||||
|
||||
* An error message from 'git bundle' had an unmatched single quote pair in it.
|
||||
|
||||
* The way 'git fetch' implemented its connectivity check over
|
||||
received objects was overly pessimistic, and wasted a lot of
|
||||
cycles.
|
||||
|
||||
Also contains minor fixes and documentation updates.
|
@ -49,9 +49,10 @@ Documentation for older releases are available here:
|
||||
* release notes for
|
||||
link:RelNotes/1.7.10.txt[1.7.10].
|
||||
|
||||
* link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
|
||||
* link:v1.7.9.7/git.html[documentation for release 1.7.9.7]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes/1.7.9.7.txt[1.7.9.7],
|
||||
link:RelNotes/1.7.9.6.txt[1.7.9.6],
|
||||
link:RelNotes/1.7.9.5.txt[1.7.9.5],
|
||||
link:RelNotes/1.7.9.4.txt[1.7.9.4],
|
||||
@ -60,9 +61,10 @@ Documentation for older releases are available here:
|
||||
link:RelNotes/1.7.9.1.txt[1.7.9.1],
|
||||
link:RelNotes/1.7.9.txt[1.7.9].
|
||||
|
||||
* link:v1.7.8.5/git.html[documentation for release 1.7.8.5]
|
||||
* link:v1.7.8.6/git.html[documentation for release 1.7.8.6]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes/1.7.8.6.txt[1.7.8.6],
|
||||
link:RelNotes/1.7.8.5.txt[1.7.8.5],
|
||||
link:RelNotes/1.7.8.4.txt[1.7.8.4],
|
||||
link:RelNotes/1.7.8.3.txt[1.7.8.3],
|
||||
@ -70,9 +72,10 @@ Documentation for older releases are available here:
|
||||
link:RelNotes/1.7.8.1.txt[1.7.8.1],
|
||||
link:RelNotes/1.7.8.txt[1.7.8].
|
||||
|
||||
* link:v1.7.7.6/git.html[documentation for release 1.7.7.6]
|
||||
* 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],
|
||||
|
2
bundle.c
2
bundle.c
@ -289,7 +289,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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user