From 28b22f8af9053109d1f09fef749b6b96ee41050a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 6 Feb 2012 01:29:37 -0500 Subject: [PATCH 1/4] imap-send: remove dead code The imap-send code was adapted from another project, and still contains many unused bits of code. One of these bits contains a type "struct string_list" which bears no resemblence to the "struct string_list" we use elsewhere in git. This causes the compiler to complain if git's string_list ever becomes part of cache.h. Let's just drop the dead code. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- imap-send.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/imap-send.c b/imap-send.c index e1ad1a48c..9992233b9 100644 --- a/imap-send.c +++ b/imap-send.c @@ -41,28 +41,6 @@ struct store_conf { unsigned trash_remote_new:1, trash_only_new:1; }; -struct string_list { - struct string_list *next; - char string[1]; -}; - -struct channel_conf { - struct channel_conf *next; - char *name; - struct store_conf *master, *slave; - char *master_name, *slave_name; - char *sync_state; - struct string_list *patterns; - int mops, sops; - unsigned max_messages; /* for slave only */ -}; - -struct group_conf { - struct group_conf *next; - char *name; - struct string_list *channels; -}; - /* For message->status */ #define M_RECENT (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */ #define M_DEAD (1<<1) /* expunged */ @@ -70,7 +48,6 @@ struct group_conf { struct message { struct message *next; - /* struct string_list *keywords; */ size_t size; /* zero implies "not fetched" */ int uid; unsigned char flags, status; From f174a2583c9f42315b60205890fa67a79a1f1669 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Feb 2012 23:46:44 -0800 Subject: [PATCH 2/4] Git 1.7.6.6 Signed-off-by: Junio C Hamano --- Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index bcedfc1a5..e6b64dbde 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ 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.6.5/git.html[documentation for release 1.7.6.5] +* link:v1.7.6.6/git.html[documentation for release 1.7.6.6] * release notes for + link:RelNotes/1.7.6.6.txt[1.7.6.6], link:RelNotes/1.7.6.5.txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], link:RelNotes/1.7.6.3.txt[1.7.6.3], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 059549544..803781d8c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.6.5 +DEF_VER=v1.7.6.6 LF=' ' From 2ff14e31bd8c91356d54b7bac064e7cc615e56b3 Mon Sep 17 00:00:00 2001 From: Adrian Weimann Date: Mon, 30 Jan 2012 20:29:33 +0100 Subject: [PATCH 3/4] completion: --edit and --no-edit for git-merge Signed-off-by: Adrian Weimann Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1496c6dc0..78be19583 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1622,7 +1622,7 @@ _git_log () __git_merge_options=" --no-commit --no-stat --log --no-log --squash --strategy - --commit --stat --no-squash --ff --no-ff --ff-only + --commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit " _git_merge () From 2d1abfa8eeeb168bdd5d05302c1a57f30973711e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Feb 2012 00:03:18 -0800 Subject: [PATCH 4/4] Prepare for 1.7.9.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.9.1.txt | 19 +++++++++++++++++++ RelNotes | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.9.1.txt diff --git a/Documentation/RelNotes/1.7.9.1.txt b/Documentation/RelNotes/1.7.9.1.txt new file mode 100644 index 000000000..d8a096114 --- /dev/null +++ b/Documentation/RelNotes/1.7.9.1.txt @@ -0,0 +1,19 @@ +Git v1.7.9.1 Release Notes +========================== + +Fixes since v1.7.9 +------------------ + + * Subprocesses spawned from various git programs were often left running + to completion even when the top-level process was killed. + + * "git log --first-parent $pathspec" did not stay on the first parent + chain and veered into side branch from which the whole change to the + specified paths came. + + * "git push -q" was not sufficiently quiet. + + * When "git push" fails to update any refs, the client side did not + report an error correctly to the end user. + +Also contains minor fixes and documentation updates. diff --git a/RelNotes b/RelNotes index 766bbaf8f..d69b2c37a 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.9.txt \ No newline at end of file +Documentation/RelNotes/1.7.9.1.txt \ No newline at end of file