* [PATCH] notes: send "Automatic notes merge failed" messages to stderr
@ 2017-11-14 16:17 2% ` Todd Zullinger
0 siblings, 0 replies; 200+ results
From: Todd Zullinger @ 2017-11-14 16:17 UTC (permalink / raw)
To: Johan Herland; +Cc: Junio C Hamano, Santiago Torres, git
All other error messages from notes use stderr. Do the same when
alerting users of an unresolved notes merge.
Fix the output redirection in t3310 and t3320 as well. Previously, the
tests directed output to a file, but stderr was either not captured or
not sent to the file due to the order of the redirection operators.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
Johan Herland wrote:
> ACK :-)
>
> Error messages should go to stderr, and redirection in the tests
> should be fixed.
Excellent, thanks Johan!
Here's what I came up with. Hopefully I caught all the tests that need
adjustment. The test suite passes for me, but it's always possible that I've
missed something.
Style-wise, I'm not sure about the re-wrapping of the error message text. If
that should be avoided to make the patch's change from printf to fprintf
clearer or should be wrapped differently, let me know.
builtin/notes.c | 8 ++++----
t/t3310-notes-merge-manual-resolve.sh | 8 ++++----
t/t3320-notes-merge-worktrees.sh | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index 12afdf1907..4468adaf29 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -865,10 +865,10 @@ static int merge(int argc, const char **argv, const char *prefix)
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
die(_("failed to store link to current notes ref (%s)"),
default_notes_ref());
- printf(_("Automatic notes merge failed. Fix conflicts in %s and "
- "commit the result with 'git notes merge --commit', or "
- "abort the merge with 'git notes merge --abort'.\n"),
- git_path(NOTES_MERGE_WORKTREE));
+ fprintf(stderr, _("Automatic notes merge failed. Fix conflicts in %s "
+ "and commit the result with 'git notes merge --commit', "
+ "or abort the merge with 'git notes merge --abort'.\n"),
+ git_path(NOTES_MERGE_WORKTREE));
}
free_notes(t);
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index baef2d6924..9c1bf6eb3d 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -176,7 +176,7 @@ git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
git config core.notesRef refs/notes/m &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -379,7 +379,7 @@ git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
git config core.notesRef refs/notes/m &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -413,7 +413,7 @@ git rev-parse refs/notes/y > pre_merge_y
git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -494,7 +494,7 @@ cp expect_log_y expect_log_m
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index b9c3bc2487..10bfc8b947 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -61,7 +61,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
(
cd worktree2 &&
git config core.notesRef refs/notes/x &&
- test_must_fail git notes merge z 2>&1 >out &&
+ test_must_fail git notes merge z >out 2>&1 &&
test_i18ngrep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
--
2.15.0
^ permalink raw reply related [relevance 2%]
* [PATCHv3] builtin/merge: honor commit-msg hook for merges
2017-09-05 21:38 0% ` Junio C Hamano
2017-09-05 23:29 2% ` [PATCHv2] " Stefan Beller
@ 2017-09-07 22:04 2% ` Stefan Beller
1 sibling, 0 replies; 200+ results
From: Stefan Beller @ 2017-09-07 22:04 UTC (permalink / raw)
To: gitster; +Cc: git, sbeller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook: When a merge is stopped due
to conflicts or --no-commit, the subsequent commit calls the commit-msg
hook. However, it is not called after a clean merge. Fix this
inconsistency by invoking the hook after clean merges as well.
This change is motivated by Gerrit's commit-msg hook to install a ChangeId
trailer into the commit message. Without such a ChangeId, Gerrit refuses
to accept any commit by default, such that the inconsistency of (not)
running the commit-msg hook between commit and merge leads to confusion
and might block people from getting their work done.
As the githooks man page is very vocal about the possibility of skipping
the commit-msg hook via the --no-verify option, implement the option
in merge, too.
'git merge --continue' is currently implemented as calling cmd_commit
with no further arguments. This works for most other merge related options,
such as demonstrated via the --allow-unrelated-histories flag in the
test. The --no-verify option however is not remembered across invocations
of git-merge. Originally the author assumed an alternative in which the
'git merge --continue' command accepts the --no-verify flag, but that
opens up the discussion which flags are allows to the continued merge
command and which must be given in the first invocation.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
> I didn't check how "merge --continue" is implemented, but we need to
> behave exactly the same way over there, too. Making sure that it is
> a case in t7504 may be a good idea, in addition to the test you
> added.
First I understood this as if we'd want to support
'git merge --continue --no-verify' eventually, but by now I think we want
to 'carry over' the meaning from the first invocation of git-merge.
For that I added a test.
Thanks,
Stefan
builtin/merge.c | 8 ++++++
t/t7504-commit-msg-hook.sh | 64 +++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..780435d7a1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -73,6 +73,7 @@ static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int verify_msg = 1;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
OPT_END()
};
@@ -780,6 +782,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda299..302a3a2082 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@ exit 0
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,36 @@ test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
+'
+
+test_expect_failure 'merge --continue remembers --no-verify' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout master &&
+ echo a >file2 &&
+ git add file2 &&
+ git commit --no-verify -m "add file2 to master" &&
+ git checkout -b newbranch master^ &&
+ echo b >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify -m not-rewritten-by-hook master &&
+ # resolve conflict:
+ echo c >file2 &&
+ git add file2 &&
+ git merge --continue &&
+ commit_msg_is not-rewritten-by-hook
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +292,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
'
+
test_done
--
2.14.0.rc0.3.g6c2e499285
^ permalink raw reply related [relevance 2%]
* [PATCHv2] builtin/merge: honor commit-msg hook for merges
2017-09-05 21:38 0% ` Junio C Hamano
@ 2017-09-05 23:29 2% ` Stefan Beller
2017-09-07 22:04 2% ` [PATCHv3] " Stefan Beller
1 sibling, 0 replies; 200+ results
From: Stefan Beller @ 2017-09-05 23:29 UTC (permalink / raw)
To: gitster; +Cc: git, sbeller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook: When a merge is stopped due
to conflicts or --no-commit, the subsequent commit calls the commit-msg
hook. However, it is not called after a clean merge. Fix this
inconsistency by invoking the hook after clean merges as well.
This change is motivated by Gerrit's commit-msg hook to install a ChangeId
trailer into the commit message. Without such a ChangeId, Gerrit refuses
to accept any commit by default, such that the inconsistency of (not)
running the commit-msg hook between commit and merge leads to confusion
and might block people from getting their work done.
As the githooks man page is very vocal about the possibility of skipping
the commit-msg hook via the --no-verify option, implement the option
in merge, too.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
addressed all but one issues.
Junio writes:
> I didn't check how "merge --continue" is implemented, but we need to
> behave exactly the same way over there, too. Making sure that it is
> a case in t7504 may be a good idea, in addition to the test you
> added.
After inspection of the code I do not think it is a good idea, because
(a) it clutters the test suite with something "obvious" for now,
the call to cmd_commit will be the same as git-commit on the
command line and
(b) piping through --[no-]verify would either introduce irregularities
("Why do we pipe through --no-verify, when --sign-off is more important?")
or miss important options to pipe through:
static int continue_current_merge;
...
OPT_BOOL(0, "continue", &continue_current_merge,
N_("continue the current in-progress merge")),
...
if (continue_current_merge) {
int nargc = 1;
const char *nargv[] = {"commit", NULL};
if (orig_argc != 2)
usage_msg_opt(_("--continue expects no arguments"),
builtin_merge_usage, builtin_merge_options);
/* Invoke 'git commit' */
ret = cmd_commit(nargc, nargv, prefix);
goto done;
}
Thanks,
Stefan
builtin/merge.c | 8 ++++++++
t/t7504-commit-msg-hook.sh | 45 +++++++++++++++++++++++++++++++++++++++++----
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..780435d7a1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -73,6 +73,7 @@ static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int verify_msg = 1;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
OPT_END()
};
@@ -780,6 +782,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda299..1cd54af3cc 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@ exit 0
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,17 @@ test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +273,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
'
+
test_done
--
2.14.0.rc0.3.g6c2e499285
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] builtin/merge: honor commit-msg hook for merges
2017-09-05 21:01 2% [PATCH] builtin/merge: honor commit-msg hook for merges Stefan Beller
@ 2017-09-05 21:38 0% ` Junio C Hamano
2017-09-05 23:29 2% ` [PATCHv2] " Stefan Beller
2017-09-07 22:04 2% ` [PATCHv3] " Stefan Beller
0 siblings, 2 replies; 200+ results
From: Junio C Hamano @ 2017-09-05 21:38 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Stefan Beller <sbeller@google.com> writes:
> Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
> merge should also honor the commit-msg hook; the reason is the same as
> in that commit: When a merge is stopped due to conflicts or --no-commit,
> the subsequent commit calls the commit-msg hook. However, it is not
> called after a clean merge. Fix this inconsistency by invoking the hook
> after clean merges as well.
The above reads better without "; the reason is the same as in that
commit"---"Similar to", combined with the clean and concise
explanation after the colon you have, sufficiently justifies why
this is a good change.
Excellent job spotting the precedent and making it consistent ;-).
> This change is motivated by Gerrits commit-msg hook to install a change-id
s/Gerrits/Gerrit's/ perhaps?
> trailer into the commit message. Without such a change id, Gerrit refuses
I do not live in Gerrit land and I do not know which one is the more
preferred one, but be consistent between "change-id" and "change
id".
> to accept (merge) commits by default, such that the inconsistency of
> (not) running commit-msg hook between commit and merge leads to confusion
> and might block people from getting their work done.
Yup. Nicely explained.
I didn't check how "merge --continue" is implemented, but we need to
behave exactly the same way over there, too. Making sure that it is
a case in t7504 may be a good idea, in addition to the test you
added.
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> builtin/merge.c | 8 ++++++++
> t/t7504-commit-msg-hook.sh | 45 +++++++++++++++++++++++++++++++++++++++++----
> 2 files changed, 49 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 7df3fe3927..087efd560d 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -73,6 +73,7 @@ static int show_progress = -1;
> static int default_to_upstream = 1;
> static int signoff;
> static const char *sign_commit;
> +static int no_verify;
>
> static struct strategy all_strategy[] = {
> { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
> @@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
> N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
> OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
> OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
> + OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
This allows "--no-no-verify", which may want to be eventually
addressed (either by changing the code not to accept, or declaring
that it is an intended behaviour); I do not offhand know for sure but I
strong suspect "commit" shares the same issue, in which case this
patch is perfectly fine and addressing "--no-no-verify" should be
done for both of them in a separate follow-up topic. #leftoverbits
Thanks. I'll be online starting today, but please expect slow
responses for a few days as there is significant backlog.
^ permalink raw reply [relevance 0%]
* [PATCH] builtin/merge: honor commit-msg hook for merges
@ 2017-09-05 21:01 2% Stefan Beller
2017-09-05 21:38 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2017-09-05 21:01 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook; the reason is the same as
in that commit: When a merge is stopped due to conflicts or --no-commit,
the subsequent commit calls the commit-msg hook. However, it is not
called after a clean merge. Fix this inconsistency by invoking the hook
after clean merges as well.
This change is motivated by Gerrits commit-msg hook to install a change-id
trailer into the commit message. Without such a change id, Gerrit refuses
to accept (merge) commits by default, such that the inconsistency of
(not) running commit-msg hook between commit and merge leads to confusion
and might block people from getting their work done.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/merge.c | 8 ++++++++
t/t7504-commit-msg-hook.sh | 45 +++++++++++++++++++++++++++++++++++++++++----
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..087efd560d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -73,6 +73,7 @@ static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int no_verify;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -236,6 +237,7 @@ static struct option builtin_merge_options[] = {
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
OPT_END()
};
@@ -780,6 +782,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda299..1cd54af3cc 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@ exit 0
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,17 @@ test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +273,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
'
+
test_done
--
2.14.0.rc0.3.g6c2e499285
^ permalink raw reply related [relevance 2%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
2017-07-26 7:14 3% ` Junio C Hamano
@ 2017-07-27 21:01 3% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-07-27 21:01 UTC (permalink / raw)
To: Jeff King; +Cc: Raman Gupta, git
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
>
>> From the user's perspective, calling X "rerere" would probably be OK[1].
>> But from an implementation perspective (and to keep the existing
>> plumbing available and unchanged), it probably makes sense to call it
>> something else, and have it run both rerere and a new plumbing command
>> to do the merge-fix work (or call it nothing, and assume that users will
>> either touch the plumbing directly or will use "git merge" to trigger
>> both).
>> ...
>> I think it should be its own plumbing tool that merge calls alongside
>> rerere. ;)
>
> As long as we use the database keyed with <A,B> and take the merge
> base into account, "git am" and "git cherry-pick" would not be able
> to use the merge-fix machinery, so in that sense, calling X "rerere"
> would not be OK, but I agree with your general sentiment about the
> UI visible to the end users.
Actually, I guess "cherry-pick" could use it if we think hard and
long enough and come up with an ideal scheme to compute the index
into the merge-fix database.
Imagine this topology:
A---o---o---... topic #1
/
o---o---o---... mainline
\
o---B---o---C---... topic #2
where topic #1 renames 'xyzzy' to 'frotz' at commit A, and topic #2
adds a new mention of 'xyzzy' in file F at commit B and another in
file E at commit C.
In the ideal world, we would have two merge-fix database entries,
one that turns 'xyzzy' in file F to 'frotz' that is keyed by the
pair of commits <A,B>, and the other that does the same in file E
that is keyed by <A,C>. When merging the topic #1 and the topic #2
together, or when merging the topic #2 to a mainline that already
has merged the topic #1, the merge-fix machinery notices that one
side has A but not B nor C, and the other side has B and C but not
A, and finds these two merge-fixes and applies on top of the textual
merge.
If we are cherry-picking C to something that already has A, then, we
should be able to notice that the history that receives the cherry-pick
has A but not C, and C, which is being picked, does not have A, and
decide that merge-fix <A,C> is relevant.
If we do this purely with commit object name, it will still not work
if we cherry-pick A to mainline and then we cherry-pick C. The
mainline may hae change from A but does not have the exact commit A.
Which brings us back to your earlier idea to use something like
patch-id to identify these individual changes. I am not sure how we
can structure the merge-fix database so that we can efficiently find
which "changes" are already on a branch.
^ permalink raw reply [relevance 3%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
2017-07-25 20:58 2% ` Jeff King
2017-07-26 7:14 3% ` Junio C Hamano
@ 2017-07-26 8:06 3% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2017-07-26 8:06 UTC (permalink / raw)
To: Jeff King; +Cc: Raman Gupta, git
Jeff King <peff@peff.net> writes:
> Hrm. That doesn't quite work, though. Because if your <A,B> are the
> merge, then merging a topic to next will get an "A" that is a merge
> commit from next. But that commit will never end up in master. What's
> causing the conflict is really some "A" that is in the history between
> the merge base and "A" (but we don't know which).
There may be a misunderstanding. When I said the key <A,B> is a
pair of branch names, I didn't mean 'A' to be the name of an
integration branch (e.g. 'pu') and 'B' to be the name of a topic.
Rather, both 'A' and 'B' are the names of topic branches.
IOW, instead of having refs/merge-fix/sd/branch-copy that says "I
know when I merge sd/branch-copy to pu or jch, there is a semantic
conflict with some unnamed topic that is likely to be already in
there", i.e. keying with only a single topic name, the ideal I
presented would say 'sd/branch-copy and mh/packed-ref-store topics
are both by themselves OK, but when merged together, the end result
of textual merge needs to be further fixed up by cherry-picking this
change', by keying a change with a pair of topic names,
sd/branch-copy (which introduces a new method in the ref backend
vtable) and mh/packed-ref-store (which adds a new ref backend). The
latter does not know the need for the new method, and the former
does not know the need to implement its new method in a new backend,
so a merge needs a trivial implementation of the new method added to
the new backend, which is what refs/merge-fix/sd/branch-copy does.
And better yet, instead of A=sd/branch-copy B=mh/packed-ref-store,
we could point at the exact commit on each of these branches that
introduce the semantic conflict. I would probably pick these two
A=52d59cc6 ("branch: add a --copy (-c) option to go with --move (-m)", 2017-06-18)
B=67be7c5a ("packed-backend: new module for handling packed references", 2017-06-23)
so when we are on commit X that has A but not B, and are trying to
merge branch Y that has B but not A, we want the merge-fix to kick
in. Walking "rev-list --left-right X...Y" and noticing A and B in
the output would be a way to notice it.
[footnote]
*1* https://github.com/gitster/git/ should mirror these refs in the
refs/merge-fix/ hierarchymentioned in the body of this article.
^ permalink raw reply [relevance 3%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
2017-07-25 20:58 2% ` Jeff King
@ 2017-07-26 7:14 3% ` Junio C Hamano
2017-07-27 21:01 3% ` Junio C Hamano
2017-07-26 8:06 3% ` Junio C Hamano
1 sibling, 1 reply; 200+ results
From: Junio C Hamano @ 2017-07-26 7:14 UTC (permalink / raw)
To: Jeff King; +Cc: Raman Gupta, git
Jeff King <peff@peff.net> writes:
> From the user's perspective, calling X "rerere" would probably be OK[1].
> But from an implementation perspective (and to keep the existing
> plumbing available and unchanged), it probably makes sense to call it
> something else, and have it run both rerere and a new plumbing command
> to do the merge-fix work (or call it nothing, and assume that users will
> either touch the plumbing directly or will use "git merge" to trigger
> both).
> ...
> I think it should be its own plumbing tool that merge calls alongside
> rerere. ;)
As long as we use the database keyed with <A,B> and take the merge
base into account, "git am" and "git cherry-pick" would not be able
to use the merge-fix machinery, so in that sense, calling X "rerere"
would not be OK, but I agree with your general sentiment about the
UI visible to the end users. Just like "rerere" started with a
small step to avoid automating things too much and then later became
almost invisible for normal cases because we managed to automate it
reasonably well and integrate it into mergy operations, we may be
able to do the same for merge-fix machinery. My "this belongs to
'merge'" is primarily coming from it---it might be reusable in other
mergy operations with some fundamental changes, but I envision that
the primarly and only user of that X would initially be 'merge'.
> Not having thought too hard about it yet, this containing relationship
> seems like the right direction. I guess you'd do the lookup by computing
> the merge-base M of <X,Y> (which we already know anyway), walking M..X
> and looking for any entries which mention those commits (in either A or
> B slots of the entry), and then similarly narrowing it according to
> M..Y.
Yes, every time I look at the Reintegrate script, I try to think of
an efficient implementation but do not find anything better than the
left-right walk over X...Y range, so that is my conclusion after
having thought about it very hard as well ;-)
> What if instead of commit hashes we used patch ids?
Now you may be onto something. While we aim at the ultimately automated
ideal that would catch the maximal cases, for the earlier 'xyzzy
turns into frotz' example, the minimal cue to identify one side of
the pair that keys the "change this new instance of xyzzy into
frotz, too" merge-fix is a hunk like this:
-const char *xyzzy;
+const char *frotz;
It does not matter what other changes also appear in the same
commit, and my original "branch name" is way too broad, and my
previous "ideal" which is "a single problematic commit" is still
broader than necessary. Well, patch-id identifies the entire change
contained in a single commit, so it is still too broad, but if we
can narrow it down to a single hunk like that, perhaps we can use it
as one side of the key.
And the other side of the key is naturally a hunk like this:
+ printf("%s\n", xyzzy);
i.e. a new use of xyzzy appears where it didn't exist before. And
when we merge two branches, one of which has one half of the key
(i.e. "const char *xyzzy;" turned into "const char *frotz"), and the
other has the other half of the key (i.e. "printf xyzzy" is added),
then we'd apply a patch that tells us to do this:
- printf("%s\n", xyzzy);
+ printf("%s\n", frotz);
i.e. that patch would be the value in the database keyed by the pair
of two previous hunks.
> I think it's asking a lot for users to handle the textual conflicts and
> semantic ones separately. It would be nice if we could tell them apart
> automatically (and I think we can based on what isn't part of the
> conflict resolution).
After thinking about this a bit more, I realized that it is possible
to mechanically sift a human generated resolution that has both
textual conflict resolution (which will be handled by "rerere") and
semantic one (which needs the merge-fix machinery) into two, without
requiring the user to make two separate commits.
The key trick is that "rerere" is capable of recording and replaying
semantic conflict resolution made to a file that happens to have
textual conflict just fine. Because rerere database records the
preimage (i.e. with conflict markers) and postimage (i.e. the final
resolution for the file) as an entire file contents, it can do 3-way
merge for parts of the same file that is away from any conflicted
region.
If you tell contrib/rerere-train.sh to learn from "pu^{/^Merge
branch 'bp/fsmonitor' into pu}", you'll see what I mean.
$ git show "pu^{/^Merge branch 'bp/fsmonitor' into pu}" compat/bswap.h
shows the result of such resolution. Early part of the combined
diff shown by the above command comes from textual conflict
resolution, but there is a new implementation of inline version of
get_be64 that has become necessary but did not exist in either of
the branches getting merged, which is shown as an evil merge.
So the way to automatically sift an existing merge into textual
conflict resolution (i.e. automatable with "rerere") and semantic
evil merge-fix is to first try to recreate the merge and enumerate
the paths that get conflicts. Then resolve these paths by grabbing
the resolved result for these paths that get textual conflicts out
of the original merge. That gives us the textual part (we can run
"git rerere" at this point to store the resolution away to the
rerere database---which is essentially what contrib/rerere-train
does).
There will be difference between the result of the above and the
original merge commit. The paths that are different are all outside
these conflicted paths, and they are what we want in the second
commit, i.e. the semantic evil merge-fix, which will be the value
for the merge-fix database.
So that part is easily automatable.
It is much harder to come up with a way to index into the merge-fix
database. We can "punt" and use the same index scheme as the
Reintegrate script (i.e. key it with the name of the branch being
merged, which can be read from the original merge) as the initial
approximation, and that would already be much better than what
Reintegrate script currently does, in that the recording part is
much more automated (in the workflow I use the Reintegrate script,
the side that records a merge-fix initially is entirely manual).
^ permalink raw reply [relevance 3%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
2017-07-25 20:26 3% ` Junio C Hamano
2017-07-25 20:40 2% ` Junio C Hamano
@ 2017-07-25 20:58 2% ` Jeff King
2017-07-26 7:14 3% ` Junio C Hamano
2017-07-26 8:06 3% ` Junio C Hamano
1 sibling, 2 replies; 200+ results
From: Jeff King @ 2017-07-25 20:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Raman Gupta, git
On Tue, Jul 25, 2017 at 01:26:34PM -0700, Junio C Hamano wrote:
> This is not even a limitation but is outside the scope of rerere.
> Let's understand that first.
> [...]
> If we wanted to port the "merge-fix" logic, and I do wish it would
> happen some day, the update belongs to "git merge".
Looks like this crossed with my latest email. Overall I agree with you.
I almost said the same thing about scope initially, but I decided it
doesn't really matter. From the user's perspective there may be a tool X
that replays bits of a previous merge result. And that task can be
subdivided into replaying conflict resolution and replaying merge-fixes.
From the user's perspective, calling X "rerere" would probably be OK[1].
But from an implementation perspective (and to keep the existing
plumbing available and unchanged), it probably makes sense to call it
something else, and have it run both rerere and a new plumbing command
to do the merge-fix work (or call it nothing, and assume that users will
either touch the plumbing directly or will use "git merge" to trigger
both).
So if you want to shut down immediately the idea that this would be
bolted onto rerere, I can support that. There are ways of doing it that
would make sense to combine with rerere (like the "tying fixups to
conflict resolution" sketch I gave in the other email), but I agree they
will end up fundamentally hacky (because of the exact "you may not even
have textual conflicts" I mentioned).
The only part I'd disagree with above is that this belongs to git-merge.
I think it should be its own plumbing tool that merge calls alongside
rerere. ;)
> - Then, it looks up the database to find the keys <A, B> where
> A is in X but not in Y, and B is not in X but in Y.
> These commits are cherry-picked and squashed into the result of
> the above.
I think this is the crux of it. I mentioned in my other email that what
we really want is some way to say "this is roughly the same merge".
The Reintegrate script does it with the topic branch name and an
implicit "merging up to an integration branch".
Not having thought too hard about it yet, this containing relationship
seems like the right direction. I guess you'd do the lookup by computing
the merge-base M of <X,Y> (which we already know anyway), walking M..X
and looking for any entries which mention those commits (in either A or
B slots of the entry), and then similarly narrowing it according to
M..Y.
Hrm. That doesn't quite work, though. Because if your <A,B> are the
merge, then merging a topic to next will get an "A" that is a merge
commit from next. But that commit will never end up in master. What's
causing the conflict is really some "A" that is in the history between
the merge base and "A" (but we don't know which).
So you'd almost have to do an intersection of the left side of "$(git
merge-base A B)..A" with what's in X and Y (with respect to their merge
base). Err, maybe vice versa. But the point is that we're looking for
overlapping set unions, I think, not the presence of particular tips.
> I said A and B in the above are branch names, but in the ideal
> world, they can be commit object names (possibly in the middle of a
> branch), as long as we can reliable update the database's keys every
> time "git rebase" etc. rewrites commits.
What if instead of commit hashes we used patch ids?
There's one trick there, which is that merges don't have a well-defined
commit id. We could use its actual commit id in that case. That would
work OK in practice for a workflow like git.git's, because the merge
commits are never rewritten. But it would fall down if people do mixed
rebases and merges on their topic branches.
> To populate the database, we'd need a reverse.
>
> * When merging branch B into branch A (or the other way around) for
> the first time, "git merge" would do what it currently does.
>
> * The user then concludes the merge to resolve *ONLY* the textual
> conflict, and commit the result. It is important that no
> additional evil merge to correct for semantic conflicts is done
> in this step. Note that if the auto-merge cleanly succeeds, this
> step may not even exist.
>
> * Then the user makes another commit to correct for semantic
> conflicts (aka "merge-fix").
I think it's asking a lot for users to handle the textual conflicts and
semantic ones separately. It would be nice if we could tell them apart
automatically (and I think we can based on what isn't part of the
conflict resolution).
That still ends up with one giant "fixup" commit. But I don't know how
else you'd do it. I could make several commits, but we still don't know
how to attribute them to anything but the mass <A,B> merge. We don't
know which commits were responsible for which fixups (and I wouldn't
want to ask the user to figure it out), so the best we can do is apply
them all.
-Peff
^ permalink raw reply [relevance 2%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
2017-07-25 20:26 3% ` Junio C Hamano
@ 2017-07-25 20:40 2% ` Junio C Hamano
2017-07-25 20:58 2% ` Jeff King
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2017-07-25 20:40 UTC (permalink / raw)
To: Jeff King; +Cc: Raman Gupta, git
Junio C Hamano <gitster@pobox.com> writes:
> To populate the database, we'd need a reverse.
> ...
> * Then the user tells Git that semantic conflicts were resolved and
> need to be recorded (just like running "git rerere" manually,
> before "git commit" automatically does it for them these days).
> This will result in the following:
>
> - The database is updated so that key <A, B> yields the
> "merge-fix" commit;
> ...
I probably should have been aiming for stars, as I were outlining
the ideal merge-fix logic. The key <A, B> is merely a default, and
the worst one at that. There should be a way for the user to tell
which exact pair of commits (i.e. another side branch that was
merged earlier to the mainline A that renamed 'xyzzy' to 'frotz'
wholesale, and the exact commit on the side branch B that added an
extra mention of 'xyzzy').
If the logic can figure out what these two commits are without
user's help, mechanically by only looking at the merge-fix commit,
that would be even better. But I do not believe in miracles, so...
^ permalink raw reply [relevance 2%]
* Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
@ 2017-07-25 20:26 3% ` Junio C Hamano
2017-07-25 20:40 2% ` Junio C Hamano
2017-07-25 20:58 2% ` Jeff King
0 siblings, 2 replies; 200+ results
From: Junio C Hamano @ 2017-07-25 20:26 UTC (permalink / raw)
To: Jeff King; +Cc: Raman Gupta, git
Jeff King <peff@peff.net> writes:
>> 1) Is this a known limitation or is there a reason rerere works in
>> this manner?
>
> Yes, it's known. Rerere works by storing a mapping of conflicted hunks
> to their resolutions. If there's no conflicted hunk, I'm not sure how
> we'd decide what to feed into the mapping to see if there is some
> content to be replaced.
Correct.
This is not even a limitation but is outside the scope of rerere.
Let's understand that first.
A semantic conflict that requires an evil merge that touches a file
that is not involved in any textual conflict during a merge will
happen even if there is *NO* textual merge conflict.
Imagine that there is a global variable 'xyzzy' used in many places
in the code, and then a side branch forks from the mainline. The
mainline renames the variable to 'frotz' in the entire codebase,
while the side branch adds one more place that the variable is used
under its original name. Then you merge these two branches. This
will textually merge cleanly if the place the side branch adds a new
mention of 'xyzzy' is textually far from any block of text in the
common ancestor that has been updated on the mainline while these
two branches diverged.
"git checkout mainline && git merge side" will cleanly automerge,
yet the result is not correct. The new mention of 'xyzzy' added by
the merge needs to be corrected to 'frotz'.
Now we take that as the baseline and further imagine that during the
time these two branches diverged, the mainline also updated some
documentation of something totally unrelated to 'xyzzy' vs 'frotz'
variable. Perhaps README was updated, or something. The side
branch also updated the same file in a different way. This time,
the changes to this same file may result in textual conflict.
"git checkout mainline && git merge side" will result in a conflict,
whose resolution may be recorded by rerere for that file. It should
be crystal clear that this conflict does *not* have anything to do
with the semantic conflict between 'xyzzy' vs 'frotz'.
The realization we must draw from the above observation is that what
the "merge-fix" machinery in the Reintegrate script you cited in
your message tries to help, which is the semantic conflict,
fundamentally cannot be tied to any textual merge conflict that may
(or may not) happen. That is what makes the issue outside the scope
of rerere.
The above is not to say that the need to record and replay such evil
merges to solve semantic conflict does not exist. Far from it. It
is just clarifying that it is a wrong approach to try to "teach"
rerere to somehow handle that case as well.
If we wanted to port the "merge-fix" logic, and I do wish it would
happen some day, the update belongs to "git merge".
You were too kind to call the "merge-fix" logic in Reintegrate "the
state of the art", but I am not happy about its limitation. Here
are the things I wish to have in an ideal version of the "merge-fix"
logic, which does not exist yet:
* There is a database of "to be cherry-picked" commits, keyed by a
pair of branch names. That is, given branches A and B, the
database will return 0 or more commits that can be cherry-picked.
The order of branch names in the pair is immaterial, i.e. asking
the database for cherry-pickable commits keyed by <A, B> and
keyed by <B, A> will yield the identical set of commits.
* When merging commit X to commit Y, "git merge" in the ideal world
does the following:
- It first does what it currently does, i.e. three-way merge with
the merge strategy and applying rerere for re-application of an
earlier resolution of textual conflicts.
- Then, it looks up the database to find the keys <A, B> where
A is in X but not in Y, and B is not in X but in Y.
These commits are cherry-picked and squashed into the result of
the above.
The intent is that a pair <A, B> represents the mainline and side
branch in the above example, where A renamed 'xyzzy' to 'frotz' and
B added new reference to 'xyzzy'. And the cherry-pickable commit
found in the database is to tweak the 'xyzzy' B adds into 'frotz'.
I said A and B in the above are branch names, but in the ideal
world, they can be commit object names (possibly in the middle of a
branch), as long as we can reliable update the database's keys every
time "git rebase" etc. rewrites commits.
To populate the database, we'd need a reverse.
* When merging branch B into branch A (or the other way around) for
the first time, "git merge" would do what it currently does.
* The user then concludes the merge to resolve *ONLY* the textual
conflict, and commit the result. It is important that no
additional evil merge to correct for semantic conflicts is done
in this step. Note that if the auto-merge cleanly succeeds, this
step may not even exist.
* Then the user makes another commit to correct for semantic
conflicts (aka "merge-fix").
* Then the user tells Git that semantic conflicts were resolved and
need to be recorded (just like running "git rerere" manually,
before "git commit" automatically does it for them these days).
This will result in the following:
- The database is updated so that key <A, B> yields the
"merge-fix" commit;
- The head is detached at the tip of branch A before the merge;
- "git merge B" is done again, which _should_ reproduce the state
immediately after the user committed the "merge-fix";
- The tip of branch A is reset to the result of the above.
The merge-fix logic in Reintegrate is a poor-man's emulation of the
above ideal. A value its database yields is not a set of commits,
but a single commit, and instead of getting keyed by a pair of
branch names, the database is keyed by a single branch name
(i.e. recording "I had trouble when merging this branch" without
saying "... to the integration branch that already had this other
branch"), so the look-up does not have to do "A is in X but not in
Y, and B is not in X but in Y".
It is still usable but the database need to be reorganized every
time the order of topics merged to 'pu' is changed.
^ permalink raw reply [relevance 3%]
* Re: [PATCH v6 00/10] The final building block for a faster rebase -i
2017-07-20 21:38 2% ` Junio C Hamano
@ 2017-07-22 11:44 0% ` Johannes Schindelin
0 siblings, 0 replies; 200+ results
From: Johannes Schindelin @ 2017-07-22 11:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Philip Oakley, Jeff King, Phillip Wood, Liam Beguin
Hi Junio,
On Thu, 20 Jul 2017, Junio C Hamano wrote:
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
> > Changes since v5:
> >
> > - replaced a get_sha1() call by a get_oid() call already.
> >
> > - adjusted to hashmap API changes
>
> Applying this to the tip of 'master' yields exactly the same result
> as merging the previous round js/rebase-i-final to the tip of
> 'master' and then applying merge-fix/js/rebase-i-final to adjust to
> the codebase, so the net effect of this reroll is none. Which is a
> good sign, as it means there wasn't any rebase mistake and the evil
> merge we've been carrying was a good one.
Good.
> But at the same time, I prefer to avoid rebasing to newer 'master'
> until the codebase starts drifting too far apart, or until a new
> feature release is made out of newer 'master'. This is primarily
> because I want dates on commits to mean something---namely, "this
> change hasn't seen a need to be updated for 'oops, that was wrong'
> since this date". This use of commit dates as 'priority date'
> matters much less for a topic not in 'next', but as a general
> principle, my workflow tries to preserve commit dates for all
> topics.
By that token, commit message updates would also be inappropriate, in
particular when they came from somebody else than the patch author ;-P
As to avoiding a rebase: we can add that to the growing list of things on
which we disagree.
If the author dates really meant anything, we would also have to avoid v2,
v3, v4, ... v226 of patch series. So that flies in the face of trying to
keep the meaning of author dates.
In addition, the development flow I prefer is one that is in harmony with
the modern Continuous Integration style, where topic branches are merged
into a single, always-ready-to-release integration branch.
That means that I always work off of `master`, unless there is a good
reason to base off of `next` or even `pu`. That's to avoid merge
conflicts, to see what really gets applied.
I am *especially* adamant about rebasing to a newer upstream commit when
there are merge conflicts.
Such as is the case here.
> For the above reason, I may hold onto this patch series in my inbox
> without actually updating js/rebase-i-final topic until the current
> cycle is over; please do not mistake it as this new reroll being
> ignored.
You do as you want, of course. But please note that I will not rebase my
topic branches to an ancient revision, especially if that would cause merge
conflicts with the current `master`.
And if there should be another iteration of this wallflower patch series,
I will rebase it to the then-current `master` again [*1*].
Ciao,
Dscho
Footnote *1*: in general, I try to abide by the wishes of maintainers when
contributing code, unless those wishes are contrary to what I consider
correct software development. Like, when in Rome, I will do as the Romans
do. Except when I see them looting a parking meter.
^ permalink raw reply [relevance 0%]
* Re: [PATCH v6 00/10] The final building block for a faster rebase -i
@ 2017-07-20 21:38 2% ` Junio C Hamano
2017-07-22 11:44 0% ` Johannes Schindelin
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2017-07-20 21:38 UTC (permalink / raw)
To: Johannes Schindelin
Cc: git, Philip Oakley, Jeff King, Phillip Wood, Liam Beguin
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> Changes since v5:
>
> - replaced a get_sha1() call by a get_oid() call already.
>
> - adjusted to hashmap API changes
Applying this to the tip of 'master' yields exactly the same result
as merging the previous round js/rebase-i-final to the tip of
'master' and then applying merge-fix/js/rebase-i-final to adjust to
the codebase, so the net effect of this reroll is none. Which is a
good sign, as it means there wasn't any rebase mistake and the evil
merge we've been carrying was a good one.
But at the same time, I prefer to avoid rebasing to newer 'master'
until the codebase starts drifting too far apart, or until a new
feature release is made out of newer 'master'. This is primarily
because I want dates on commits to mean something---namely, "this
change hasn't seen a need to be updated for 'oops, that was wrong'
since this date". This use of commit dates as 'priority date'
matters much less for a topic not in 'next', but as a general
principle, my workflow tries to preserve commit dates for all
topics.
For the above reason, I may hold onto this patch series in my inbox
without actually updating js/rebase-i-final topic until the current
cycle is over; please do not mistake it as this new reroll being
ignored.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: [PATCH 00/33] object id conversion (grep and diff)
2017-06-02 23:35 3% ` Junio C Hamano
@ 2017-06-05 19:42 0% ` Brandon Williams
0 siblings, 0 replies; 200+ results
From: Brandon Williams @ 2017-06-05 19:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, peff, sandals
On 06/03, Junio C Hamano wrote:
> Brandon Williams <bmwill@google.com> writes:
>
> > On 06/02, Junio C Hamano wrote:
> >>
> >> I lied. This also conflicts somewhat with Peff's diff-blob topic.
> >> I think I resolved them correctly (there needs evil merges applied
> >> to two files when merging this topic), and hopefully can push out
> >> the result by the end of the day.
> >>
> >> Thanks.
> >
> > If it ends up being too much of a headache for you to deal with, let me
> > know and I can rebase on top of those series. That way you don't have to
> > deal with the conflict resolutions. Just let me know what you'd like me
> > to do.
>
> Sorry, I forgot to push the result out, even though I double checked
> the conflict resolution I did last night. Now it is in the public
> repository. I have one squash queued at the right place to update
> SHA1s to OIDs in the comment Brian pointed out.
>
What you have at 'bw/object-id' matches the changes I made locally
(changing SHA1 to OID) and looks good to me!
> If you ever need to rebase this on top of future 'master' that
> already has js/blame-lib topic, fetching from me and checking
> the evil merge I did may turn out to be helpful:
>
> $ git fetch git://github.com/gitster/git refs/merge-fix/bw/object-id
> $ git show FETCH_HEAD
>
> but I can take patches based on the same old 'master'; as long as
> the evil merge above is correct, that would probably be preferrable,
> as it makes it easier to compare the two iterations of your series.
Sounds like basing it on the original 'master' would work easiest for
you, so I'll continue to do that :)
>
> Repeating some backstory of "merge-fix" might be beneficial, if a
> reader is interested. Otherwise the remainder of this message can
> safely be skipped.
>
> After a topic (i.e. js/blame-lib) moves a lot of code around (i.e. a
> bulk of what used to be in builtin/blame.c is now in blame.c and
> some in diff.c), merging a topic that touches places in the code
> that was moved in-place (i.e. bw/object-id, which updates the code
> in builtin/blame.c) will leave a conflict that looks like:
>
> <<<<<<< HEAD
> ... very little that is left after moving
> ... bunch of code out of this file
> ||||||| common
> ... a lot of
> ... stuff before
> ... your change from SHA1 to OID
> ... is here
> =======
> ... a lot of
> ... stuff after
> ... your change from SHA1 to OID
> ... is here
> >>>>>>> theirs
>
> As far as builtin/blame.c is concerned, the resolution for this
> set of conflicts is just to take the HEAD version, ignoring all of
> your SHA1-to-OID changes. Once it is resolved, "rerere" can help
> us remember this resolution to builtin/blame.c
>
> But the ignored changes need to go somewhere else.
>
> What the user who is doing a merge does at this point is to compare
> what is between ||||||| and ======= (i.e. common ancestor's version)
> with what is between ======= and >>>>>>> (i.e. their version) to
> figure out what the branch being merged did. And the user needs to
> know where the common code went in the version in HEAD.
>
> $ git log [--no-merges] -p MERGE_HEAD.. -- builtin/blame.c
>
> is helpful to locate the commit that lost the common lines from the
> file. And "git show" on it will tell us that they mostly went to
> blame.c while some migrating to diff.c; we found out what you did by
> comparing "common" and "theirs" in the previous step and we apply
> these changes to these "new" places.
>
> And that is the diff you see in refs/merge-fix/bw/object-id. The
> script I use to re-build 'pu' every day (probably I use it three
> times a day on average) knows about that ref. The script starts
> from the tip of 'master', and for each topic, (1) run "git merge"
> into HEAD, (2) take resolution recorded by "rerere" and (3) if
> merge/fix/$topic exists, cherry-pick it on top to squash into the
> merge made in (2).
>
> Once I have taught my rerere database and refs/merge-fix/ about this
> merge, it is not too big a deal to redo the merge to adjust to an
> updated 'master' or a new interation of your series because of the
> above mechanism. And that is why I say it is OK for an updated series
> to be based on the same old 'master'.
>
> Thanks.
>
>
--
Brandon Williams
^ permalink raw reply [relevance 0%]
* Re: [PATCH 00/33] object id conversion (grep and diff)
@ 2017-06-02 23:35 3% ` Junio C Hamano
2017-06-05 19:42 0% ` Brandon Williams
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2017-06-02 23:35 UTC (permalink / raw)
To: Brandon Williams; +Cc: git, peff, sandals
Brandon Williams <bmwill@google.com> writes:
> On 06/02, Junio C Hamano wrote:
>>
>> I lied. This also conflicts somewhat with Peff's diff-blob topic.
>> I think I resolved them correctly (there needs evil merges applied
>> to two files when merging this topic), and hopefully can push out
>> the result by the end of the day.
>>
>> Thanks.
>
> If it ends up being too much of a headache for you to deal with, let me
> know and I can rebase on top of those series. That way you don't have to
> deal with the conflict resolutions. Just let me know what you'd like me
> to do.
Sorry, I forgot to push the result out, even though I double checked
the conflict resolution I did last night. Now it is in the public
repository. I have one squash queued at the right place to update
SHA1s to OIDs in the comment Brian pointed out.
If you ever need to rebase this on top of future 'master' that
already has js/blame-lib topic, fetching from me and checking
the evil merge I did may turn out to be helpful:
$ git fetch git://github.com/gitster/git refs/merge-fix/bw/object-id
$ git show FETCH_HEAD
but I can take patches based on the same old 'master'; as long as
the evil merge above is correct, that would probably be preferrable,
as it makes it easier to compare the two iterations of your series.
Repeating some backstory of "merge-fix" might be beneficial, if a
reader is interested. Otherwise the remainder of this message can
safely be skipped.
After a topic (i.e. js/blame-lib) moves a lot of code around (i.e. a
bulk of what used to be in builtin/blame.c is now in blame.c and
some in diff.c), merging a topic that touches places in the code
that was moved in-place (i.e. bw/object-id, which updates the code
in builtin/blame.c) will leave a conflict that looks like:
<<<<<<< HEAD
... very little that is left after moving
... bunch of code out of this file
||||||| common
... a lot of
... stuff before
... your change from SHA1 to OID
... is here
=======
... a lot of
... stuff after
... your change from SHA1 to OID
... is here
>>>>>>> theirs
As far as builtin/blame.c is concerned, the resolution for this
set of conflicts is just to take the HEAD version, ignoring all of
your SHA1-to-OID changes. Once it is resolved, "rerere" can help
us remember this resolution to builtin/blame.c
But the ignored changes need to go somewhere else.
What the user who is doing a merge does at this point is to compare
what is between ||||||| and ======= (i.e. common ancestor's version)
with what is between ======= and >>>>>>> (i.e. their version) to
figure out what the branch being merged did. And the user needs to
know where the common code went in the version in HEAD.
$ git log [--no-merges] -p MERGE_HEAD.. -- builtin/blame.c
is helpful to locate the commit that lost the common lines from the
file. And "git show" on it will tell us that they mostly went to
blame.c while some migrating to diff.c; we found out what you did by
comparing "common" and "theirs" in the previous step and we apply
these changes to these "new" places.
And that is the diff you see in refs/merge-fix/bw/object-id. The
script I use to re-build 'pu' every day (probably I use it three
times a day on average) knows about that ref. The script starts
from the tip of 'master', and for each topic, (1) run "git merge"
into HEAD, (2) take resolution recorded by "rerere" and (3) if
merge/fix/$topic exists, cherry-pick it on top to squash into the
merge made in (2).
Once I have taught my rerere database and refs/merge-fix/ about this
merge, it is not too big a deal to redo the merge to adjust to an
updated 'master' or a new interation of your series because of the
above mechanism. And that is why I say it is OK for an updated series
to be based on the same old 'master'.
Thanks.
^ permalink raw reply [relevance 3%]
* Re: What's cooking in git.git (May 2017, #07; Tue, 23)
2017-05-25 3:42 2% ` Junio C Hamano
@ 2017-05-25 5:42 0% ` Stefan Beller
0 siblings, 0 replies; 200+ results
From: Stefan Beller @ 2017-05-25 5:42 UTC (permalink / raw)
To: Junio C Hamano
Cc: Ævar Arnfjörð Bjarmason, git@vger.kernel.org
On Wed, May 24, 2017 at 8:42 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>>> The tests added by grep rely on the old content of
>>> test 2 'grep correctly finds patterns in a submodule'.
>>
>> Sorry about the fallout.
>>
>>> The (whitespace broken) diff below fixes it.
>
> Ah, then, this was an example of maintainer not doing a good job.
> When I see a topic that pass its own test that fails when merged to
> 'pu', I usually try to see where it goes wrong myself and come up
> with a fix in an evil merge, but this time I didn't have enough time
> to do so before sending out the "What's cooking" report.
>
> Here is what I taught my merge-fix machinery to apply after
> mechanical merge of the two topics.
Please evict (or stop paying attention to)
sb/submodule-blanket-recursive as it is fundamentally broken.
I hoped to resend a fixed version today, but it took me longer than expected
to figure out the config machinery playing with submodules.
The diff below looks correct to me.
Thanks,
Stefan
>
> t/t7814-grep-recurse-submodules.sh | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
> index 14eeb54b4b..7184113b9b 100755
> --- a/t/t7814-grep-recurse-submodules.sh
> +++ b/t/t7814-grep-recurse-submodules.sh
> @@ -36,18 +36,18 @@ test_expect_success 'grep correctly finds patterns in a submodule' '
> test_expect_success 'grep finds patterns in a submodule via config' '
> test_config submodule.recurse true &&
> # expect from previous test
> - git grep -e "bar" >actual &&
> + git grep -e "(3|4)" >actual &&
> test_cmp expect actual
> '
>
> test_expect_success 'grep --no-recurse-submodules overrides config' '
> test_config submodule.recurse true &&
> cat >expect <<-\EOF &&
> - a:foobar
> - b/b:bar
> + a:(1|2)d(3|4)
> + b/b:(3|4)
> EOF
>
> - git grep -e "bar" --no-recurse-submodules >actual &&
> + git grep -e "(3|4)" --no-recurse-submodules >actual &&
> test_cmp expect actual
> '
>
> --
> 2.13.0-491-g71cfeddc25
>
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (May 2017, #07; Tue, 23)
@ 2017-05-25 3:42 2% ` Junio C Hamano
2017-05-25 5:42 0% ` Stefan Beller
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2017-05-25 3:42 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Stefan Beller, git@vger.kernel.org
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>> The tests added by grep rely on the old content of
>> test 2 'grep correctly finds patterns in a submodule'.
>
> Sorry about the fallout.
>
>> The (whitespace broken) diff below fixes it.
Ah, then, this was an example of maintainer not doing a good job.
When I see a topic that pass its own test that fails when merged to
'pu', I usually try to see where it goes wrong myself and come up
with a fix in an evil merge, but this time I didn't have enough time
to do so before sending out the "What's cooking" report.
Here is what I taught my merge-fix machinery to apply after
mechanical merge of the two topics.
t/t7814-grep-recurse-submodules.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 14eeb54b4b..7184113b9b 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -36,18 +36,18 @@ test_expect_success 'grep correctly finds patterns in a submodule' '
test_expect_success 'grep finds patterns in a submodule via config' '
test_config submodule.recurse true &&
# expect from previous test
- git grep -e "bar" >actual &&
+ git grep -e "(3|4)" >actual &&
test_cmp expect actual
'
test_expect_success 'grep --no-recurse-submodules overrides config' '
test_config submodule.recurse true &&
cat >expect <<-\EOF &&
- a:foobar
- b/b:bar
+ a:(1|2)d(3|4)
+ b/b:(3|4)
EOF
- git grep -e "bar" --no-recurse-submodules >actual &&
+ git grep -e "(3|4)" --no-recurse-submodules >actual &&
test_cmp expect actual
'
--
2.13.0-491-g71cfeddc25
^ permalink raw reply related [relevance 2%]
* Re: [BUG] test suite broken with GIT_TEST_SPLIT_INDEX
2017-04-20 21:03 0% ` Christian Couder
@ 2017-04-20 21:24 0% ` Thomas Gummerer
0 siblings, 0 replies; 200+ results
From: Thomas Gummerer @ 2017-04-20 21:24 UTC (permalink / raw)
To: Christian Couder; +Cc: git
On 04/20, Christian Couder wrote:
> Hi,
>
> On Thu, Apr 20, 2017 at 10:52 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:
> > Hi,
> >
> > I just tried to run the test suite with GIT_TEST_SPLIT_INDEX=YesPlease
> > and noticed that a few tests are broken both in pu and master.
> >
> > Below the test failures on master:
> >
> > Test Summary Report
> > -------------------
> > t7009-filter-branch-null-sha1.sh (Wstat: 256 Tests: 5 Failed: 2)
> > Failed tests: 4-5
> > Non-zero exit status: 1
> > t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1)
> > Failed test: 34
> > Non-zero exit status: 1
> > t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 4)
> > Failed tests: 11-14
> > Non-zero exit status: 1
> > t3415-rebase-autosquash.sh (Wstat: 256 Tests: 19 Failed: 15)
> > Failed tests: 4-17, 19
> > Non-zero exit status: 1
> > t3404-rebase-interactive.sh (Wstat: 256 Tests: 95 Failed: 54)
> > Failed tests: 18, 20, 22-24, 26-43, 45, 47-74, 84-85
> > Non-zero exit status: 1
> >
> > Bisecting between master and v2.10.0 leads me to the merge commit
> > 94c9b5af70 ("Merge branch 'cc/split-index-config'", 2017-03-17).
> >
> > Unfortunately I don't forsee myself having time to track the bug down
> > soon. Sorry for not noticing this earlier in the cycle.
> >
> > The bisect log is below if someone finds it helpful:
> >
> > git bisect start
> > # bad: [6a2c2f8d34fa1e8f3bb85d159d354810ed63692e] Git 2.13-rc0
> > git bisect bad 6a2c2f8d34fa1e8f3bb85d159d354810ed63692e
> > # good: [6ebdac1bab966b720d776aa43ca188fe378b1f4b] Git 2.10
> > git bisect good 6ebdac1bab966b720d776aa43ca188fe378b1f4b
> > # good: [733671b0fd2fb03edb05273f36ec70bd624e544f] Merge branch 'maint'
> > git bisect good 733671b0fd2fb03edb05273f36ec70bd624e544f
> > # good: [04b4f7d579056cedaae2de0a019e5993b4d9c2d0] Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint
> > git bisect good 04b4f7d579056cedaae2de0a019e5993b4d9c2d0
> > # bad: [af6865a7f1e1d915d3b63e998226028ca4abb6ee] submodule.c: convert is_submodule_modified to use strbuf_getwholeline
> > git bisect bad af6865a7f1e1d915d3b63e998226028ca4abb6ee
> > # good: [3f7ebc6ece46f1c23480d094688b8b5f24eb345c] Merge branch 'jk/tempfile-ferror-fclose-confusion'
> > git bisect good 3f7ebc6ece46f1c23480d094688b8b5f24eb345c
> > # bad: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
> > git bisect bad 94c9b5af703eb70adba349cfbfaaa3029849744c
> > # good: [36d5286f6815542761dae92fdcdce8db1556727f] Merge branch 'ax/line-log-range-merge-fix'
> > git bisect good 36d5286f6815542761dae92fdcdce8db1556727f
> > # good: [c3a008250272295271584c6303463ffb9b055cbc] read-cache: use freshen_shared_index() in read_index_from()
> > git bisect good c3a008250272295271584c6303463ffb9b055cbc
> > # good: [228b78752de9d759839665764391262c0ec156cf] Merge branch 'jt/perf-updates'
> > git bisect good 228b78752de9d759839665764391262c0ec156cf
> > # good: [073778017158ecf3153b050776029907bc75826f] Merge branch 'kn/ref-filter-branch-list'
> > git bisect good 073778017158ecf3153b050776029907bc75826f
> > # good: [b46013950aff31b6626af96ccbf2c48469e36c66] Documentation/git-update-index: explain splitIndex.*
> > git bisect good b46013950aff31b6626af96ccbf2c48469e36c66
> > # good: [32c43f595f93cdd4ed5305aef97a3f6aaa74ed72] Sync with 'maint'
> > git bisect good 32c43f595f93cdd4ed5305aef97a3f6aaa74ed72
> > # first bad commit: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
>
> Could you try with the following patch:
>
> http://public-inbox.org/git/20170330210354.20018-1-chriscool@tuxfamily.org/
Yeah, I tried with and without that patch with the same result.
Unless I'm screwing something up when testing I don't think this fixes
the issue unfortunately.
> Thanks,
> Christian.
^ permalink raw reply [relevance 0%]
* Re: [BUG] test suite broken with GIT_TEST_SPLIT_INDEX
2017-04-20 20:52 2% [BUG] test suite broken with GIT_TEST_SPLIT_INDEX Thomas Gummerer
@ 2017-04-20 21:03 0% ` Christian Couder
2017-04-20 21:24 0% ` Thomas Gummerer
0 siblings, 1 reply; 200+ results
From: Christian Couder @ 2017-04-20 21:03 UTC (permalink / raw)
To: Thomas Gummerer; +Cc: git
Hi,
On Thu, Apr 20, 2017 at 10:52 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:
> Hi,
>
> I just tried to run the test suite with GIT_TEST_SPLIT_INDEX=YesPlease
> and noticed that a few tests are broken both in pu and master.
>
> Below the test failures on master:
>
> Test Summary Report
> -------------------
> t7009-filter-branch-null-sha1.sh (Wstat: 256 Tests: 5 Failed: 2)
> Failed tests: 4-5
> Non-zero exit status: 1
> t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1)
> Failed test: 34
> Non-zero exit status: 1
> t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 4)
> Failed tests: 11-14
> Non-zero exit status: 1
> t3415-rebase-autosquash.sh (Wstat: 256 Tests: 19 Failed: 15)
> Failed tests: 4-17, 19
> Non-zero exit status: 1
> t3404-rebase-interactive.sh (Wstat: 256 Tests: 95 Failed: 54)
> Failed tests: 18, 20, 22-24, 26-43, 45, 47-74, 84-85
> Non-zero exit status: 1
>
> Bisecting between master and v2.10.0 leads me to the merge commit
> 94c9b5af70 ("Merge branch 'cc/split-index-config'", 2017-03-17).
>
> Unfortunately I don't forsee myself having time to track the bug down
> soon. Sorry for not noticing this earlier in the cycle.
>
> The bisect log is below if someone finds it helpful:
>
> git bisect start
> # bad: [6a2c2f8d34fa1e8f3bb85d159d354810ed63692e] Git 2.13-rc0
> git bisect bad 6a2c2f8d34fa1e8f3bb85d159d354810ed63692e
> # good: [6ebdac1bab966b720d776aa43ca188fe378b1f4b] Git 2.10
> git bisect good 6ebdac1bab966b720d776aa43ca188fe378b1f4b
> # good: [733671b0fd2fb03edb05273f36ec70bd624e544f] Merge branch 'maint'
> git bisect good 733671b0fd2fb03edb05273f36ec70bd624e544f
> # good: [04b4f7d579056cedaae2de0a019e5993b4d9c2d0] Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint
> git bisect good 04b4f7d579056cedaae2de0a019e5993b4d9c2d0
> # bad: [af6865a7f1e1d915d3b63e998226028ca4abb6ee] submodule.c: convert is_submodule_modified to use strbuf_getwholeline
> git bisect bad af6865a7f1e1d915d3b63e998226028ca4abb6ee
> # good: [3f7ebc6ece46f1c23480d094688b8b5f24eb345c] Merge branch 'jk/tempfile-ferror-fclose-confusion'
> git bisect good 3f7ebc6ece46f1c23480d094688b8b5f24eb345c
> # bad: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
> git bisect bad 94c9b5af703eb70adba349cfbfaaa3029849744c
> # good: [36d5286f6815542761dae92fdcdce8db1556727f] Merge branch 'ax/line-log-range-merge-fix'
> git bisect good 36d5286f6815542761dae92fdcdce8db1556727f
> # good: [c3a008250272295271584c6303463ffb9b055cbc] read-cache: use freshen_shared_index() in read_index_from()
> git bisect good c3a008250272295271584c6303463ffb9b055cbc
> # good: [228b78752de9d759839665764391262c0ec156cf] Merge branch 'jt/perf-updates'
> git bisect good 228b78752de9d759839665764391262c0ec156cf
> # good: [073778017158ecf3153b050776029907bc75826f] Merge branch 'kn/ref-filter-branch-list'
> git bisect good 073778017158ecf3153b050776029907bc75826f
> # good: [b46013950aff31b6626af96ccbf2c48469e36c66] Documentation/git-update-index: explain splitIndex.*
> git bisect good b46013950aff31b6626af96ccbf2c48469e36c66
> # good: [32c43f595f93cdd4ed5305aef97a3f6aaa74ed72] Sync with 'maint'
> git bisect good 32c43f595f93cdd4ed5305aef97a3f6aaa74ed72
> # first bad commit: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
Could you try with the following patch:
http://public-inbox.org/git/20170330210354.20018-1-chriscool@tuxfamily.org/
Thanks,
Christian.
^ permalink raw reply [relevance 0%]
* [BUG] test suite broken with GIT_TEST_SPLIT_INDEX
@ 2017-04-20 20:52 2% Thomas Gummerer
2017-04-20 21:03 0% ` Christian Couder
0 siblings, 1 reply; 200+ results
From: Thomas Gummerer @ 2017-04-20 20:52 UTC (permalink / raw)
To: Christian Couder; +Cc: git
Hi,
I just tried to run the test suite with GIT_TEST_SPLIT_INDEX=YesPlease
and noticed that a few tests are broken both in pu and master.
Below the test failures on master:
Test Summary Report
-------------------
t7009-filter-branch-null-sha1.sh (Wstat: 256 Tests: 5 Failed: 2)
Failed tests: 4-5
Non-zero exit status: 1
t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1)
Failed test: 34
Non-zero exit status: 1
t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 4)
Failed tests: 11-14
Non-zero exit status: 1
t3415-rebase-autosquash.sh (Wstat: 256 Tests: 19 Failed: 15)
Failed tests: 4-17, 19
Non-zero exit status: 1
t3404-rebase-interactive.sh (Wstat: 256 Tests: 95 Failed: 54)
Failed tests: 18, 20, 22-24, 26-43, 45, 47-74, 84-85
Non-zero exit status: 1
Bisecting between master and v2.10.0 leads me to the merge commit
94c9b5af70 ("Merge branch 'cc/split-index-config'", 2017-03-17).
Unfortunately I don't forsee myself having time to track the bug down
soon. Sorry for not noticing this earlier in the cycle.
The bisect log is below if someone finds it helpful:
git bisect start
# bad: [6a2c2f8d34fa1e8f3bb85d159d354810ed63692e] Git 2.13-rc0
git bisect bad 6a2c2f8d34fa1e8f3bb85d159d354810ed63692e
# good: [6ebdac1bab966b720d776aa43ca188fe378b1f4b] Git 2.10
git bisect good 6ebdac1bab966b720d776aa43ca188fe378b1f4b
# good: [733671b0fd2fb03edb05273f36ec70bd624e544f] Merge branch 'maint'
git bisect good 733671b0fd2fb03edb05273f36ec70bd624e544f
# good: [04b4f7d579056cedaae2de0a019e5993b4d9c2d0] Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint
git bisect good 04b4f7d579056cedaae2de0a019e5993b4d9c2d0
# bad: [af6865a7f1e1d915d3b63e998226028ca4abb6ee] submodule.c: convert is_submodule_modified to use strbuf_getwholeline
git bisect bad af6865a7f1e1d915d3b63e998226028ca4abb6ee
# good: [3f7ebc6ece46f1c23480d094688b8b5f24eb345c] Merge branch 'jk/tempfile-ferror-fclose-confusion'
git bisect good 3f7ebc6ece46f1c23480d094688b8b5f24eb345c
# bad: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
git bisect bad 94c9b5af703eb70adba349cfbfaaa3029849744c
# good: [36d5286f6815542761dae92fdcdce8db1556727f] Merge branch 'ax/line-log-range-merge-fix'
git bisect good 36d5286f6815542761dae92fdcdce8db1556727f
# good: [c3a008250272295271584c6303463ffb9b055cbc] read-cache: use freshen_shared_index() in read_index_from()
git bisect good c3a008250272295271584c6303463ffb9b055cbc
# good: [228b78752de9d759839665764391262c0ec156cf] Merge branch 'jt/perf-updates'
git bisect good 228b78752de9d759839665764391262c0ec156cf
# good: [073778017158ecf3153b050776029907bc75826f] Merge branch 'kn/ref-filter-branch-list'
git bisect good 073778017158ecf3153b050776029907bc75826f
# good: [b46013950aff31b6626af96ccbf2c48469e36c66] Documentation/git-update-index: explain splitIndex.*
git bisect good b46013950aff31b6626af96ccbf2c48469e36c66
# good: [32c43f595f93cdd4ed5305aef97a3f6aaa74ed72] Sync with 'maint'
git bisect good 32c43f595f93cdd4ed5305aef97a3f6aaa74ed72
# first bad commit: [94c9b5af703eb70adba349cfbfaaa3029849744c] Merge branch 'cc/split-index-config'
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Mar 2017, #06; Tue, 14)
@ 2017-03-14 23:39 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-14 23:39 UTC (permalink / raw)
To: git
Junio C Hamano <gitster@pobox.com> writes:
> Among the topics merged to 'master' since v2.12 was tagged, 40+ of
> them could be also merged to 'maint' (some of these are new features
> and by default should not be, though). Among them two are fixes for
> regressions found in v2.12:
>
> * The patch subcommand of "git add -i" was meant to have paths
> selection prompt just like other subcommand, unlike "git add -p"
> directly jumps to hunk selection. Recently, this was broken and
> "add -i" lost the paths selection dialog, but it now has been
> fixed.
> (merge c852bd54bd jk/add-i-patch-do-prompt later to maint).
>
> * Git v2.12 was shipped with an embarrassing breakage where various
> operations that verify paths given from the user stopped dying when
> seeing an issue, and instead later triggering segfault.
> (merge ce83eadd9a js/realpath-pathdup-fix later to maint).
>
> These two have been merged to 'master' only a few days ago;
> additional tests on 'master' to make sure they fix the issues, and
> more importantly they do not introduce new regressions, are greatly
> appreciated. I am hoping we can merge them (and probably others)
> to 'maint' to cut v2.12.1 by early next week.
Those who are curious what "probably others" are, a good place to
start is this list (refer to RelNotes on the 'master' for what they
are about):
jk/delta-chain-limit # 2 (2 weeks ago)
jk/grep-no-index-fix # 7 (2 weeks ago)
jn/remote-helpers-with-git-dir # 2 (2 weeks ago)
jk/show-branch-lift-name-len-limit # 3 (2 weeks ago)
jk/tempfile-ferror-fclose-confusion # 1 (2 weeks ago)
rl/remote-allow-missing-branch-name-merge # 1 (2 weeks ago)
dt/gc-ignore-old-gc-logs # 1 (2 weeks ago)
jc/config-case-cmdline-take-2 # 2 (4 days ago)
jk/ident-empty # 4 (4 days ago)
jt/upload-pack-error-report # 1 (4 days ago)
rs/sha1-file-plug-fallback-base-leak # 1 (4 days ago)
jt/http-base-url-update-upon-redirect # 1 (4 days ago)
jk/add-i-patch-do-prompt # 1 (2 days ago)
js/realpath-pathdup-fix # 2 (2 days ago)
ss/remote-bzr-hg-placeholder-wo-python # 1 (2 days ago)
ax/line-log-range-merge-fix # 1 (2 days ago)
vn/line-log-memcpy-size-fix # 1 (2 days ago)
jc/diff-populate-filespec-size-only-fix # 1 (2 days ago)
ab/cond-skip-tests # 3 (75 minutes ago)
jk/interpret-branch-name # 9 (75 minutes ago)
mm/fetch-show-error-message-on-unadvertised-object # 3 (75 minutes ago)
dp/filter-branch-prune-empty # 4 (75 minutes ago)
ew/http-alternates-as-redirects-warning # 2 (75 minutes ago)
jk/push-deadlock-regression-fix # 6 (75 minutes ago)
mm/two-more-xstrfmt # 2 (2 weeks ago)
ps/docs-diffcore # 2 (4 days ago)
ew/markdown-url-in-readme # 1 (4 days ago)
rj/remove-unused-mktemp # 2 (4 days ago)
jk/ewah-use-right-type-in-sizeof # 1 (2 days ago)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #05; Mon, 13)
@ 2017-03-13 22:43 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-13 22:43 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A handful of topics are ready to be merged to 'next'. Giving them a
final round of reviewing and testing is greatly appreciated:
- bc/object-id
- bw/attr-pathspec
- js/early-config
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 5dfa78423a)
+ Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at 201073f113)
+ line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 9b2d1ca50f)
+ diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
(merged to 'next' on 2017-03-10 at 8a1aa07def)
+ mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 891ec6f5ba)
+ add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at ad66adacda)
+ ewah: fix eword_t/uint64_t confusion
Code clean-up.
* js/realpath-pathdup-fix (2017-03-08) 2 commits
(merged to 'next' on 2017-03-10 at 5a84dbbd1d)
+ real_pathdup(): fix callsites that wanted it to die on error
+ t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
... and then to down to 'maint'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at c8c4bb78a2)
+ contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 2e65ff89b7)
+ line-log: use COPY_ARRAY to fix mis-sized memcpy
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.
--------------------------------------------------
[New Topics]
* ab/ref-filter-no-contains (2017-03-11) 1 commit
- ref-filter: add --no-contains option to tag/branch/for-each-ref
(this branch uses jk/ref-filter-flags-cleanup.)
"git tag/branch/for-each-ref" family of commands long allowed to
filter the refs by "--contains X" (show only the refs that are
descendants of X), "--merged X" (show only the refs that are
ancestors of X), "--no-merged X" (show only the refs that are not
ancestors of X). One curious omission, "--no-contains X" (show
only the refs that are not descendants of X) has been added to
them.
Expecting a reroll.
cf. <CACBZZX4v49zfyGVpcxGSKsxbMfVaUcGHtitpfaZMUtG82YzW-g@mail.gmail.com>
The topic is almost there.
* bc/sha1-header-selection-with-cpp-macros (2017-03-11) 1 commit
- Move SHA-1 implementation selection into a header file
Our source code has used the SHA1_HEADER cpp macro after "#include"
in the C code to switch among the SHA-1 implementations. Instead,
list the exact header file names and switch among implementations
using "#ifdef BLK_SHA1/#include "block-sha1/sha1.h"/.../#endif";
this helps some IDE tools.
Expecting a reroll.
* bw/attr-pathspec (2017-03-13) 2 commits
- pathspec: allow escaped query values
- pathspec: allow querying for attributes
The pathspec mechanism learned to further limit the paths that
match the pattern to those that have specified attributes attached
via the gitattributes mechanism.
Will merge to 'next'.
* jk/http-walker-buffer-underflow-fix (2017-03-13) 1 commit
- http-walker: fix buffer underflow processing remote alternates
"Dumb http" transport used to misparse a nonsense http-alternates
response, which has been fixed.
Will merge to 'next'.
* rs/blame-code-cleanup (2017-03-11) 1 commit
(merged to 'next' on 2017-03-12 at 8fd4bf325a)
+ blame: move blame_entry duplication to add_blame_entry()
Code clean-up.
Will merge to 'master'.
* dl/credential-cache-socket-in-xdg-cache (2017-03-13) 1 commit
- path.c: add xdg_cache_home
The default location "~/.git-credential-cache/socket" for the
socket used to communicate with the credential-cache daemon has
been moved to "~/.cache/git/credential/socket".
Waiting for a reroll.
The patches do not yet match the above description without
the second one that is not queued here.
--------------------------------------------------
[Stalled]
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* jk/ref-filter-flags-cleanup (2017-03-10) 4 commits
- ref-filter: use separate cache for contains_tag_algo
- ref-filter: die on parse_commit errors
- ref-filter: use contains_result enum consistently
- ref-filter: move ref_cbdata definition into ref-filter.c
(this branch is used by ab/ref-filter-no-contains.)
"git tag --contains" used to (ab)use the object bits to keep track
of the state of object reachability without clearing them after
use; this has been cleaned up and made to use the newer commit-slab
facility.
Will merge to 'next'.
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
(merged to 'next' on 2017-03-10 at 23be072a07)
+ http: release strbuf on disabled alternates
+ http: inform about alternates-as-redirects behavior
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
Will merge to 'master'.
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
(merged to 'next' on 2017-03-10 at ceb0b819bf)
+ send-pack: report signal death of pack-objects
+ send-pack: read "unpack" status even on pack-objects failure
+ send-pack: improve unpack-status error messages
+ send-pack: use skip_prefix for parsing unpack status
+ send-pack: extract parsing of "unpack" response
+ receive-pack: fix deadlock when we cannot create tmpdir
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.
Will merge to 'master'.
* kn/ref-filter-branch-list (2017-03-10) 1 commit
(merged to 'next' on 2017-03-10 at 73b43443f1)
+ branch: honor --abbrev/--no-abbrev in --list mode
"git branch --list" takes the "--abbrev" and "--no-abbrev" options
to control the output of the object name in its "-v"(erbose)
output, but a recent update started ignoring them; this fixes it
before the breakage reaches to any released version.
Will merge to 'master'.
* sb/rev-parse-show-superproject-root (2017-03-08) 1 commit
- rev-parse: add --show-superproject-working-tree
From a working tree of a repository, a new option of "rev-parse"
lets you ask if the repository is used as a submodule of another
project, and where the root level of the working tree of that
project (i.e. your superproject) is.
Almost there, but documentation needs a bit more work.
* ls/filter-process-delayed (2017-03-06) 1 commit
- convert: add "status=delayed" to filter process protocol
What's the status of this one???
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
* js/early-config (2017-03-13) 12 commits
- setup.c: mention unresolved problems
- t1309: document cases where we would want early config not to die()
- setup_git_directory_gently_1(): avoid die()ing
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: introduce the discover_git_directory() function
- setup_git_directory_1(): avoid changing global state
- setup: do not append '/' to root in setup_discovered_git_dir()
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Will merge to 'next'.
* jt/perf-updates (2017-03-03) 3 commits
(merged to 'next' on 2017-03-10 at 0c0b124ed4)
+ t/perf: add fallback for pre-bin-wrappers versions of git
+ t/perf: use $MODERN_GIT for all repo-copying steps
+ t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'master'.
* jk/interpret-branch-name (2017-03-02) 9 commits
(merged to 'next' on 2017-03-10 at 95cc55f9a3)
+ checkout: restrict @-expansions when finding branch
+ strbuf_check_ref_format(): expand only local branches
+ branch: restrict @-expansions when deleting
+ t3204: test git-branch @-expansion corner cases
+ interpret_branch_name: allow callers to restrict expansions
+ strbuf_branchname: add docstring
+ strbuf_branchname: drop return value
+ interpret_branch_name: move docstring to header file
+ interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'master'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 4cb69d0f77)
+ Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
Retracted?
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* nd/conditional-config-include (2017-03-11) 3 commits
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* cc/split-index-config (2017-03-06) 22 commits
(merged to 'next' on 2017-03-12 at 53cdc2016d)
+ Documentation/git-update-index: explain splitIndex.*
+ Documentation/config: add splitIndex.sharedIndexExpire
+ read-cache: use freshen_shared_index() in read_index_from()
+ read-cache: refactor read_index_from()
+ t1700: test shared index file expiration
+ read-cache: unlink old sharedindex files
+ config: add git_config_get_expiry() from gc.c
+ read-cache: touch shared index files when used
+ sha1_file: make check_and_freshen_file() non static
+ Documentation/config: add splitIndex.maxPercentChange
+ t1700: add tests for splitIndex.maxPercentChange
+ read-cache: regenerate shared index if necessary
+ config: add git_config_get_max_percent_split_change()
+ Documentation/git-update-index: talk about core.splitIndex config var
+ Documentation/config: add information for core.splitIndex
+ t1700: add tests for core.splitIndex
+ update-index: warn in case of split-index incoherency
+ read-cache: add and then use tweak_split_index()
+ split-index: add {add,remove}_split_index() functions
+ config: add git_config_get_split_index()
+ t1700: change here document style
+ config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
Will merge to 'master'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
(merged to 'next' on 2017-03-10 at 9317e24cd3)
+ p7000: add test for filter-branch with --prune-empty
+ filter-branch: fix --prune-empty on parentless commits
+ t7003: ensure --prune-empty removes entire branch when applicable
+ t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'master'.
* ab/cond-skip-tests (2017-03-01) 3 commits
(merged to 'next' on 2017-03-10 at 38124fb5ce)
+ gitweb tests: skip tests when we don't have Time::HiRes
+ gitweb tests: change confusing "skip_all" phrasing
+ cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'master'.
* jk/interop-test (2017-03-10) 2 commits
(merged to 'next' on 2017-03-12 at 704b328022)
+ t/interop: add test of old clients against modern git-daemon
+ t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Will merge to 'master'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Expecting a reroll.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
(merged to 'next' on 2017-03-10 at 69e2023804)
+ fetch-pack: add specific error for fetching an unadvertised object
+ fetch_refs_via_pack: call report_unmatched_refs
+ fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'master'.
* sb/checkout-recurse-submodules (2017-03-11) 18 commits
- submodule--helper.c: remove duplicate code
- builtin/read-tree: add --recurse-submodules switch
- builtin/checkout: add --recurse-submodules switch
- entry.c: create submodules when interesting
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: replace sha1 by hash
- lib-submodule-update: teach test_submodule_content the -C <dir> flag
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Will merge to 'next'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #04; Fri, 10)
@ 2017-03-10 23:03 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-10 23:03 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ew/markdown-url-in-readme (2017-03-01) 1 commit
(merged to 'next' on 2017-03-03 at 3d35e3a991)
+ README: create HTTP/HTTPS links from URLs in Markdown
Doc update.
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
(merged to 'next' on 2017-03-01 at 2e9920eeeb)
+ config: use git_config_parse_key() in git_config_parse_parameter()
+ config: move a few helper functions up
The code to parse "git -c VAR=VAL cmd" and set configuration
variable for the duration of cmd had two small bugs, which have
been fixed.
This supersedes jc/config-case-cmdline topic that has been discarded.
* jh/send-email-one-cc (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 32c0e6ad88)
+ send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
* jk/http-auth (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 87f81b4395)
+ http: add an "auto" mode for http.emptyauth
+ http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
* jk/ident-empty (2017-02-23) 4 commits
(merged to 'next' on 2017-03-01 at ff80031ce6)
+ ident: do not ignore empty config name/email
+ ident: reject all-crud ident name
+ ident: handle NULL email when complaining of empty name
+ ident: mark error messages for translation
user.email that consists of only cruft chars should consistently
error out, but didn't.
* jk/parse-config-key-cleanup (2017-02-24) 3 commits
(merged to 'next' on 2017-03-01 at e531d8d3a9)
+ parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ parse_config_key: allow matching single-level config
+ parse_config_key: use skip_prefix instead of starts_with
(this branch uses sb/parse-hide-refs-config-cleanup.)
The "parse_config_key()" API function has been cleaned up.
* jk/t6300-cleanup (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 3087521bea)
+ t6300: avoid creating refs/heads/HEAD
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.
* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 5225bd3ef8)
+ http: attempt updating base URL only if no error
When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.
* jt/upload-pack-error-report (2017-02-23) 1 commit
(merged to 'next' on 2017-03-01 at aea583dbe5)
+ upload-pack: report "not our ref" to client
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
* ps/docs-diffcore (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 9ca5691de2)
+ docs/diffcore: unquote "Complete Rewrites" in headers
+ docs/diffcore: fix grammar in diffcore-rename header
Doc update.
* rj/remove-unused-mktemp (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 4512f0c5ab)
+ wrapper.c: remove unused gitmkstemps() function
+ wrapper.c: remove unused git_mkstemp() function
Code cleanup.
* rs/commit-parsing-optim (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 22239f35df)
+ commit: don't check for space twice when looking for header
+ commit: be more precise when searching for headers
The code that parses header fields in the commit object has been
updated for (micro)performance and code hygiene.
* rs/log-email-subject (2017-03-01) 2 commits
(merged to 'next' on 2017-03-03 at a2ecc84866)
+ pretty: use fmt_output_email_subject()
+ log-tree: factor out fmt_output_email_subject()
Code clean-up.
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 03344b1119)
+ sha1_file: release fallback base's memory in unpack_entry()
A leak in a codepath to read from a packed object in (rare) cases
has been plugged.
* rs/strbuf-add-real-path (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 69191becd6)
+ strbuf: add strbuf_add_real_path()
+ cocci: use ALLOC_ARRAY
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
(merged to 'next' on 2017-03-01 at fd722ba039)
+ refs: parse_hide_refs_config to use parse_config_key
(this branch is used by jk/parse-config-key-cleanup.)
Code clean-up.
* sb/submodule-init-url-selection (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 847d1f9a91)
+ submodule init: warn about falling back to a local path
When "git submodule init" decides that the submodule in the working
tree is its upstream, it now gives a warning as it is not a very
common setup.
* tg/stash-push (2017-02-28) 6 commits
(merged to 'next' on 2017-03-03 at b50fda0389)
+ stash: allow pathspecs in the no verb form
+ stash: use stash_push for no verb form
+ stash: teach 'push' (and 'create_stash') to honor pathspec
+ stash: refactor stash_create
+ stash: add test for the create command line arguments
+ stash: introduce push verb
"git stash save" takes a pathspec so that the local changes can be
stashed away only partially.
--------------------------------------------------
[New Topics]
* jk/ref-filter-flags-cleanup (2017-03-10) 4 commits
- ref-filter: use separate cache for contains_tag_algo
- ref-filter: die on parse_commit errors
- ref-filter: use contains_result enum consistently
- ref-filter: move ref_cbdata definition into ref-filter.c
"git tag --contains" used to (ab)use the object bits to keep track
of the state of object reachability without clearing them after
use; this has been cleaned up and made to use the newer commit-slab
facility.
--------------------------------------------------
[Stalled]
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
(merged to 'next' on 2017-03-10 at 23be072a07)
+ http: release strbuf on disabled alternates
+ http: inform about alternates-as-redirects behavior
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
Will merge to 'master'.
* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at ad66adacda)
+ ewah: fix eword_t/uint64_t confusion
Code clean-up.
Will merge to 'master'.
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
(merged to 'next' on 2017-03-10 at ceb0b819bf)
+ send-pack: report signal death of pack-objects
+ send-pack: read "unpack" status even on pack-objects failure
+ send-pack: improve unpack-status error messages
+ send-pack: use skip_prefix for parsing unpack status
+ send-pack: extract parsing of "unpack" response
+ receive-pack: fix deadlock when we cannot create tmpdir
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.
Will merge to 'master'.
* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 2e65ff89b7)
+ line-log: use COPY_ARRAY to fix mis-sized memcpy
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.
Will merge to 'master'.
* js/realpath-pathdup-fix (2017-03-08) 2 commits
(merged to 'next' on 2017-03-10 at 5a84dbbd1d)
+ real_pathdup(): fix callsites that wanted it to die on error
+ t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
Will merge to 'master'.
... and then to down to 'maint'.
* kn/ref-filter-branch-list (2017-03-10) 1 commit
(merged to 'next' on 2017-03-10 at 73b43443f1)
+ branch: honor --abbrev/--no-abbrev in --list mode
"git branch --list" takes the "--abbrev" and "--no-abbrev" options
to control the output of the object name in its "-v"(erbose)
output, but a recent update started ignoring them; this fixes it
before the breakage reaches to any released version.
Will merge to 'master'.
* sb/rev-parse-show-superproject-root (2017-03-08) 1 commit
- rev-parse: add --show-superproject-working-tree
From a working tree of a repository, a new option of "rev-parse"
lets you ask if the repository is used as a submodule of another
project, and where the root level of the working tree of that
project (i.e. your superproject) is.
Almost there, but documentation needs a bit more work.
* ls/filter-process-delayed (2017-03-06) 1 commit
- convert: add "status=delayed" to filter process protocol
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 891ec6f5ba)
+ add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
Will merge to 'master'.
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at 201073f113)
+ line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
Will merge to 'master'.
* js/early-config (2017-03-10) 11 commits
- t1309: document cases where we would want early config not to die()
- setup_git_directory_gently_1(): avoid die()ing
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: introduce the discover_git_directory() function
- setup_git_directory_1(): avoid changing global state
- setup: prepare setup_discovered_git_directory() the root directory
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Almost perfect.
cf. <xmqqefy5yn4k.fsf@gitster.mtv.corp.google.com>
cf. <xmqq4lz1ylgv.fsf@gitster.mtv.corp.google.com>
* jt/perf-updates (2017-03-03) 3 commits
(merged to 'next' on 2017-03-10 at 0c0b124ed4)
+ t/perf: add fallback for pre-bin-wrappers versions of git
+ t/perf: use $MODERN_GIT for all repo-copying steps
+ t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'master'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
(merged to 'next' on 2017-03-10 at c8c4bb78a2)
+ contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
Will merge to 'master'.
* jk/interpret-branch-name (2017-03-02) 9 commits
(merged to 'next' on 2017-03-10 at 95cc55f9a3)
+ checkout: restrict @-expansions when finding branch
+ strbuf_check_ref_format(): expand only local branches
+ branch: restrict @-expansions when deleting
+ t3204: test git-branch @-expansion corner cases
+ interpret_branch_name: allow callers to restrict expansions
+ strbuf_branchname: add docstring
+ strbuf_branchname: drop return value
+ interpret_branch_name: move docstring to header file
+ interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'master'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-06) 1 commit
(merged to 'next' on 2017-03-10 at 4cb69d0f77)
+ Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 9b2d1ca50f)
+ diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
Will merge to 'master'.
* nd/conditional-config-include (2017-03-03) 5 commits
- SQUASH??? cond config include test
- SQUASH???
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* cc/split-index-config (2017-03-06) 22 commits
- Documentation/git-update-index: explain splitIndex.*
- Documentation/config: add splitIndex.sharedIndexExpire
- read-cache: use freshen_shared_index() in read_index_from()
- read-cache: refactor read_index_from()
- t1700: test shared index file expiration
- read-cache: unlink old sharedindex files
- config: add git_config_get_expiry() from gc.c
- read-cache: touch shared index files when used
- sha1_file: make check_and_freshen_file() non static
- Documentation/config: add splitIndex.maxPercentChange
- t1700: add tests for splitIndex.maxPercentChange
- read-cache: regenerate shared index if necessary
- config: add git_config_get_max_percent_split_change()
- Documentation/git-update-index: talk about core.splitIndex config var
- Documentation/config: add information for core.splitIndex
- t1700: add tests for core.splitIndex
- update-index: warn in case of split-index incoherency
- read-cache: add and then use tweak_split_index()
- split-index: add {add,remove}_split_index() functions
- config: add git_config_get_split_index()
- t1700: change here document style
- config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
Will merge to 'next'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
(merged to 'next' on 2017-03-10 at 9317e24cd3)
+ p7000: add test for filter-branch with --prune-empty
+ filter-branch: fix --prune-empty on parentless commits
+ t7003: ensure --prune-empty removes entire branch when applicable
+ t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'master'.
* ab/cond-skip-tests (2017-03-01) 3 commits
(merged to 'next' on 2017-03-10 at 38124fb5ce)
+ gitweb tests: skip tests when we don't have Time::HiRes
+ gitweb tests: change confusing "skip_all" phrasing
+ cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'master'.
* jk/interop-test (2017-03-10) 2 commits
- t/interop: add test of old clients against modern git-daemon
- t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Will merge to 'next'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Needs review.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
(merged to 'next' on 2017-03-10 at 5dfa78423a)
+ Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
Will merge to 'master'.
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
(merged to 'next' on 2017-03-10 at 69e2023804)
+ fetch-pack: add specific error for fetching an unadvertised object
+ fetch_refs_via_pack: call report_unmatched_refs
+ fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'master'.
* sb/checkout-recurse-submodules (2017-03-10) 19 commits
- submodule--helper.c: remove duplicate code
- builtin/read-tree: add --recurse-submodules switch
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
- read-cache, remove_marked_cache_entries: wipe selected submodules.
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: replace sha1 by hash
- lib-submodule-update: teach test_submodule_content the -C <dir> flag
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Now at v5.
cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
(merged to 'next' on 2017-03-10 at 8a1aa07def)
+ mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
Will merge to 'master'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #03; Wed, 8)
@ 2017-03-08 23:47 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-08 23:47 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
- http: release strbuf on disabled alternates
- http: inform about alternates-as-redirects behavior
Recent versions of Git treats http alternates (used in dumb http
transport) just like HTTP redirects and requires the client to
enable following it, due to security concerns. But we forgot to
give a warning when we decide not to honor the alternates.
Will merge to 'next'.
* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
- ewah: fix eword_t/uint64_t confusion
Code clean-up.
Will merge to 'next'.
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
- send-pack: report signal death of pack-objects
- send-pack: read "unpack" status even on pack-objects failure
- send-pack: improve unpack-status error messages
- send-pack: use skip_prefix for parsing unpack status
- send-pack: extract parsing of "unpack" response
- receive-pack: fix deadlock when we cannot create tmpdir
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.
Will merge to 'next'.
* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
- line-log: use COPY_ARRAY to fix mis-sized memcpy
The command-line parsing of "git log -L" copied internal data
structures using incorrect size on ILP32 systems.
Will merge to 'next'.
* js/realpath-pathdup-fix (2017-03-08) 2 commits
- real_pathdup(): fix callsites that wanted it to die on error
- t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
Will merge to 'next' and then to 'master', eventually down to 'maint'.
* kn/ref-filter-branch-list (2017-03-08) 1 commit
- branch: honor --abbrev/--no-abbrev in --list mode
"git branch --list" takes the "--abbrev" and "--no-abbrev" options
to control the output of the object name in its "-v"(erbose)
output, but a recent update started ignoring them; this fixes it
before the breakage reaches to any released version.
Will merge to 'next'.
* sb/rev-parse-show-superproject-root (2017-03-08) 1 commit
- rev-parse: add --show-superproject-working-tree
From a working tree of a repository, a new option of "rev-parse"
lets you ask if the repository is used as a submodule of another
project, and where the root level of the working tree of that
project (i.e. your superproject) is.
Almost there, but documentation needs a bit more work.
--------------------------------------------------
[Stalled]
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ls/filter-process-delayed (2017-03-06) 1 commit
- convert: add "status=delayed" to filter process protocol
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
* ew/markdown-url-in-readme (2017-03-01) 1 commit
(merged to 'next' on 2017-03-03 at 3d35e3a991)
+ README: create HTTP/HTTPS links from URLs in Markdown
Doc update.
Will merge to 'master'.
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
- add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
Will merge to 'next'.
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
- line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
Will merge to 'next'.
* js/early-config (2017-03-07) 10 commits
- setup_git_directory_gently_1(): avoid die()ing
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: introduce the discover_git_directory() function
- setup_git_directory_1(): avoid changing global state
- setup: prepare setup_discovered_git_directory() the root directory
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Will merge to 'next' after waiting for a few days.
* jt/perf-updates (2017-03-03) 3 commits
- t/perf: add fallback for pre-bin-wrappers versions of git
- t/perf: use $MODERN_GIT for all repo-copying steps
- t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'next'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
- contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
Will merge to 'next'.
* jk/interpret-branch-name (2017-03-02) 9 commits
- checkout: restrict @-expansions when finding branch
- strbuf_check_ref_format(): expand only local branches
- branch: restrict @-expansions when deleting
- t3204: test git-branch @-expansion corner cases
- interpret_branch_name: allow callers to restrict expansions
- strbuf_branchname: add docstring
- strbuf_branchname: drop return value
- interpret_branch_name: move docstring to header file
- interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'next'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-06) 1 commit
- Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'next'.
* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 5225bd3ef8)
+ http: attempt updating base URL only if no error
When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* ps/docs-diffcore (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 9ca5691de2)
+ docs/diffcore: unquote "Complete Rewrites" in headers
+ docs/diffcore: fix grammar in diffcore-rename header
Doc update.
Will merge to 'master'.
* rj/remove-unused-mktemp (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 4512f0c5ab)
+ wrapper.c: remove unused gitmkstemps() function
+ wrapper.c: remove unused git_mkstemp() function
Code cleanup.
Will merge to 'master'.
* sb/submodule-init-url-selection (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 847d1f9a91)
+ submodule init: warn about falling back to a local path
Give a warning when "git submodule init" decides that the submodule
in the working tree is its upstream, as it is not a very common
setup.
Will merge to 'master'.
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
- diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
Will merge to 'next'.
* nd/conditional-config-include (2017-03-03) 5 commits
- SQUASH??? cond config include test
- SQUASH???
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* rs/log-email-subject (2017-03-01) 2 commits
(merged to 'next' on 2017-03-03 at a2ecc84866)
+ pretty: use fmt_output_email_subject()
+ log-tree: factor out fmt_output_email_subject()
Code clean-up.
Will merge to 'master'.
* cc/split-index-config (2017-03-06) 22 commits
- Documentation/git-update-index: explain splitIndex.*
- Documentation/config: add splitIndex.sharedIndexExpire
- read-cache: use freshen_shared_index() in read_index_from()
- read-cache: refactor read_index_from()
- t1700: test shared index file expiration
- read-cache: unlink old sharedindex files
- config: add git_config_get_expiry() from gc.c
- read-cache: touch shared index files when used
- sha1_file: make check_and_freshen_file() non static
- Documentation/config: add splitIndex.maxPercentChange
- t1700: add tests for splitIndex.maxPercentChange
- read-cache: regenerate shared index if necessary
- config: add git_config_get_max_percent_split_change()
- Documentation/git-update-index: talk about core.splitIndex config var
- Documentation/config: add information for core.splitIndex
- t1700: add tests for core.splitIndex
- update-index: warn in case of split-index incoherency
- read-cache: add and then use tweak_split_index()
- split-index: add {add,remove}_split_index() functions
- config: add git_config_get_split_index()
- t1700: change here document style
- config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
I think this is almost ready for 'next'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
- p7000: add test for filter-branch with --prune-empty
- filter-branch: fix --prune-empty on parentless commits
- t7003: ensure --prune-empty removes entire branch when applicable
- t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'next'.
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
(merged to 'next' on 2017-03-01 at 2e9920eeeb)
+ config: use git_config_parse_key() in git_config_parse_parameter()
+ config: move a few helper functions up
The code to parse "git -c VAR=VAL cmd" and set configuration
variable for the duration of cmd had two small bugs, which have
been fixed.
Will merge to 'master'.
This supersedes jc/config-case-cmdline topic that has been discarded.
* ab/cond-skip-tests (2017-03-01) 3 commits
- gitweb tests: skip tests when we don't have Time::HiRes
- gitweb tests: change confusing "skip_all" phrasing
- cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'next'.
* jk/interop-test (2017-02-27) 2 commits
- t/interop: add test of old clients against modern git-daemon
- t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Needs review.
* jk/parse-config-key-cleanup (2017-02-24) 3 commits
(merged to 'next' on 2017-03-01 at e531d8d3a9)
+ parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ parse_config_key: allow matching single-level config
+ parse_config_key: use skip_prefix instead of starts_with
(this branch uses sb/parse-hide-refs-config-cleanup.)
The "parse_config_key()" API function has been cleaned up.
Will merge to 'master'.
* jk/t6300-cleanup (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 3087521bea)
+ t6300: avoid creating refs/heads/HEAD
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.
Will merge to 'master'.
* rs/commit-parsing-optim (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 22239f35df)
+ commit: don't check for space twice when looking for header
+ commit: be more precise when searching for headers
The code that parses header fields in the commit object has been
updated for (micro)performance and code hygiene.
Will merge to 'master'.
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 03344b1119)
+ sha1_file: release fallback base's memory in unpack_entry()
A leak in a codepath to read from a packed object in (rare) cases
has been plugged.
Will merge to 'master'.
* rs/strbuf-add-real-path (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 69191becd6)
+ strbuf: add strbuf_add_real_path()
+ cocci: use ALLOC_ARRAY
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
Will merge to 'master'.
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
(merged to 'next' on 2017-03-01 at fd722ba039)
+ refs: parse_hide_refs_config to use parse_config_key
(this branch is used by jk/parse-config-key-cleanup.)
Code clean-up.
Will merge to 'master'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Needs review.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* jh/send-email-one-cc (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 32c0e6ad88)
+ send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
Will merge to 'master'.
* jk/http-auth (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 87f81b4395)
+ http: add an "auto" mode for http.emptyauth
+ http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
Will merge to 'master'.
* jk/ident-empty (2017-02-23) 4 commits
(merged to 'next' on 2017-03-01 at ff80031ce6)
+ ident: do not ignore empty config name/email
+ ident: reject all-crud ident name
+ ident: handle NULL email when complaining of empty name
+ ident: mark error messages for translation
user.email that consists of only cruft chars should consistently
error out, but didn't.
Will merge to 'master'.
* jt/upload-pack-error-report (2017-02-23) 1 commit
(merged to 'next' on 2017-03-01 at aea583dbe5)
+ upload-pack: report "not our ref" to client
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
Will merge to 'master'.
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
- Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
Will merge to 'next'.
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
- fetch-pack: add specific error for fetching an unadvertised object
- fetch_refs_via_pack: call report_unmatched_refs
- fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'next'.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* sb/checkout-recurse-submodules (2017-03-07) 18 commits
- builtin/read-tree: add --recurse-submodules switch
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
- read-cache, remove_marked_cache_entries: wipe selected submodules.
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: replace sha1 by hash
- lib-submodule-update: teach test_submodule_content the -C <dir> flag
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
* tg/stash-push (2017-02-28) 6 commits
(merged to 'next' on 2017-03-03 at b50fda0389)
+ stash: allow pathspecs in the no verb form
+ stash: use stash_push for no verb form
+ stash: teach 'push' (and 'create_stash') to honor pathspec
+ stash: refactor stash_create
+ stash: add test for the create command line arguments
+ stash: introduce push verb
Allow "git stash" to take pathspec so that the local changes can be
stashed away only partially.
Will merge to 'master'.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Now at v5.
cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
- mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
Will merge to 'next'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2017, #02; Fri, 3)
@ 2017-03-03 23:26 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2017-03-03 23:26 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ew/markdown-url-in-readme (2017-03-01) 1 commit
(merged to 'next' on 2017-03-03 at 3d35e3a991)
+ README: create HTTP/HTTPS links from URLs in Markdown
Doc update.
Will merge to 'master'.
* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
- add--interactive: fix missing file prompt for patch mode with "-i"
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection. Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.
Will merge to 'next'.
* ax/line-log-range-merge-fix (2017-03-03) 1 commit
- line-log.c: prevent crash during union of too many ranges
The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.
Will merge to 'next'.
* js/early-config (2017-03-03) 11 commits
- t1309: test read_early_config()
- read_early_config(): really discover .git/
- read_early_config(): avoid .git/config hack when unneeded
- setup: make read_early_config() reusable
- setup: export the discover_git_directory() function
- SQUASH??? ERROR: trailing statements should be on next line
- setup_git_directory_1(): avoid changing global state
- setup: prepare setup_discovered_git_directory() the root directory
- SQUASH??? ERROR: trailing statements should be on next line
- setup_git_directory(): use is_dir_sep() helper
- t7006: replace dubious test
The start-up sequence of "git" needs to figure out some configured
settings before it finds and set itself up in the location of the
repository and was quite messy due to its "chicken-and-egg" nature.
The code has been restructured.
Will merge to 'next' after squashing niggle-fixes in.
* jt/perf-updates (2017-03-03) 3 commits
- t/perf: add fallback for pre-bin-wrappers versions of git
- t/perf: use $MODERN_GIT for all repo-copying steps
- t/perf: export variable used in other blocks
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
Will merge to 'next'.
* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
- contrib: git-remote-{bzr,hg} placeholders don't need Python
There is no need for Python only to give a few messages to the
standard error stream, but we somehow did.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* nd/worktree-move (2017-01-27) 7 commits
. fixup! worktree move: new command
. worktree remove: new command
. worktree move: refuse to move worktrees with submodules
. worktree move: accept destination as directory
. worktree move: new command
. worktree.c: add update_worktree_location()
. worktree.c: add validate_worktree()
"git worktree" learned move and remove subcommands.
Tentatively ejected as it seems to break 'pu' when merged.
* pb/bisect (2017-02-18) 28 commits
- fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: `bisect_replay` shell function in C
- bisect--helper: `bisect_log` shell function in C
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: `bisect_state` & `bisect_head` shell function in C
- bisect--helper: `bisect_autostart` shell function in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
- t6030: no cleanup with bad merge base
- bisect--helper: `bisect_start` shell function partially in C
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
- bisect--helper: `bisect_next_check` & bisect_voc shell function in C
- bisect--helper: `check_and_set_terms` shell function in C
- bisect--helper: `bisect_write` shell function in C
- bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- bisect--helper: `bisect_reset` shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- t6030: explicitly test for bisection cleanup
- bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Move more parts of "git bisect" to C.
Expecting a reroll.
cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
* ls/filter-process-delayed (2017-01-08) 1 commit
. convert: add "status=delayed" to filter process protocol
Ejected, as does not build when merged to 'pu'.
* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
- grep: use '/' delimiter for paths
- grep: only add delimiter if there isn't one already
"git grep", when fed a tree-ish as an input, shows each hit
prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
almost always either a commit or a tag that points at a commit, the
early part of the output "<tree-ish>:<path>" can be used as the
name of the blob and given to "git show". When <tree-ish> is a
tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
"<commit>:<dir>"), however, this results in a string that does not
name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
"git grep" has been taught to be a bit more intelligent about these
cases and omit a colon (in the former case) or use slash (in the
latter case) to produce "<commit>:<path>" and
"<commit>:<dir>/<path>" that can be used as the name of a blob.
Expecting a reroll? Is this good enough with known limitations?
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* jk/interpret-branch-name (2017-03-02) 9 commits
- checkout: restrict @-expansions when finding branch
- strbuf_check_ref_format(): expand only local branches
- branch: restrict @-expansions when deleting
- t3204: test git-branch @-expansion corner cases
- interpret_branch_name: allow callers to restrict expansions
- strbuf_branchname: add docstring
- strbuf_branchname: drop return value
- interpret_branch_name: move docstring to header file
- interpret_branch_name(): handle auto-namelen for @{-1}
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
Will merge to 'next'.
* jk/sha1dc (2017-03-01) 7 commits
- Put sha1dc on a diet
- sha1dc: avoid 'for' loop initial decl
- sha1dc: resurrect LICENSE file
- sha1dc: avoid c99 declaration-after-statement
- Makefile: add USE_SHA1DC knob
- sha1dc: adjust header includes for git
- add collision-detecting sha1 implementation
Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
Expecting a cleaned-up reroll after discussion settles.
cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
* js/travis-32bit-linux (2017-03-03) 1 commit
- Travis: also test on 32-bit Linux
Add 32-bit Linux variant to the set of platforms to be tested with
Travis CI.
Will merge to 'next'.
* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 5225bd3ef8)
+ http: attempt updating base URL only if no error
When a redirected http transport gets an error during the
redirected request, we ignored the error we got from the server,
and ended up giving a not-so-useful error message.
Will merge to 'master'.
* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
- upload-pack: compute blob reachability correctly
- revision: exclude trees/blobs given commit
- revision: unify {tree,blob}_objects in rev_info
The revision/object traversal machinery did not mark all tree and
blob objects that are contained in an uninteresting commit as
uninteresting, because that is quite costly. Instead, it only
marked those that are contained in an uninteresting boundary commit
as uninteresting.
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
* ps/docs-diffcore (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 9ca5691de2)
+ docs/diffcore: unquote "Complete Rewrites" in headers
+ docs/diffcore: fix grammar in diffcore-rename header
Doc update.
Will merge to 'master'.
* rj/remove-unused-mktemp (2017-02-28) 2 commits
(merged to 'next' on 2017-03-03 at 4512f0c5ab)
+ wrapper.c: remove unused gitmkstemps() function
+ wrapper.c: remove unused git_mkstemp() function
Code cleanup.
Will merge to 'master'.
* sb/submodule-init-url-selection (2017-02-28) 1 commit
(merged to 'next' on 2017-03-03 at 847d1f9a91)
+ submodule init: warn about falling back to a local path
Give a warning when "git submodule init" decides that the submodule
in the working tree is its upstream, as it is not a very common
setup.
Will merge to 'master'.
* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
- diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).
Will merge to 'next'.
* nd/conditional-config-include (2017-03-03) 5 commits
- SQUASH??? cond config include test
- SQUASH???
- config: add conditional include
- config.txt: reflow the second include.path paragraph
- config.txt: clarify multiple key values in include.path
The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds. This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".
Will merge to 'next' after squashing niggle-fixes in.
* rs/log-email-subject (2017-03-01) 2 commits
(merged to 'next' on 2017-03-03 at a2ecc84866)
+ pretty: use fmt_output_email_subject()
+ log-tree: factor out fmt_output_email_subject()
Code clean-up.
Will merge to 'master'.
* cc/split-index-config (2017-03-01) 22 commits
- Documentation/git-update-index: explain splitIndex.*
- Documentation/config: add splitIndex.sharedIndexExpire
- read-cache: use freshen_shared_index() in read_index_from()
- read-cache: refactor read_index_from()
- t1700: test shared index file expiration
- read-cache: unlink old sharedindex files
- config: add git_config_get_expiry() from gc.c
- read-cache: touch shared index files when used
- sha1_file: make check_and_freshen_file() non static
- Documentation/config: add splitIndex.maxPercentChange
- t1700: add tests for splitIndex.maxPercentChange
- read-cache: regenerate shared index if necessary
- config: add git_config_get_max_percent_split_change()
- Documentation/git-update-index: talk about core.splitIndex config var
- Documentation/config: add information for core.splitIndex
- t1700: add tests for core.splitIndex
- update-index: warn in case of split-index incoherency
- read-cache: add and then use tweak_split_index()
- split-index: add {add,remove}_split_index() functions
- config: add git_config_get_split_index()
- t1700: change here document style
- config: mark an error message up for translation
The experimental "split index" feature has gained a few
configuration variables to make it easier to use.
I think this is almost ready for 'next'.
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
- p7000: add test for filter-branch with --prune-empty
- filter-branch: fix --prune-empty on parentless commits
- t7003: ensure --prune-empty removes entire branch when applicable
- t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
Will merge to 'next'.
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
(merged to 'next' on 2017-03-01 at 2e9920eeeb)
+ config: use git_config_parse_key() in git_config_parse_parameter()
+ config: move a few helper functions up
The code to parse "git -c VAR=VAL cmd" and set configuration
variable for the duration of cmd had two small bugs, which have
been fixed.
Will merge to 'master'.
This supersedes jc/config-case-cmdline topic that has been discarded.
* ab/cond-skip-tests (2017-03-01) 3 commits
- gitweb tests: skip tests when we don't have Time::HiRes
- gitweb tests: change confusing "skip_all" phrasing
- cvs tests: skip tests that call "cvs commit" when running as root
A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).
Will merge to 'next'.
* jk/interop-test (2017-02-27) 2 commits
- t/interop: add test of old clients against modern git-daemon
- t: add an interoperability test harness
Picking two versions of Git and running tests to make sure the
older one and the newer one interoperate happily has now become
possible.
Needs review.
* jk/parse-config-key-cleanup (2017-02-24) 3 commits
(merged to 'next' on 2017-03-01 at e531d8d3a9)
+ parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ parse_config_key: allow matching single-level config
+ parse_config_key: use skip_prefix instead of starts_with
(this branch uses sb/parse-hide-refs-config-cleanup.)
The "parse_config_key()" API function has been cleaned up.
Will merge to 'master'.
* jk/t6300-cleanup (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 3087521bea)
+ t6300: avoid creating refs/heads/HEAD
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.
Will merge to 'master'.
* rs/commit-parsing-optim (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 22239f35df)
+ commit: don't check for space twice when looking for header
+ commit: be more precise when searching for headers
The code that parses header fields in the commit object has been
updated for (micro)performance and code hygiene.
Will merge to 'master'.
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 03344b1119)
+ sha1_file: release fallback base's memory in unpack_entry()
A leak in a codepath to read from a packed object in (rare) cases
has been plugged.
Will merge to 'master'.
* rs/strbuf-add-real-path (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 69191becd6)
+ strbuf: add strbuf_add_real_path()
+ cocci: use ALLOC_ARRAY
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
Will merge to 'master'.
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
(merged to 'next' on 2017-03-01 at fd722ba039)
+ refs: parse_hide_refs_config to use parse_config_key
(this branch is used by jk/parse-config-key-cleanup.)
Code clean-up.
Will merge to 'master'.
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
- clone: respect configured fetch respecs during initial fetch
Needs review.
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
* sk/dash-is-previous (2017-03-01) 5 commits
- revert.c: delegate handling of "-" shorthand to setup_revisions
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
- revision.c: args starting with "-" might be a revision
- revision.c: swap if/else blocks
- revision.c: do not update argv with unknown option
A dash "-" can be written to mean "the branch that was previously
checked out" in more places.
Needs review.
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
* jh/send-email-one-cc (2017-02-27) 1 commit
(merged to 'next' on 2017-03-02 at 32c0e6ad88)
+ send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
Will merge to 'master'.
* jk/http-auth (2017-02-27) 2 commits
(merged to 'next' on 2017-03-02 at 87f81b4395)
+ http: add an "auto" mode for http.emptyauth
+ http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
Will merge to 'master'.
* jk/ident-empty (2017-02-23) 4 commits
(merged to 'next' on 2017-03-01 at ff80031ce6)
+ ident: do not ignore empty config name/email
+ ident: reject all-crud ident name
+ ident: handle NULL email when complaining of empty name
+ ident: mark error messages for translation
user.email that consists of only cruft chars should consistently
error out, but didn't.
Will merge to 'master'.
* jt/upload-pack-error-report (2017-02-23) 1 commit
(merged to 'next' on 2017-03-01 at aea583dbe5)
+ upload-pack: report "not our ref" to client
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
Will merge to 'master'.
* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
- Documentation: improve description for core.quotePath
Documentation for "git ls-files" did not refer to core.quotePath
Will merge to 'next'.
* jh/memihash-opt (2017-02-17) 5 commits
- name-hash: remember previous dir_entry during lazy_init_name_hash
- name-hash: specify initial size for istate.dir_hash table
- name-hash: precompute hash values during preload-index
- hashmap: allow memihash computation to be continued
- name-hash: eliminate duplicate memihash call
Expecting an update for perf.
cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. files-backend: make reflog iterator go through per-worktree reflog
. refs: add refs_for_each_reflog[_ent]()
. revision.c: --all adds HEAD from all worktrees
. refs: remove dead for_each_*_submodule()
. revision.c: use refs_for_each*() instead of for_each_*_submodule()
. refs: add a refs_for_each_in() and friends
. refs: add refs_for_each_ref()
. refs: add refs_head_ref()
. refs: add refs_read_ref[_full]()
. refs: move submodule slash stripping code to get_submodule_ref_store
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
(this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
- fetch-pack: add specific error for fetching an unadvertised object
- fetch_refs_via_pack: call report_unmatched_refs
- fetch-pack: move code to report unmatched refs to a function
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
Will merge to 'next'.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs: kill set_worktree_head_symref()
. refs: add refs_create_symref()
. worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
. refs.c: add refs_resolve_ref_unsafe()
. refs: introduce get_worktree_ref_store()
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: remove submodule_allowed from files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. refs.c: share is_per_worktree_ref() to files-backend.c
. files-backend: replace *git_path*() with files_path()
. files-backend: add files_path()
. files-backend: convert git_path() to strbuf_git_path()
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. t1406: new tests for submodule ref store
. t1405: some basic tests on main ref store
. t/helper: add test-ref-store to test ref-store functions
. refs: delete pack_refs() in favor of refs_pack_refs()
. files-backend: avoid ref api targetting main ref store
. refs: new transaction related ref-store api
. refs: add new ref-store api
. refs: rename get_ref_store() to get_submodule_ref_store() and make it public
. files-backend: replace submodule_allowed check in files_downcast()
. refs: move submodule code out of files-backend.c
. path.c: move some code out of strbuf_git_path_submodule()
. refs.c: make get_main_ref_store() public and use it
. refs.c: kill register_ref_store(), add register_submodule_ref_store()
. refs.c: flatten get_ref_store() a bit
. refs: rename lookup_ref_store() to lookup_submodule_ref_store()
. refs.c: introduce get_main_ref_store()
. files-backend: remove the use of git_path()
. files-backend: add and use files_refname_path()
. files-backend: add and use files_reflog_path()
. files-backend: move "logs/" out of TMP_RENAMED_LOG
. files-backend: convert git_path() to strbuf_git_path()
. files-backend: add and use files_packed_refs_path()
. files-backend: make files_log_ref_write() static
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
(this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
when dealing with ref_store that represents the set of refs visible
from the other worktrees.
* sb/checkout-recurse-submodules (2017-02-23) 15 commits
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
- read-cache, remove_marked_cache_entries: wipe selected submodules.
- unpack-trees: check if we can perform the operation for submodules
- unpack-trees: pass old oid to verify_clean_submodule
- update submodules: add submodule_move_head
- update submodules: move up prepare_submodule_repo_env
- submodules: introduce check to see whether to touch a submodule
- update submodules: add a config option to determine if submodules are updated
- update submodules: add submodule config parsing
- connect_work_tree_and_git_dir: safely create leading directories
- make is_submodule_populated gently
- lib-submodule-update.sh: define tests for recursing into submodules
- lib-submodule-update.sh: do not use ./. as submodule remote
- lib-submodule-update.sh: reorder create_lib_submodule_repo
"git checkout" is taught --recurse-submodules option.
Reroll exists, but it appears it still needs minor work on top.
cf. <20170302004759.27852-1-sbeller@google.com>
* tg/stash-push (2017-02-28) 6 commits
(merged to 'next' on 2017-03-03 at b50fda0389)
+ stash: allow pathspecs in the no verb form
+ stash: use stash_push for no verb form
+ stash: teach 'push' (and 'create_stash') to honor pathspec
+ stash: refactor stash_create
+ stash: add test for the create command line arguments
+ stash: introduce push verb
Allow "git stash" to take pathspec so that the local changes can be
stashed away only partially.
Will merge to 'master'.
* bc/object-id (2017-02-22) 19 commits
- wt-status: convert to struct object_id
- builtin/merge-base: convert to struct object_id
- Convert object iteration callbacks to struct object_id
- sha1_file: introduce an nth_packed_object_oid function
- refs: simplify parsing of reflog entries
- refs: convert each_reflog_ent_fn to struct object_id
- reflog-walk: convert struct reflog_info to struct object_id
- builtin/replace: convert to struct object_id
- Convert remaining callers of resolve_refdup to object_id
- builtin/merge: convert to struct object_id
- builtin/clone: convert to struct object_id
- builtin/branch: convert to struct object_id
- builtin/grep: convert to struct object_id
- builtin/fmt-merge-message: convert to struct object_id
- builtin/fast-export: convert to struct object_id
- builtin/describe: convert to struct object_id
- builtin/diff-tree: convert to struct object_id
- builtin/commit: convert to struct object_id
- hex: introduce parse_oid_hex
"uchar [40]" to "struct object_id" conversion continues.
Now at v5.
cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
- mingw: use OpenSSL's SHA-1 routines
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.
Will merge to 'next'.
* sg/completion-refs-speedup (2017-02-13) 13 commits
- squash! completion: fill COMPREPLY directly when completing refs
- completion: fill COMPREPLY directly when completing refs
- completion: list only matching symbolic and pseudorefs when completing refs
- completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
- completion: let 'for-each-ref' strip the remote name from remote branches
- completion: let 'for-each-ref' and 'ls-remote' filter matching refs
- completion: don't disambiguate short refs
- completion: don't disambiguate tags and branches
- completion: support excluding full refs
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
(merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
call to die("BUG").
Will cook in 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
Will cook in 'next'.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
--------------------------------------------------
[Discarded]
* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
. interpret_branch_name(): handle auto-namelen for @{-1}
A small bug in the code that parses @{...} has been fixed.
This is now a part of jk/interpret-branch-name topic.
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v2.9.0
@ 2016-06-13 19:45 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-06-13 19:45 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest feature release Git v2.9.0 is now available at the
usual places. It is comprised of 497 non-merge commits since
v2.8.0, contributed by 75 people, 28 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.9.0'
tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.8.0 are as follows.
Welcome to the Git development community!
Alexander Rinass, Antonin, Armin Kunaschik, Benjamin Dopplinger,
Ben Woosley, Erwan Mathoniere, Gabriel Souza Franco, Jacob
Nisnevich, Jan Durovec, Jean-Noël Avila, Kazuki Yamaguchi,
Keller Fuchs, Laurent Arnoud, Li Peng, Marios Titas, Mehul Jain,
Michael Procter, Nikola Forró, Pablo Santiago Blum de Aguiar,
Pranit Bauva, Ray Zhang, René Nyffenegger, Santiago Torres,
Saurav Sachidanand, Shin Kojima, Sidhant Sharma [:tk], Stanislav
Kolotinskiy, and Xiaolong Ye.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alexander Kuleshov,
Alexander Shopov, brian m. carlson, Brian Norris, Changwoo
Ryu, Christian Couder, David Aguilar, David Turner, Dennis
Kaarsemaker, Dimitriy Ryazantcev, Elia Pinto, Elijah Newren,
Eric Sunshine, Eric Wong, Felipe Contreras, Jacob Keller,
Jean-Noel Avila, Jeff King, Jiang Xin, Johannes Schindelin,
Johannes Sixt, John Keeping, Junio C Hamano, Karsten Blees,
Lars Schneider, Linus Torvalds, Luke Diamand, Matthieu Moy,
Michael Haggerty, Michael J Gruber, Michael Rappazzo, Nguyễn
Thái Ngọc Duy, Ori Avtalion, Peter Krefting, Ralf Thielow,
Ramsay Jones, Ray Chen, René Scharfe, Stefan Beller, Stephen
P. Smith, Sven Strickroth, SZEDER Gábor, Torsten Bögershausen,
Trần Ngọc Quân, and Vasco Almeida.
----------------------------------------------------------------
Git 2.9 Release Notes
=====================
Backward compatibility notes
----------------------------
The end-user facing Porcelain level commands in the "git diff" and
"git log" family by default enable the rename detection; you can still
use "diff.renames" configuration variable to disable this.
Merging two branches that have no common ancestor with "git merge" is
by default forbidden now to prevent creating such an unusual merge by
mistake.
The output formats of "git log" that indents the commit log message by
4 spaces now expands HT in the log message by default. You can use
the "--no-expand-tabs" option to disable this.
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake, which this release corrects.
A script that drives commit-tree, if it relies on this mistake, now
needs to read commit.gpgsign and pass the -S option as necessary.
Updates since v2.8
------------------
UI, Workflows & Features
* Comes with git-multimail 1.3.1 (in contrib/).
* The end-user facing commands like "git diff" and "git log"
now enable the rename detection by default.
* The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
* A new "interactive.diffFilter" configuration can be used to
customize the diff shown in "git add -i" sessions.
* "git p4" now allows P4 author names to be mapped to Git author
names.
* "git rebase -x" can be used without passing "-i" option.
* "git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
* "git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
* "git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
* "git pull" has been taught to pass the "--allow-unrelated-histories"
option to underlying "git merge".
* "git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
* Shell completion (in contrib/) updates.
* The commit object name reported when "rebase -i" stops has been
shortened.
* "git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
* "git mergetools" learned to drive ExamDiff.
* "git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
* When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default to help
such a case, and allows the users to override it with a new option,
"--no-expand-tabs".
* "git send-email" now uses a more readable timestamps when
formulating a message ID.
* "git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* "git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
* "git describe --contains" often made a hard-to-justify choice of
tag to name a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
* "git clone" learned the "--shallow-submodules" option.
* HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
* The "--compaction-heuristic" option to "git diff" family of
commands enables a heuristic to make the patch output more readable
by using a blank line as a strong hint that the contents before and
after it belong to logically separate units. It is still
experimental.
* A new configuration variable core.hooksPath allows customizing
where the hook directory is.
* An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
* "git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
* The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
* "git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
* "git commit" learned to pay attention to the "commit.verbose"
configuration variable and act as if the "--verbose" option
was given from the command line.
* Updated documentation gives hints to GMail users with two-factor
auth enabled that they need app-specific-password when using
"git send-email".
* The manpage output of our documentation did not render well in
terminal; typeset literals in bold by default to make them stand
out more.
* The mark-up in the top-level README.md file has been updated to
typeset CLI command names differently from the body text.
Performance, Internal Implementation, Development Support etc.
* The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
* The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
* A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel. Other updates to "git submodule" that move pieces of
logic to C continues.
* Rename bunch of tests on "git clone" for better organization.
* The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* Build updates for MSVC.
* The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* Code restructuring around the "refs" API to prepare for pluggable
refs backends.
* Sources to many test helper binaries and the generated helpers
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
* Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
* "merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
* Move from "unsigned char[20]" to "struct object_id" continues.
* The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
(merge 1da045f nd/error-errno later to maint).
* Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
* t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
* Add perf test for "rebase -i".
* Common mistakes when writing gitlink: in our documentation are
found by "make check-docs".
* t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelain commands have
also been updated to fix possible bugs around their use of
"test -z" and "test -n".
* CI test was taught to run git-svn tests.
* "git cat-file --batch-all" has been sped up, by taking advantage
of the fact that it does not have to read a list of objects, in two
ways.
* test updates to make it more readable and maintainable.
(merge e6273f4 es/t1500-modernize later to maint).
* "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
config.mak didn't.
(merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
* The way how "submodule--helper list" signals unmatch error to its
callers has been updated.
* A bash-ism "local" has been removed from "git submodule" scripted
Porcelain.
Also contains various documentation updates and code clean-ups.
Fixes since v2.8
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* "git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
* Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* A small memory leak in an error codepath has been plugged in xdiff
code.
* strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* "git mergetool" did not work well with conflicts that both sides
deleted.
* "git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* "git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree,
which was wrong.
* When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* "git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
* When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
* A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
* A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
* "git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
* Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
* Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
elements we use in imap-send, which has been adjusted for the change.
* The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently from socks5:// proxies.
* "git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
* On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.
This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds. It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
* "merge-octopus" strategy did not ensure that the index is clean
when merge begins.
* When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which left an inconsistent state that would
break later operations.
* "git submodule" reports the paths of submodules the command
recurses into, but these paths were incorrectly reported when
the command was not run from the root level of the superproject.
* The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
* "git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
* "git replace -e" did not honour "core.editor" configuration.
* "git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
* mmap emulation on Windows has been optimized and work better without
consuming paging store when not needed.
* A question by "git send-email" to ask the identity of the sender
has been updated.
* UI consistency improvements for "git mergetool".
* "git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
* Fix a broken "p4 lfs" test.
* Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* "git fetch" test t5510 was flaky while running a (forced) automagic
garbage collection.
* Documentation updates to help contributors setting up Travis CI
test for their patches.
* Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
* "git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
* "http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
* Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
* Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
* Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
* "git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
(merge 0f9fd5c jc/ll-merge-internal later to maint).
* CI test was taught to build documentation pages.
* "git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
* On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
* Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified. Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.
* A couple of bugs around core.autocrlf have been fixed.
* Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
* "git difftool" learned to handle unmerged paths correctly in
dir-diff mode.
* The "are we talking with TTY, doing an interactive session?"
detection has been updated to work better for "Git for Windows".
* We forgot to add "git log --decorate=auto" to documentation when we
added the feature back in v2.1.0 timeframe.
(merge 462cbb4 rj/log-decorate-auto later to maint).
* "git fast-import --export-marks" would overwrite the existing marks
file even when it makes a dump from its custom die routine.
Prevent it from doing so when we have an import-marks file but
haven't finished reading it.
(merge f4beed6 fc/fast-import-broken-marks-file later to maint).
* "git rebase -i", after it fails to auto-resolve the conflict, had
an unnecessary call to "git rerere" from its very early days, which
was spotted recently; the call has been removed.
(merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
* Other minor clean-ups and documentation updates
(merge cd82b7a pa/cherry-pick-doc-typo later to maint).
(merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
(merge aa20cbc rs/apply-name-terminate later to maint).
(merge fe17fc0 jc/t2300-setup later to maint).
(merge e256eec jk/shell-portability later to maint).
----------------------------------------------------------------
Changes since v2.8.0 are as follows:
Adam Dinwoodie (2):
config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
commit: --amend -m '' silently fails to wipe message
Alexander Kuleshov (1):
submodule-config: use hashmap_iter_first()
Alexander Rinass (1):
diff: run arguments through precompose_argv
Alexander Shopov (1):
l10n: Updated Bulgarian translation of git (2597t,0f,0u)
Antonin (1):
l10n: fr.po Fixed grammar mistake
Armin Kunaschik (2):
t4151: make sure argument to 'test -z' is given
t0008: 4 tests fail with ksh88
Ben Woosley (1):
git-rebase--merge: don't include absent parent as a base
Benjamin Dopplinger (1):
README.md: format CLI commands with code syntax
Brian Norris (3):
Documentation: config: improve word ordering for http.cookieFile
http: expand http.cookieFile as a path
config: consistently format $variables in monospaced font
Changwoo Ryu (1):
l10n: ko.po: Update Korean translation
Christian Couder (5):
Documentation: talk about pager in api-trace.txt
builtin/apply: get rid of useless 'name' variable
builtin/apply: handle parse_binary() failure
builtin/apply: free patch when parse_chunk() fails
Git/SVN: die when there is no commit metadata
David Aguilar (4):
mergetool: support delete/delete conflicts
mergetool: honor tempfile configuration when resolving delete conflicts
difftool: initialize variables for readability
difftool: handle unmerged files in dir-diff mode
David Turner (5):
refs: move head_ref{,_submodule} to the common code
refs: move for_each_*ref* functions into common code
files-backend: break out ref reading
refs: move resolve_ref_unsafe into common code
refs: on symref reflog expire, lock symref not referrent
Dennis Kaarsemaker (1):
Makefile: remove dependency on git.spec
Dimitriy Ryazantcev (1):
l10n: ru.po: update Russian translation
Elia Pinto (1):
api-trace.txt: fix typo
Elijah Newren (6):
merge-recursive: remove duplicate code
merge-recursive: do not check working copy when creating a virtual merge base
t7605: add a testcase demonstrating a bug with trivial merges
builtin/merge.c: fix a bug with trivial merges
merge-octopus: abort if index does not match HEAD
t6044: new merge testcases for when index doesn't match HEAD
Eric Sunshine (10):
lib-gpg: drop unnecessary "missing GPG" warning
t6302: normalize names and descriptions of signed tags
t6302: also test annotated in addition to signed tags
t6302: skip only signed tags rather than all tests when GPG is missing
git-format-patch.txt: don't show -s as shorthand for multiple options
t1500: be considerate to future potential tests
t1500: test_rev_parse: facilitate future test enhancements
t1500: avoid changing working directory outside of tests
t1500: avoid setting configuration options outside of tests
t1500: avoid setting environment variables outside of tests
Eric Wong (4):
send-email: more meaningful Message-ID
send-email: do not load Data::Dumper
pack-objects: warn on split packs disabling bitmaps
.mailmap: update to my shorter email address
Erwan Mathoniere (1):
Documentation: bold literals in man
Felipe Contreras (1):
fast-import: do not truncate exported marks file
Gabriel Souza Franco (2):
fetch-pack: fix object_id of exact sha1
fetch-pack: update the documentation for "<refs>..." arguments
Jacob Keller (7):
submodule: don't pass empty string arguments to submodule--helper clone
submodule: check argc count for git submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: fix segmentation fault in submodule--helper clone
quote: implement sq_quotef()
git: submodule honor -c credential.* from command line
xdiff: add recs_match helper function
Jacob Nisnevich (2):
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
mergetools: add support for ExamDiff
Jan Durovec (2):
git-p4: clean-up code style in tests
git-p4: add P4 jobs to git commit message
Jean-Noel Avila (1):
l10n: fr.po v2.9.0rnd1
Jeff King (56):
credential: let empty credential specs reset helper list
t1515: add tests for rev-parse out-of-repo helpers
add--interactive: allow custom diff highlighting programs
rev-parse: let some options run outside repository
strbuf_getwholeline: NUL-terminate getdelim buffer on error
setup: make startup_info available everywhere
setup: set startup_info->have_repository more reliably
remote: don't resolve HEAD in non-repository
mailmap: do not resolve blobs in a non-repository
grep: turn off gitlink detection for --no-index
use setup_git_directory() in test-* programs
setup: document check_repository_format()
wrap shared_repository global in get/set accessors
lazily load core.sharedrepository
check_repository_format_gently: stop using git_config_early
config: drop git_config_early
setup: refactor repo format reading and verification
init: use setup.c's repo version verification
setup: unify repository version callbacks
setup: drop repository_format_version global
verify_repository_format: mark messages for translation
send-email: ignore trailing whitespace in mailrc alias file
credential-cache--daemon: clarify "exit" action semantics
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
branch: fix shortening of non-remote symrefs
commit: do not ignore an empty message given by -m ''
config: lower-case first word of error strings
git_config_set_multivar_in_file: all non-zero returns are errors
git_config_set_multivar_in_file: handle "unset" errors
t5532: use write_script
send-pack: close demux pipe before finishing async process
run-command: teach async threads to ignore SIGPIPE
send-pack: isolate sigpipe in demuxer thread
fetch-pack: isolate sigpipe in demuxer thread
t5504: drop sigpipe=ok from push tests
remote.c: spell __attribute__ correctly
t5550: fix typo in $HTTPD_URL
t5550: break submodule config test into multiple sub-tests
submodule: export sanitized GIT_CONFIG_PARAMETERS
submodule--helper: move config-sanitizing to submodule.c
submodule: use prepare_submodule_repo_env consistently
submodule: stop sanitizing config options
t6302: simplify non-gpg cases
rebase--interactive: avoid empty list in shell for-loop
test-lib: set BASH_XTRACEFD automatically
t/lib-git-svn: drop $remote_git_svn and $git_svn_id
t9100,t3419: enclose all test code in single-quotes
t9107: use "return 1" instead of "exit 1"
t9107: switch inverted single/double quotes in test
t9103: modernize test style
always quote shell arguments to test -z/-n
cat-file: avoid noop calls to sha1_object_info_extended
cat-file: default to --buffer when --batch-all-objects is used
archive-tar: convert snprintf to xsnprintf
test-lib: add in-shell "env" replacement
Jiang Xin (2):
l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)
l10n: zh_CN: for git v2.9.0 l10n round 1
Johannes Schindelin (16):
replace --edit: respect core.editor
name-rev: include taggerdate in considering the best name
win32mmap: set errno appropriately
mmap(win32): avoid copy-on-write when it is unnecessary
mmap(win32): avoid expensive fstat() call
http: support sending custom HTTP headers
tests: adjust the configuration for Apache 2.2
t5551: make the test for extra HTTP headers more robust
t3404: fix typo
submodule: ensure that -c http.extraheader is heeded
mingw: introduce the 'core.hideDotFiles' setting
mingw: remove unnecessary definition
Windows: only add a no-op pthread_sigmask() when needed
perf: let's disable symlinks when they are not available
perf: make the tests work in worktrees
perf: run "rebase -i" under perf
Johannes Sixt (4):
Windows: shorten code by re-using convert_slashes()
Windows: add pthread_sigmask() that does nothing
t6044: replace seq by test_seq
rebase -i: remove an unnecessary 'rerere' invocation
John Keeping (3):
config: fail if --get-urlmatch finds no value
Documentation/git-config: use bulleted list for exit codes
Documentation/git-config: fix --get-all description
Junio C Hamano (82):
rerere: split conflict ID further
rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
index-pack: correct --keep[=<msg>]
index-pack: add a helper function to derive .idx/.keep filename
rerere: handle leftover rr-cache/$ID directory and postimage files
rerere: delay the recording of preimage
rerere: allow multiple variants to exist
t4200: rerere a merge with two identical conflicts
rerere: do use multiple variants
apply: remove unused call to free() in gitdiff_{old,new}name()
merge: fix NULL pointer dereference when merging nothing into void
merge: refuse to create too cool a merge by default
pretty: enable --expand-tabs by default for selected pretty formats
pretty: allow tweaking tabwidth in --expand-tabs
submodule--helper: do not borrow absolute_path() result for too long
Git 2.8.1
First batch for post 2.8 cycle
pretty: test --expand-tabs
Makefile: fix misdirected redirections
Second batch for post 2.8 cycle
Makefile: stop pretending to support rpmbuild
rerere: gc and clear
rerere: move code related to "forget" together
rerere: split code to call ll_merge() further
rerere: adjust 'forget' to multi-variant world order
setup.c: do not feed NULL to "%.*s" even with precision 0
Third batch for post 2.8 cycle
http: differentiate socks5:// and socks5h://
t1020: do not overuse printf and use write_script
t3404: use write_script
Fourth batch for post 2.8 cycle
Start preparing for 2.8.2
fsck_commit_buffer(): do not special case the last validation
ll-merge: fix typo in comment
Prepare for 2.8.2
Makefile: clean *.o files we create
Fifth batch for post 2.8 cycle
t3033: avoid 'ambiguous refs' warning
pull: pass --allow-unrelated-histories to "git merge"
Sixth batch for post 2.8 cycle
send-email: fix grammo in the prompt that asks e-mail recipients
Seventh batch for post 2.8 cycle
Git 2.8.2
Eighth batch for 2.9
diff: undocument the compaction heuristic knobs for experimentation
Start preparing for 2.8.3
commit-tree: do not pay attention to commit.gpgsign
Ninth batch for 2.9
config: describe 'pathname' value type
Tenth batch for 2.9
Almost ready for 2.8.3
test-lib-functions.sh: remove misleading comment on test_seq
test-lib-functions.sh: rewrite test_seq without Perl
ll-merge: use a longer conflict marker for internal merge
t6036: remove pointless test that expects failure
Documentation: fix linkgit references
fsck: detect and warn a commit with embedded NUL
ci: validate "linkgit:" in documentation
test-parse-options: fix output when callback option fails
test-parse-options: --expect=<string> option to simplify tests
t0040: remove unused test helpers
t0040: convert a few tests to use test-parse-options --expect
Eleventh batch for 2.9
rerere: plug memory leaks upon "rerere forget" failure
Twelfth batch for 2.9
Thirteenth batch for 2.9
Git 2.8.3
rerere: remove an null statement
Git 2.9-rc0
t4204: do not let $name variable clobbered
Start preparing for 2.8.4
Final batch before 2.9-rc1
More topics for 2.8.4
Git 2.9-rc1
t5500 & t7403: lose bash-ism "local"
t2300: run git-sh-setup in an environment that better mimics the real life
Almost ready for 2.9-rc2
Git 2.8.4
Git 2.9-rc2
diff: disable compaction heuristic for now
Hopefully the final last-minute update before 2.9 final
Git 2.9
Karsten Blees (1):
mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
Kazuki Yamaguchi (10):
branch -d: refuse deleting a branch which is currently checked out
refs: add a new function set_worktree_head_symref
branch -m: update all per-worktree HEADs
set_worktree_head_symref(): fix error message
imap-send: use HMAC() function provided by OpenSSL
imap-send: check NULL return of SSL_CTX_new()
imap-send: avoid deprecated TLSv1_method()
configure: remove checking for HMAC_CTX_cleanup
imap-send: check for NOLOGIN capability only when using LOGIN command
imap-send: fix CRAM-MD5 response calculation
Keller Fuchs (1):
Documentation: clarify signature verification
Lars Schneider (8):
git-p4: map a P4 user to Git author name and email address
travis-ci: update Git-LFS and P4 to the latest version
travis-ci: express Linux/OS X dependency versions more clearly
git-p4: fix Git LFS pointer parsing
t9824: fix wrong reference value
Documentation: add setup instructions for Travis CI
travis-ci: build documentation
travis-ci: enable Git SVN tests t91xx on Linux
Laurent Arnoud (1):
tag: add the option to force signing of annotated tags
Li Peng (1):
typofix: assorted typofixes in comments, documentation and messages
Linus Torvalds (1):
pretty: expand tabs in indented logs to make things line up properly
Luke Diamand (3):
git-p4 tests: cd to / before running python
git-p4 tests: work with python3 as well as python2
git-p4 tests: time_in_seconds should use $PYTHON_PATH
Marios Titas (2):
ident: check for useConfigOnly before auto-detection of name/email
ident: give "please tell me" message upon useConfigOnly error
Matthieu Moy (13):
Documentation/diff-config: fix description of diff.renames
t4001-diff-rename: wrap file creations in a test
t: add tests for diff.renames (true/false/unset)
log: introduce init_log_defaults()
diff: activate diff.renames by default
lockfile: mark strings for translation
lockfile: improve error message when lockfile exists
git.spec.in: use README.md, not README
README.md: don't take 'commandname' literally
git-multimail: update to release 1.3.0
git-multimail: update to release 1.3.1
Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
Makefile: add $(DEVELOPER_CFLAGS) variable
Mehul Jain (9):
git-pull.c: introduce git_pull_config()
pull --rebase: add --[no-]autostash flag
t5520: use consistent capitalization in test titles
t5520: ensure consistent test conditions
t5520: use better test to check stderr output
t5520: factor out common "successful autostash" code
t5520: factor out common "failing autostash" code
t5520: reduce commom lines of code
t5520: test --[no-]autostash with pull.rebase=true
Michael Haggerty (19):
t1430: test the output and error of some commands more carefully
t1430: clean up broken refs/tags/shadow
t1430: don't rely on symbolic-ref for creating broken symrefs
t1430: test for-each-ref in the presence of badly-named refs
t1430: improve test coverage of deletion of badly-named refs
resolve_missing_loose_ref(): simplify semantics
resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
resolve_ref_unsafe(): ensure flags is always set
resolve_ref_1(): eliminate local variable
resolve_ref_1(): reorder code
resolve_ref_1(): eliminate local variable "bad_name"
read_raw_ref(): manage own scratch space
files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
read_raw_ref(): change flags parameter to unsigned int
fsck_head_link(): remove unneeded flag variable
cmd_merge(): remove unneeded flag variable
checkout_paths(): remove unneeded flag variable
check_aliased_update(): check that dst_name is non-NULL
show_head_ref(): check the result of resolve_ref_namespace()
Michael J Gruber (1):
completion: complete --cherry-mark for git log
Michael Procter (1):
upload-pack: use argv_array for pack_objects
Michael Rappazzo (1):
Documentation: add instructions to help setup gmail 2FA
Nguyễn Thái Ngọc Duy (62):
git-apply.txt: remove a space
git-apply.txt: mention the behavior inside a subdir
apply: report patch skipping in verbose mode
test helpers: move test-* to t/helper/ subdirectory
dir.c: remove dead function fnmatch_icase()
wrapper.c: delete dead function git_mkstemps()
dir.c: rename str(n)cmp_icase to fspath(n)cmp
path.c: add git_common_path() and strbuf_git_common_path()
worktree.c: store "id" instead of "git_dir"
worktree.c: make find_shared_symref() return struct worktree *
worktree.c: mark current worktree
path.c: refactor and add worktree_git_path()
wt-status.c: split rebase detection out of wt_status_get_state()
wt-status.c: make wt_status_check_rebase() work on any worktree
worktree.c: avoid referencing to worktrees[i] multiple times
worktree.c: check whether branch is rebased in another worktree
wt-status.c: split bisect detection out of wt_status_get_state()
worktree.c: check whether branch is bisected in another worktree
branch: do not rename a branch under bisect or rebase
remote.c: specify correct plural form in "commit diverge" message
usage.c: move format processing out of die_errno()
usage.c: add warning_errno() and error_errno()
bisect.c: use die_errno() and warning_errno()
builtin/am.c: use error_errno()
builtin/branch.c: use error_errno()
builtin/fetch.c: use error_errno()
builtin/help.c: use warning_errno()
builtin/mailsplit.c: use error_errno()
builtin/merge-file.c: use error_errno()
builtin/pack-objects.c: use die_errno() and warning_errno()
builtin/rm.c: use warning_errno()
builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
builtin/upload-archive.c: use error_errno()
builtin/worktree.c: use error_errno()
check-racy.c: use error_errno()
combine-diff.c: use error_errno()
compat/win32/syslog.c: use warning_errno()
config.c: use error_errno()
connected.c: use error_errno()
copy.c: use error_errno()
credential-cache--daemon.c: use warning_errno()
diff-no-index.c: use error_errno()
editor.c: use error_errno()
entry.c: use error_errno()
fast-import.c: use error_errno()
gpg-interface.c: use error_errno()
grep.c: use error_errno()
http.c: use error_errno() and warning_errno()
ident.c: use warning_errno()
mailmap.c: use error_errno()
reachable.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
run-command.c: use error_errno()
sequencer.c: use error_errno()
server-info.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
transport-helper.c: use error_errno()
unpack-trees.c: use error_errno()
upload-pack.c: use error_errno()
vcs-svn: use error_errno()
wrapper.c: use warning_errno()
wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Nikola Forró (1):
difftool/mergetool: make the form of yes/no questions consistent
Ori Avtalion (1):
Documentation: git diff --check detects conflict markers
Pablo Santiago Blum de Aguiar (1):
git-cherry-pick.txt: correct a small typo
Peter Krefting (1):
l10n: sv.po: Update Swedish translation (2597t0f0u)
Pranit Bauva (9):
t/t7502 : drop duplicate test
api-parse-options.txt: document OPT_CMDMODE()
t0040-test-parse-options.sh: fix style issues
test-parse-options: print quiet as integer
t0040-parse-options: improve test coverage
t/t7507: improve test coverage
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
t7507-commit-verbose: improve test coverage by testing number of diffs
commit: add a commit.verbose config variable
Ralf Thielow (5):
completion: add option '--guides' to 'git help'
completion: add 'revisions' and 'everyday' to 'git help'
rebase-i: print an abbreviated hash when stop for editing
string_list: use string-list API in unsorted_string_list_lookup()
l10n: de.po: translate 104 new messages
Ramsay Jones (3):
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
xdiff/xprepare: fix a memory leak
log: document the --decorate=auto option
Ray Chen (1):
l10n: zh_CN: review for git v2.9.0 l10n round 1
Ray Zhang (1):
worktree: add: introduce --checkout option
René Nyffenegger (1):
Documentation: fix typo 'In such these cases'
René Scharfe (3):
apply: remove unused parameters from name_terminate()
patch-id: use starts_with() and skip_prefix()
perf: make the tests work without a worktree
SZEDER Gábor (6):
diffcore: fix iteration order of identical files during rename detection
for-each-ref: fix description of '--contains' in manpage
test-lib: simplify '--option=value' parsing
t9824: fix broken &&-chain in a subshell
t5510: run auto-gc in the foreground
Documentation/git-send-email: fix typo in gmail 2FA section
Santiago Torres (6):
builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
t7030: test verifying multiple tags
verify-tag: update variable name and type
verify-tag: prepare verify_tag for libification
verify-tag: move tag verification code to tag.c
tag -v: verify directly rather than exec-ing verify-tag
Saurav Sachidanand (1):
dir: store EXC_FLAG_* values in unsigned integers
Shin Kojima (1):
gitweb: apply fallback encoding before highlight
Sidhant Sharma [:tk] (1):
builtin/receive-pack.c: use parse_options API
Stanislav Kolotinskiy (1):
git-send-pack: fix --all option when used with directory
Stefan Beller (46):
submodule-config: keep update strategy around
submodule-config: drop check against NULL
fetching submodules: respect `submodule.fetchJobs` config option
submodule update: direct error message to stderr
run_processes_parallel: treat output of children as byte array
run_processes_parallel: rename parameters for the callbacks
git submodule update: have a dedicated helper for cloning
submodule helper: remove double 'fatal: ' prefix
submodule update: expose parallelism to the user
clone: allow an explicit argument for parallel submodule clones
clone tests: rename t57* => t56*
rebase: decouple --exec from --interactive
t3404: cleanup double empty lines between tests
submodule foreach: correct path display in recursive submodules
submodule update --init: correct path handling in recursive submodules
submodule status: correct path handling in recursive submodules
submodule update: align reporting path for custom command execution
submodule update: test recursive path reporting from subdirectory
t7407: make expectation as clear as possible
recursive submodules: test for relative paths
submodule--helper: fix potential NULL-dereference
submodule--helper clone: create the submodule path just once
notes: don't leak memory in git_config_get_notes_strategy
abbrev_sha1_in_line: don't leak memory
bundle: don't leak an fd in case of early return
credential-cache, send_request: close fd when done
submodule--helper, module_clone: always operate on absolute paths
submodule--helper, module_clone: catch fprintf failure
submodule: port resolve_relative_url from shell to C
submodule: port init from shell to C
xdiff: implement empty line chunk heuristic
mv: allow moving nested submodules
clone: add `--shallow-submodules` flag
config doc: improve exit code listing
config.c: drop local variable
submodule-config: don't shadow `cache`
submodule init: fail gracefully with a missing .gitmodules file
submodule--helper update-clone: abort gracefully on missing .gitmodules
submodule deinit test: fix broken && chain in subshell
submodule init: redirect stdout to stderr
t7300: mark test with SANITY
submodule deinit: require '--all' instead of '.' for all submodules
t3513: do not compress backup tar file
t6041: do not compress backup tar file
submodule--helper: offer a consistent API
submodule: remove bashism from shell script
Stephen P. Smith (1):
wt-status.c: set commitable bit if there is a meaningful merge.
Sven Strickroth (3):
commit: do not lose SQUASH_MSG contents
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
MSVC: use shipped headers instead of fallback definitions
Torsten Bögershausen (6):
correct blame for files commited with CRLF
t0027: make commit_chk_wrnNNO() reliable
convert: allow core.autocrlf=input and core.eol=crlf
t0027: test cases for combined attributes
convert.c: ident + core.autocrlf didn't work
t5601: Remove trailing space in sed expression
Trần Ngọc Quân (1):
l10n: Updated Vietnamese translation (2597t)
Vasco Almeida (19):
l10n: fr: fix transcation of "dir"
l10n: fr: fix wrongly translated option name
l10n: fr: change "id de clé" to match "id-clé"
l10n: fr: don't translate "merge" as a parameter
i18n: index-pack: use plural string instead of normal one
i18n: builtin/branch.c: mark option for translation
i18n: unpack-trees: mark strings for translation
i18n: builtin/rm.c: remove a comma ',' from string
i18n: branch: unmark string for translation
i18n: branch: move comment for translators
i18n: git-parse-remote.sh: mark strings for translation
i18n: builtin/pull.c: mark placeholders for translation
i18n: builtin/pull.c: split strings marked for translation
i18n: remote: add comment for translators
Documentation/git-mailinfo: fix typo
i18n: unpack-trees: avoid substituting only a verb in sentences
l10n: pt_PT: merge git.pot file
l10n: pt_PT: update according to git-gui glossary
l10n: pt_PT: update Portuguese translation
Xiaolong Ye (4):
patch-ids: make commit_patch_id() a public helper function
format-patch: add '--base' option to record base tree info
format-patch: introduce --base=auto option
format-patch: introduce format.useAutoBase configuration
brian m. carlson (6):
sha1-name: introduce a get_oid() function
test-match-trees: convert to use struct object_id
match-trees: convert shift_tree() and shift_tree_by() to use object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
tree-walk: convert tree_entry_extract() to use struct object_id
match-trees: convert several leaf functions to use struct object_id
Ævar Arnfjörð Bjarmason (4):
githooks.txt: improve the intro section
githooks.txt: amend dangerous advice about 'update' hook ACL
githooks.txt: minor improvements to the grammar & phrasing
hooks: allow customizing where the hook directory is
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v2.9.0-rc2
@ 2016-06-07 5:57 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-06-07 5:57 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
A release candidate Git v2.9.0-rc2 is now available for testing
at the usual places. It is comprised of 477 non-merge commits
since v2.8.0, contributed by 67 people, 27 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.9.0-rc2' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.8.0 are as follows.
Welcome to the Git development community!
Alexander Rinass, Armin Kunaschik, Benjamin Dopplinger,
Ben Woosley, Erwan Mathoniere, Gabriel Souza Franco, Jacob
Nisnevich, Jan Durovec, Jean-Noël Avila, Kazuki Yamaguchi,
Keller Fuchs, Laurent Arnoud, Li Peng, Marios Titas, Mehul Jain,
Michael Procter, Nikola Forró, Pablo Santiago Blum de Aguiar,
Pranit Bauva, Ray Zhang, René Nyffenegger, Santiago Torres,
Saurav Sachidanand, Shin Kojima, Sidhant Sharma [:tk], Stanislav
Kolotinskiy, and Xiaolong Ye.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alexander Kuleshov,
brian m. carlson, Brian Norris, Christian Couder, David Aguilar,
David Turner, Dennis Kaarsemaker, Elia Pinto, Elijah Newren,
Eric Sunshine, Eric Wong, Felipe Contreras, Jacob Keller,
Jeff King, Jiang Xin, Johannes Schindelin, Johannes Sixt,
John Keeping, Junio C Hamano, Karsten Blees, Lars Schneider,
Linus Torvalds, Luke Diamand, Matthieu Moy, Michael Haggerty,
Michael J Gruber, Michael Rappazzo, Nguyễn Thái Ngọc
Duy, Ori Avtalion, Ralf Thielow, Ramsay Jones, René Scharfe,
Stefan Beller, Stephen P. Smith, Sven Strickroth, SZEDER Gábor,
Torsten Bögershausen, and Vasco Almeida.
----------------------------------------------------------------
Git 2.9 Release Notes (draft)
=============================
Backward compatibility notes
----------------------------
The end-user facing Porcelain level commands in the "git diff" and
"git log" family by default enable the rename detection; you can still
use "diff.renames" configuration variable to disable this.
Merging two branches that have no common ancestor with "git merge" is
by default forbidden now to prevent creating such an unusual merge by
mistake.
The output formats of "git log" that indents the commit log message by
4 spaces now expands HT in the log message by default. You can use
the "--no-expand-tabs" option to disable this.
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake, which this release corrects.
A script that drives commit-tree, if it relies on this mistake, now
needs to read commit.gpgsign and pass the -S option as necessary.
Updates since v2.8
------------------
UI, Workflows & Features
* Comes with git-multimail 1.3.1 (in contrib/).
* The end-user facing commands like "git diff" and "git log"
now enable the rename detection by default.
* The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
* A new "interactive.diffFilter" configuration can be used to
customize the diff shown in "git add -i" sessions.
* "git p4" now allows P4 author names to be mapped to Git author
names.
* "git rebase -x" can be used without passing "-i" option.
* "git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
* "git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
* "git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
* "git pull" has been taught to pass the "--allow-unrelated-histories"
option to underlying "git merge".
* "git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
* Shell completion (in contrib/) updates.
* The commit object name reported when "rebase -i" stops has been
shortened.
* "git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
* "git mergetools" learned to drive ExamDiff.
* "git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
* When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default to help
such a case, and allows the users to override it with a new option,
"--no-expand-tabs".
* "git send-email" now uses a more readable timestamps when
formulating a message ID.
* "git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* "git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
* "git describe --contains" often made a hard-to-justify choice of
tag to name a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
* "git clone" learned the "--shallow-submodules" option.
* HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
* Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to logically separate units.
* A new configuration variable core.hooksPath allows customizing
where the hook directory is.
* An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
* "git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
* The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
* "git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
* "git commit" learned to pay attention to the "commit.verbose"
configuration variable and act as if the "--verbose" option
was given from the command line.
* Updated documentation gives hints to GMail users with two-factor
auth enabled that they need app-specific-password when using
"git send-email".
* The manpage output of our documentation did not render well in
terminal; typeset literals in bold by default to make them stand
out more.
* The mark-up in the top-level README.md file has been updated to
typeset CLI command names differently from the body text.
Performance, Internal Implementation, Development Support etc.
* The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
* The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
* A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel. Other updates to "git submodule" that move pieces of
logic to C continues.
* Rename bunch of tests on "git clone" for better organization.
* The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* Build updates for MSVC.
* The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* Code restructuring around the "refs" API to prepare for pluggable
refs backends.
* Sources to many test helper binaries and the generated helpers
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
* Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
* "merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
* Move from "unsigned char[20]" to "struct object_id" continues.
* The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
(merge 1da045f nd/error-errno later to maint).
* Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
* t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
* Add perf test for "rebase -i".
* Common mistakes when writing gitlink: in our documentation are
found by "make check-docs".
* t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelain commands have
also been updated to fix possible bugs around their use of
"test -z" and "test -n".
* CI test was taught to run git-svn tests.
* "git cat-file --batch-all" has been sped up, by taking advantage
of the fact that it does not have to read a list of objects, in two
ways.
* test updates to make it more readable and maintainable.
(merge e6273f4 es/t1500-modernize later to maint).
* "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
config.mak didn't.
(merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
* The way how "submodule--helper list" signals unmatch error to its
callers has been updated.
* A bash-ism "local" has been removed from "git submodule" scripted
Porcelain.
Also contains various documentation updates and code clean-ups.
Fixes since v2.8
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* "git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
* Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* A small memory leak in an error codepath has been plugged in xdiff
code.
* strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* "git mergetool" did not work well with conflicts that both sides
deleted.
* "git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* "git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree,
which was wrong.
* When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* "git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
* When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
* A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
* A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
* "git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
* Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
* Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
elements we use in imap-send, which has been adjusted for the change.
* The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently from socks5:// proxies.
* "git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
* On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.
This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds. It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
* "merge-octopus" strategy did not ensure that the index is clean
when merge begins.
* When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which left an inconsistent state that would
break later operations.
* "git submodule" reports the paths of submodules the command
recurses into, but these paths were incorrectly reported when
the command was not run from the root level of the superproject.
* The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
* "git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
* "git replace -e" did not honour "core.editor" configuration.
* "git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
* mmap emulation on Windows has been optimized and work better without
consuming paging store when not needed.
* A question by "git send-email" to ask the identity of the sender
has been updated.
* UI consistency improvements for "git mergetool".
* "git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
* Fix a broken "p4 lfs" test.
* Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* "git fetch" test t5510 was flaky while running a (forced) automagic
garbage collection.
* Documentation updates to help contributors setting up Travis CI
test for their patches.
* Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
* "git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
* "http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
* Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
* Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
* Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
* "git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
(merge 0f9fd5c jc/ll-merge-internal later to maint).
* CI test was taught to build documentation pages.
* "git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
* On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
* Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified. Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.
* A couple of bugs around core.autocrlf have been fixed.
* Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
* "git difftool" learned to handle unmerged paths correctly in
dir-diff mode.
* The "are we talking with TTY, doing an interactive session?"
detection has been updated to work better for "Git for Windows".
* We forgot to add "git log --decorate=auto" to documentation when we
added the feature back in v2.1.0 timeframe.
(merge 462cbb4 rj/log-decorate-auto later to maint).
* "git fast-import --export-marks" would overwrite the existing marks
file even when it makes a dump from its custom die routine.
Prevent it from doing so when we have an import-marks file but
haven't finished reading it.
(merge f4beed6 fc/fast-import-broken-marks-file later to maint).
* "git rebase -i", after it fails to auto-resolve the conflict, had
an unnecessary call to "git rerere" from its very early days, which
was spotted recently; the call has been removed.
(merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
* Other minor clean-ups and documentation updates
(merge cd82b7a pa/cherry-pick-doc-typo later to maint).
(merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
(merge aa20cbc rs/apply-name-terminate later to maint).
----------------------------------------------------------------
Changes since v2.8.0 are as follows:
Adam Dinwoodie (2):
config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
commit: --amend -m '' silently fails to wipe message
Alexander Kuleshov (1):
submodule-config: use hashmap_iter_first()
Alexander Rinass (1):
diff: run arguments through precompose_argv
Armin Kunaschik (2):
t4151: make sure argument to 'test -z' is given
t0008: 4 tests fail with ksh88
Ben Woosley (1):
git-rebase--merge: don't include absent parent as a base
Benjamin Dopplinger (1):
README.md: format CLI commands with code syntax
Brian Norris (3):
Documentation: config: improve word ordering for http.cookieFile
http: expand http.cookieFile as a path
config: consistently format $variables in monospaced font
Christian Couder (5):
Documentation: talk about pager in api-trace.txt
builtin/apply: get rid of useless 'name' variable
builtin/apply: handle parse_binary() failure
builtin/apply: free patch when parse_chunk() fails
Git/SVN: die when there is no commit metadata
David Aguilar (4):
mergetool: support delete/delete conflicts
mergetool: honor tempfile configuration when resolving delete conflicts
difftool: initialize variables for readability
difftool: handle unmerged files in dir-diff mode
David Turner (5):
refs: move head_ref{,_submodule} to the common code
refs: move for_each_*ref* functions into common code
files-backend: break out ref reading
refs: move resolve_ref_unsafe into common code
refs: on symref reflog expire, lock symref not referrent
Dennis Kaarsemaker (1):
Makefile: remove dependency on git.spec
Elia Pinto (1):
api-trace.txt: fix typo
Elijah Newren (6):
merge-recursive: remove duplicate code
merge-recursive: do not check working copy when creating a virtual merge base
t7605: add a testcase demonstrating a bug with trivial merges
builtin/merge.c: fix a bug with trivial merges
merge-octopus: abort if index does not match HEAD
t6044: new merge testcases for when index doesn't match HEAD
Eric Sunshine (10):
lib-gpg: drop unnecessary "missing GPG" warning
t6302: normalize names and descriptions of signed tags
t6302: also test annotated in addition to signed tags
t6302: skip only signed tags rather than all tests when GPG is missing
git-format-patch.txt: don't show -s as shorthand for multiple options
t1500: be considerate to future potential tests
t1500: test_rev_parse: facilitate future test enhancements
t1500: avoid changing working directory outside of tests
t1500: avoid setting configuration options outside of tests
t1500: avoid setting environment variables outside of tests
Eric Wong (4):
send-email: more meaningful Message-ID
send-email: do not load Data::Dumper
pack-objects: warn on split packs disabling bitmaps
.mailmap: update to my shorter email address
Erwan Mathoniere (1):
Documentation: bold literals in man
Felipe Contreras (1):
fast-import: do not truncate exported marks file
Gabriel Souza Franco (2):
fetch-pack: fix object_id of exact sha1
fetch-pack: update the documentation for "<refs>..." arguments
Jacob Keller (7):
submodule: don't pass empty string arguments to submodule--helper clone
submodule: check argc count for git submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: fix segmentation fault in submodule--helper clone
quote: implement sq_quotef()
git: submodule honor -c credential.* from command line
xdiff: add recs_match helper function
Jacob Nisnevich (2):
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
mergetools: add support for ExamDiff
Jan Durovec (2):
git-p4: clean-up code style in tests
git-p4: add P4 jobs to git commit message
Jeff King (55):
credential: let empty credential specs reset helper list
t1515: add tests for rev-parse out-of-repo helpers
add--interactive: allow custom diff highlighting programs
rev-parse: let some options run outside repository
strbuf_getwholeline: NUL-terminate getdelim buffer on error
setup: make startup_info available everywhere
setup: set startup_info->have_repository more reliably
remote: don't resolve HEAD in non-repository
mailmap: do not resolve blobs in a non-repository
grep: turn off gitlink detection for --no-index
use setup_git_directory() in test-* programs
setup: document check_repository_format()
wrap shared_repository global in get/set accessors
lazily load core.sharedrepository
check_repository_format_gently: stop using git_config_early
config: drop git_config_early
setup: refactor repo format reading and verification
init: use setup.c's repo version verification
setup: unify repository version callbacks
setup: drop repository_format_version global
verify_repository_format: mark messages for translation
send-email: ignore trailing whitespace in mailrc alias file
credential-cache--daemon: clarify "exit" action semantics
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
branch: fix shortening of non-remote symrefs
commit: do not ignore an empty message given by -m ''
config: lower-case first word of error strings
git_config_set_multivar_in_file: all non-zero returns are errors
git_config_set_multivar_in_file: handle "unset" errors
t5532: use write_script
send-pack: close demux pipe before finishing async process
run-command: teach async threads to ignore SIGPIPE
send-pack: isolate sigpipe in demuxer thread
fetch-pack: isolate sigpipe in demuxer thread
t5504: drop sigpipe=ok from push tests
remote.c: spell __attribute__ correctly
t5550: fix typo in $HTTPD_URL
t5550: break submodule config test into multiple sub-tests
submodule: export sanitized GIT_CONFIG_PARAMETERS
submodule--helper: move config-sanitizing to submodule.c
submodule: use prepare_submodule_repo_env consistently
submodule: stop sanitizing config options
t6302: simplify non-gpg cases
rebase--interactive: avoid empty list in shell for-loop
test-lib: set BASH_XTRACEFD automatically
t/lib-git-svn: drop $remote_git_svn and $git_svn_id
t9100,t3419: enclose all test code in single-quotes
t9107: use "return 1" instead of "exit 1"
t9107: switch inverted single/double quotes in test
t9103: modernize test style
always quote shell arguments to test -z/-n
cat-file: avoid noop calls to sha1_object_info_extended
cat-file: default to --buffer when --batch-all-objects is used
archive-tar: convert snprintf to xsnprintf
Johannes Schindelin (16):
replace --edit: respect core.editor
name-rev: include taggerdate in considering the best name
win32mmap: set errno appropriately
mmap(win32): avoid copy-on-write when it is unnecessary
mmap(win32): avoid expensive fstat() call
http: support sending custom HTTP headers
tests: adjust the configuration for Apache 2.2
t5551: make the test for extra HTTP headers more robust
t3404: fix typo
submodule: ensure that -c http.extraheader is heeded
mingw: introduce the 'core.hideDotFiles' setting
mingw: remove unnecessary definition
Windows: only add a no-op pthread_sigmask() when needed
perf: let's disable symlinks when they are not available
perf: make the tests work in worktrees
perf: run "rebase -i" under perf
Johannes Sixt (4):
Windows: shorten code by re-using convert_slashes()
Windows: add pthread_sigmask() that does nothing
t6044: replace seq by test_seq
rebase -i: remove an unnecessary 'rerere' invocation
John Keeping (3):
config: fail if --get-urlmatch finds no value
Documentation/git-config: use bulleted list for exit codes
Documentation/git-config: fix --get-all description
Junio C Hamano (77):
rerere: split conflict ID further
rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
index-pack: correct --keep[=<msg>]
index-pack: add a helper function to derive .idx/.keep filename
rerere: handle leftover rr-cache/$ID directory and postimage files
rerere: delay the recording of preimage
rerere: allow multiple variants to exist
t4200: rerere a merge with two identical conflicts
rerere: do use multiple variants
apply: remove unused call to free() in gitdiff_{old,new}name()
merge: fix NULL pointer dereference when merging nothing into void
merge: refuse to create too cool a merge by default
pretty: enable --expand-tabs by default for selected pretty formats
pretty: allow tweaking tabwidth in --expand-tabs
submodule--helper: do not borrow absolute_path() result for too long
Git 2.8.1
First batch for post 2.8 cycle
pretty: test --expand-tabs
Makefile: fix misdirected redirections
Second batch for post 2.8 cycle
Makefile: stop pretending to support rpmbuild
rerere: gc and clear
rerere: move code related to "forget" together
rerere: split code to call ll_merge() further
rerere: adjust 'forget' to multi-variant world order
setup.c: do not feed NULL to "%.*s" even with precision 0
Third batch for post 2.8 cycle
http: differentiate socks5:// and socks5h://
t1020: do not overuse printf and use write_script
t3404: use write_script
Fourth batch for post 2.8 cycle
Start preparing for 2.8.2
fsck_commit_buffer(): do not special case the last validation
ll-merge: fix typo in comment
Prepare for 2.8.2
Makefile: clean *.o files we create
Fifth batch for post 2.8 cycle
t3033: avoid 'ambiguous refs' warning
pull: pass --allow-unrelated-histories to "git merge"
Sixth batch for post 2.8 cycle
send-email: fix grammo in the prompt that asks e-mail recipients
Seventh batch for post 2.8 cycle
Git 2.8.2
Eighth batch for 2.9
diff: undocument the compaction heuristic knobs for experimentation
Start preparing for 2.8.3
commit-tree: do not pay attention to commit.gpgsign
Ninth batch for 2.9
config: describe 'pathname' value type
Tenth batch for 2.9
Almost ready for 2.8.3
test-lib-functions.sh: remove misleading comment on test_seq
test-lib-functions.sh: rewrite test_seq without Perl
ll-merge: use a longer conflict marker for internal merge
t6036: remove pointless test that expects failure
Documentation: fix linkgit references
fsck: detect and warn a commit with embedded NUL
ci: validate "linkgit:" in documentation
test-parse-options: fix output when callback option fails
test-parse-options: --expect=<string> option to simplify tests
t0040: remove unused test helpers
t0040: convert a few tests to use test-parse-options --expect
Eleventh batch for 2.9
rerere: plug memory leaks upon "rerere forget" failure
Twelfth batch for 2.9
Thirteenth batch for 2.9
Git 2.8.3
rerere: remove an null statement
Git 2.9-rc0
t4204: do not let $name variable clobbered
Start preparing for 2.8.4
Final batch before 2.9-rc1
More topics for 2.8.4
Git 2.9-rc1
Almost ready for 2.9-rc2
Git 2.8.4
Git 2.9-rc2
Karsten Blees (1):
mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
Kazuki Yamaguchi (10):
branch -d: refuse deleting a branch which is currently checked out
refs: add a new function set_worktree_head_symref
branch -m: update all per-worktree HEADs
set_worktree_head_symref(): fix error message
imap-send: use HMAC() function provided by OpenSSL
imap-send: check NULL return of SSL_CTX_new()
imap-send: avoid deprecated TLSv1_method()
configure: remove checking for HMAC_CTX_cleanup
imap-send: check for NOLOGIN capability only when using LOGIN command
imap-send: fix CRAM-MD5 response calculation
Keller Fuchs (1):
Documentation: clarify signature verification
Lars Schneider (8):
git-p4: map a P4 user to Git author name and email address
travis-ci: update Git-LFS and P4 to the latest version
travis-ci: express Linux/OS X dependency versions more clearly
git-p4: fix Git LFS pointer parsing
t9824: fix wrong reference value
Documentation: add setup instructions for Travis CI
travis-ci: build documentation
travis-ci: enable Git SVN tests t91xx on Linux
Laurent Arnoud (1):
tag: add the option to force signing of annotated tags
Li Peng (1):
typofix: assorted typofixes in comments, documentation and messages
Linus Torvalds (1):
pretty: expand tabs in indented logs to make things line up properly
Luke Diamand (3):
git-p4 tests: cd to / before running python
git-p4 tests: work with python3 as well as python2
git-p4 tests: time_in_seconds should use $PYTHON_PATH
Marios Titas (2):
ident: check for useConfigOnly before auto-detection of name/email
ident: give "please tell me" message upon useConfigOnly error
Matthieu Moy (13):
Documentation/diff-config: fix description of diff.renames
t4001-diff-rename: wrap file creations in a test
t: add tests for diff.renames (true/false/unset)
log: introduce init_log_defaults()
diff: activate diff.renames by default
lockfile: mark strings for translation
lockfile: improve error message when lockfile exists
git.spec.in: use README.md, not README
README.md: don't take 'commandname' literally
git-multimail: update to release 1.3.0
git-multimail: update to release 1.3.1
Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
Makefile: add $(DEVELOPER_CFLAGS) variable
Mehul Jain (9):
git-pull.c: introduce git_pull_config()
pull --rebase: add --[no-]autostash flag
t5520: use consistent capitalization in test titles
t5520: ensure consistent test conditions
t5520: use better test to check stderr output
t5520: factor out common "successful autostash" code
t5520: factor out common "failing autostash" code
t5520: reduce commom lines of code
t5520: test --[no-]autostash with pull.rebase=true
Michael Haggerty (19):
t1430: test the output and error of some commands more carefully
t1430: clean up broken refs/tags/shadow
t1430: don't rely on symbolic-ref for creating broken symrefs
t1430: test for-each-ref in the presence of badly-named refs
t1430: improve test coverage of deletion of badly-named refs
resolve_missing_loose_ref(): simplify semantics
resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
resolve_ref_unsafe(): ensure flags is always set
resolve_ref_1(): eliminate local variable
resolve_ref_1(): reorder code
resolve_ref_1(): eliminate local variable "bad_name"
read_raw_ref(): manage own scratch space
files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
read_raw_ref(): change flags parameter to unsigned int
fsck_head_link(): remove unneeded flag variable
cmd_merge(): remove unneeded flag variable
checkout_paths(): remove unneeded flag variable
check_aliased_update(): check that dst_name is non-NULL
show_head_ref(): check the result of resolve_ref_namespace()
Michael J Gruber (1):
completion: complete --cherry-mark for git log
Michael Procter (1):
upload-pack: use argv_array for pack_objects
Michael Rappazzo (1):
Documentation: add instructions to help setup gmail 2FA
Nguyễn Thái Ngọc Duy (62):
git-apply.txt: remove a space
git-apply.txt: mention the behavior inside a subdir
apply: report patch skipping in verbose mode
test helpers: move test-* to t/helper/ subdirectory
dir.c: remove dead function fnmatch_icase()
wrapper.c: delete dead function git_mkstemps()
dir.c: rename str(n)cmp_icase to fspath(n)cmp
path.c: add git_common_path() and strbuf_git_common_path()
worktree.c: store "id" instead of "git_dir"
worktree.c: make find_shared_symref() return struct worktree *
worktree.c: mark current worktree
path.c: refactor and add worktree_git_path()
wt-status.c: split rebase detection out of wt_status_get_state()
wt-status.c: make wt_status_check_rebase() work on any worktree
worktree.c: avoid referencing to worktrees[i] multiple times
worktree.c: check whether branch is rebased in another worktree
wt-status.c: split bisect detection out of wt_status_get_state()
worktree.c: check whether branch is bisected in another worktree
branch: do not rename a branch under bisect or rebase
remote.c: specify correct plural form in "commit diverge" message
usage.c: move format processing out of die_errno()
usage.c: add warning_errno() and error_errno()
bisect.c: use die_errno() and warning_errno()
builtin/am.c: use error_errno()
builtin/branch.c: use error_errno()
builtin/fetch.c: use error_errno()
builtin/help.c: use warning_errno()
builtin/mailsplit.c: use error_errno()
builtin/merge-file.c: use error_errno()
builtin/pack-objects.c: use die_errno() and warning_errno()
builtin/rm.c: use warning_errno()
builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
builtin/upload-archive.c: use error_errno()
builtin/worktree.c: use error_errno()
check-racy.c: use error_errno()
combine-diff.c: use error_errno()
compat/win32/syslog.c: use warning_errno()
config.c: use error_errno()
connected.c: use error_errno()
copy.c: use error_errno()
credential-cache--daemon.c: use warning_errno()
diff-no-index.c: use error_errno()
editor.c: use error_errno()
entry.c: use error_errno()
fast-import.c: use error_errno()
gpg-interface.c: use error_errno()
grep.c: use error_errno()
http.c: use error_errno() and warning_errno()
ident.c: use warning_errno()
mailmap.c: use error_errno()
reachable.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
run-command.c: use error_errno()
sequencer.c: use error_errno()
server-info.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
transport-helper.c: use error_errno()
unpack-trees.c: use error_errno()
upload-pack.c: use error_errno()
vcs-svn: use error_errno()
wrapper.c: use warning_errno()
wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Nikola Forró (1):
difftool/mergetool: make the form of yes/no questions consistent
Ori Avtalion (1):
Documentation: git diff --check detects conflict markers
Pablo Santiago Blum de Aguiar (1):
git-cherry-pick.txt: correct a small typo
Pranit Bauva (9):
t/t7502 : drop duplicate test
api-parse-options.txt: document OPT_CMDMODE()
t0040-test-parse-options.sh: fix style issues
test-parse-options: print quiet as integer
t0040-parse-options: improve test coverage
t/t7507: improve test coverage
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
t7507-commit-verbose: improve test coverage by testing number of diffs
commit: add a commit.verbose config variable
Ralf Thielow (4):
completion: add option '--guides' to 'git help'
completion: add 'revisions' and 'everyday' to 'git help'
rebase-i: print an abbreviated hash when stop for editing
string_list: use string-list API in unsorted_string_list_lookup()
Ramsay Jones (3):
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
xdiff/xprepare: fix a memory leak
log: document the --decorate=auto option
Ray Zhang (1):
worktree: add: introduce --checkout option
René Nyffenegger (1):
Documentation: fix typo 'In such these cases'
René Scharfe (3):
apply: remove unused parameters from name_terminate()
patch-id: use starts_with() and skip_prefix()
perf: make the tests work without a worktree
SZEDER Gábor (6):
diffcore: fix iteration order of identical files during rename detection
for-each-ref: fix description of '--contains' in manpage
test-lib: simplify '--option=value' parsing
t9824: fix broken &&-chain in a subshell
t5510: run auto-gc in the foreground
Documentation/git-send-email: fix typo in gmail 2FA section
Santiago Torres (6):
builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
t7030: test verifying multiple tags
verify-tag: update variable name and type
verify-tag: prepare verify_tag for libification
verify-tag: move tag verification code to tag.c
tag -v: verify directly rather than exec-ing verify-tag
Saurav Sachidanand (1):
dir: store EXC_FLAG_* values in unsigned integers
Shin Kojima (1):
gitweb: apply fallback encoding before highlight
Sidhant Sharma [:tk] (1):
builtin/receive-pack.c: use parse_options API
Stanislav Kolotinskiy (1):
git-send-pack: fix --all option when used with directory
Stefan Beller (46):
submodule-config: keep update strategy around
submodule-config: drop check against NULL
fetching submodules: respect `submodule.fetchJobs` config option
submodule update: direct error message to stderr
run_processes_parallel: treat output of children as byte array
run_processes_parallel: rename parameters for the callbacks
git submodule update: have a dedicated helper for cloning
submodule helper: remove double 'fatal: ' prefix
submodule update: expose parallelism to the user
clone: allow an explicit argument for parallel submodule clones
clone tests: rename t57* => t56*
rebase: decouple --exec from --interactive
t3404: cleanup double empty lines between tests
submodule foreach: correct path display in recursive submodules
submodule update --init: correct path handling in recursive submodules
submodule status: correct path handling in recursive submodules
submodule update: align reporting path for custom command execution
submodule update: test recursive path reporting from subdirectory
t7407: make expectation as clear as possible
recursive submodules: test for relative paths
submodule--helper: fix potential NULL-dereference
submodule--helper clone: create the submodule path just once
notes: don't leak memory in git_config_get_notes_strategy
abbrev_sha1_in_line: don't leak memory
bundle: don't leak an fd in case of early return
credential-cache, send_request: close fd when done
submodule--helper, module_clone: always operate on absolute paths
submodule--helper, module_clone: catch fprintf failure
submodule: port resolve_relative_url from shell to C
submodule: port init from shell to C
xdiff: implement empty line chunk heuristic
mv: allow moving nested submodules
clone: add `--shallow-submodules` flag
config doc: improve exit code listing
config.c: drop local variable
submodule-config: don't shadow `cache`
submodule init: fail gracefully with a missing .gitmodules file
submodule--helper update-clone: abort gracefully on missing .gitmodules
submodule deinit test: fix broken && chain in subshell
submodule init: redirect stdout to stderr
t7300: mark test with SANITY
submodule deinit: require '--all' instead of '.' for all submodules
t3513: do not compress backup tar file
t6041: do not compress backup tar file
submodule--helper: offer a consistent API
submodule: remove bashism from shell script
Stephen P. Smith (1):
wt-status.c: set commitable bit if there is a meaningful merge.
Sven Strickroth (3):
commit: do not lose SQUASH_MSG contents
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
MSVC: use shipped headers instead of fallback definitions
Torsten Bögershausen (6):
correct blame for files commited with CRLF
t0027: make commit_chk_wrnNNO() reliable
convert: allow core.autocrlf=input and core.eol=crlf
t0027: test cases for combined attributes
convert.c: ident + core.autocrlf didn't work
t5601: Remove trailing space in sed expression
Vasco Almeida (16):
l10n: fr: fix transcation of "dir"
l10n: fr: fix wrongly translated option name
l10n: fr: change "id de clé" to match "id-clé"
l10n: fr: don't translate "merge" as a parameter
i18n: index-pack: use plural string instead of normal one
i18n: builtin/branch.c: mark option for translation
i18n: unpack-trees: mark strings for translation
i18n: builtin/rm.c: remove a comma ',' from string
i18n: branch: unmark string for translation
i18n: branch: move comment for translators
i18n: git-parse-remote.sh: mark strings for translation
i18n: builtin/pull.c: mark placeholders for translation
i18n: builtin/pull.c: split strings marked for translation
i18n: remote: add comment for translators
Documentation/git-mailinfo: fix typo
i18n: unpack-trees: avoid substituting only a verb in sentences
Xiaolong Ye (4):
patch-ids: make commit_patch_id() a public helper function
format-patch: add '--base' option to record base tree info
format-patch: introduce --base=auto option
format-patch: introduce format.useAutoBase configuration
brian m. carlson (6):
sha1-name: introduce a get_oid() function
test-match-trees: convert to use struct object_id
match-trees: convert shift_tree() and shift_tree_by() to use object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
tree-walk: convert tree_entry_extract() to use struct object_id
match-trees: convert several leaf functions to use struct object_id
Ævar Arnfjörð Bjarmason (4):
githooks.txt: improve the intro section
githooks.txt: amend dangerous advice about 'update' hook ACL
githooks.txt: minor improvements to the grammar & phrasing
hooks: allow customizing where the hook directory is
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v2.9.0-rc1
@ 2016-05-31 21:53 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-31 21:53 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
A release candidate Git v2.9.0-rc1 is now available for testing
at the usual places. It is comprised of 462 non-merge commits
since v2.8.0, contributed by 63 people, 24 of which are new faces.
There still are a few topics yet to be merged to 'master' for the
upcoming release, but otherwise this is pretty much "feature
complete". One known brown-paper-bag breakage exists in t/perf/,
whose fix is still in 'next'.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.9.0-rc1' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.8.0 are as follows.
Welcome to the Git development community!
Alexander Rinass, Armin Kunaschik, Ben Woosley, Gabriel Souza
Franco, Jacob Nisnevich, Jan Durovec, Jean-Noël Avila, Kazuki
Yamaguchi, Keller Fuchs, Laurent Arnoud, Li Peng, Marios Titas,
Mehul Jain, Michael Procter, Nikola Forró, Pranit Bauva, Ray
Zhang, René Nyffenegger, Santiago Torres, Saurav Sachidanand,
Shin Kojima, Sidhant Sharma [:tk], Stanislav Kolotinskiy,
and Xiaolong Ye.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alexander Kuleshov,
brian m. carlson, Brian Norris, Christian Couder, David Aguilar,
David Turner, Dennis Kaarsemaker, Elia Pinto, Elijah Newren,
Eric Sunshine, Eric Wong, Felipe Contreras, Jacob Keller,
Jeff King, Jiang Xin, Johannes Schindelin, Johannes Sixt,
John Keeping, Junio C Hamano, Karsten Blees, Lars Schneider,
Linus Torvalds, Luke Diamand, Matthieu Moy, Michael Haggerty,
Michael J Gruber, Michael Rappazzo, Nguyễn Thái Ngọc Duy,
Ori Avtalion, Ralf Thielow, Ramsay Jones, Stefan Beller, Stephen
P. Smith, Sven Strickroth, SZEDER Gábor, Torsten Bögershausen,
and Vasco Almeida.
----------------------------------------------------------------
Git 2.9 Release Notes (draft)
=============================
Backward compatibility notes
----------------------------
The end-user facing Porcelain level commands in the "git diff" and
"git log" family by default enable the rename detection; you can still
use "diff.renames" configuration variable to disable this.
Merging two branches that have no common ancestor with "git merge" is
by default forbidden now to prevent creating such an unusual merge by
mistake.
The output formats of "git log" that indents the commit log message by
4 spaces now expands HT in the log message by default. You can use
the "--no-expand-tabs" option to disable this.
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake, which this release corrects.
A script that drives commit-tree, if it relies on this mistake, now
needs to read commit.gpgsign and pass the -S option as necessary.
Updates since v2.8
------------------
UI, Workflows & Features
* Comes with git-multimail 1.3.1 (in contrib/).
* The end-user facing commands like "git diff" and "git log"
now enable the rename detection by default.
* The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
* A new "interactive.diffFilter" configuration can be used to
customize the diff shown in "git add -i" sessions.
* "git p4" now allows P4 author names to be mapped to Git author
names.
* "git rebase -x" can be used without passing "-i" option.
* "git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
* "git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
* "git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
* "git pull" has been taught to pass the "--allow-unrelated-histories"
option to underlying "git merge".
* "git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
* Shell completion (in contrib/) updates.
* The commit object name reported when "rebase -i" stops has been
shortened.
* "git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
* "git mergetools" learned to drive ExamDiff.
* "git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
* When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default to help
such a case, and allows the users to override it with a new option,
"--no-expand-tabs".
* "git send-email" now uses a more readable timestamps when
formulating a message ID.
* "git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* "git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
* "git describe --contains" often made a hard-to-justify choice of
tag to name a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
(merge 7550424 js/name-rev-use-oldest-ref later to maint).
* "git clone" learned the "--shallow-submodules" option.
* HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
* Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to logically separate units.
* A new configuration variable core.hooksPath allows customizing
where the hook directory is.
* An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
* "git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
* The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
* "git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
* "git commit" learned to pay attention to the "commit.verbose"
configuration variable and act as if the "--verbose" option
was given from the command line.
* Updated documentation gives hints to GMail users with two-factor
auth enabled that they need app-specific-password when using
"git send-email".
Performance, Internal Implementation, Development Support etc.
* The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
* The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
* A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel. Other updates to "git submodule" that move pieces of
logic to C continues.
* Rename bunch of tests on "git clone" for better organization.
* The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* Build updates for MSVC.
* The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* Code restructuring around the "refs" API to prepare for pluggable
refs backends.
* Sources to many test helper binaries and the generated helpers
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
* Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
* "merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
* Move from "unsigned char[20]" to "struct object_id" continues.
* The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
(merge 1da045f nd/error-errno later to maint).
* Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
(merge d88785e jk/test-send-sh-x-trace-elsewhere later to maint).
* t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
* Add perf test for "rebase -i".
* Common mistakes when writing gitlink: in our documentation are
found by "make check-docs".
* t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelain commands have
also been updated to fix possible bugs around their use of
"test -z" and "test -n".
* CI test was taught to run git-svn tests.
* "git cat-file --batch-all" has been sped up, by taking advantage
of the fact that it does not have to read a list of objects, in two
ways.
* test updates to make it more readable and maintainable.
(merge e6273f4 es/t1500-modernize later to maint).
Also contains various documentation updates and code clean-ups.
Fixes since v2.8
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* "git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
* Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* A small memory leak in an error codepath has been plugged in xdiff
code.
* strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* "git mergetool" did not work well with conflicts that both sides
deleted.
* "git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* "git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree,
which was wrong.
* When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* "git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
* When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
* A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
* A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
* "git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
* Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
* Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
elements we use in imap-send, which has been adjusted for the change.
* The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently from socks5:// proxies.
* "git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
* On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.
This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds. It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
* "merge-octopus" strategy did not ensure that the index is clean
when merge begins.
* When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which left an inconsistent state that would
break later operations.
* "git submodule" reports the paths of submodules the command
recurses into, but these paths were incorrectly reported when
the command was not run from the root level of the superproject.
* The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
* "git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
* "git replace -e" did not honour "core.editor" configuration.
* "git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
* mmap emulation on Windows has been optimized and work better without
consuming paging store when not needed.
* A question by "git send-email" to ask the identity of the sender
has been updated.
* UI consistency improvements for "git mergetool".
* "git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
* Fix a broken "p4 lfs" test.
* Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* "git fetch" test t5510 was flaky while running a (forced) automagic
garbage collection.
* Documentation updates to help contributors setting up Travis CI
test for their patches.
* Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
* "git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
* "http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
(merge e5a39ad bn/http-cookiefile-config later to maint).
* Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
(merge dca83ab jc/config-pathname-type later to maint).
* Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
(merge f6a5279 sb/submodule-deinit-all later to maint).
* Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
(merge 1cca17d jc/linkgit-fix later to maint).
* "git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
(merge 0f9fd5c jc/ll-merge-internal later to maint).
* CI test was taught to build documentation pages.
(merge b98712b ls/travis-build-doc later to maint).
* "git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
(merge 6d2d780 jc/fsck-nul-in-commit later to maint).
* Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
(merge 8e98b35 jk/rebase-interactive-eval-fix later to maint).
* On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
(merge ebf31e7 js/windows-dotgit later to maint).
* Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified. Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.
(merge 05a5869 kf/gpg-sig-verification-doc later to maint).
* A couple of bugs around core.autocrlf have been fixed.
(merge caa47ad tb/core-eol-fix later to maint).
* Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
(merge 90a78b8 ar/diff-args-osx-precompose later to maint).
* "git difftool" learned to handle unmerged paths correctly in
dir-diff mode.
(merge 366f9ce da/difftool later to maint).
* The "are we talking with TTY, doing an interactive session?"
detection has been updated to work better for "Git for Windows".
(merge f7f90e0 kb/msys2-tty later to maint).
* We forgot to add "git log --decorate=auto" to documentation when we
added the feature back in v2.1.0 timeframe.
(merge 462cbb4 rj/log-decorate-auto later to maint).
* "git fast-import --export-marks" would overwrite the existing marks
file even when it makes a dump from its custom die routine.
Prevent it from doing so when we have an import-marks file but
haven't finished reading it.
(merge f4beed6 fc/fast-import-broken-marks-file later to maint).
* Other minor clean-ups and documentation updates
(merge 832c0e5 lp/typofixes later to maint).
(merge f5ee54a sb/z-is-gnutar-ism later to maint).
(merge 2e3926b va/i18n-misc-updates later to maint).
(merge f212dcc bn/config-doc-tt-varnames later to maint).
(merge f54bea4 nd/remote-plural-ours-plus-theirs later to maint).
(merge 2bb0518 ak/t4151-ls-files-could-be-empty later to maint).
(merge 4df4313 jc/test-seq later to maint).
(merge a75a308 tb/t5601-sed-fix later to maint).
(merge 6c1fbe1 va/i18n-remote-comment-to-align later to maint).
(merge dee2303 va/mailinfo-doc-typofix later to maint).
----------------------------------------------------------------
Changes since v2.8.0 are as follows:
Adam Dinwoodie (2):
config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
commit: --amend -m '' silently fails to wipe message
Alexander Kuleshov (1):
submodule-config: use hashmap_iter_first()
Alexander Rinass (1):
diff: run arguments through precompose_argv
Armin Kunaschik (2):
t4151: make sure argument to 'test -z' is given
t0008: 4 tests fail with ksh88
Ben Woosley (1):
git-rebase--merge: don't include absent parent as a base
Brian Norris (3):
Documentation: config: improve word ordering for http.cookieFile
http: expand http.cookieFile as a path
config: consistently format $variables in monospaced font
Christian Couder (5):
Documentation: talk about pager in api-trace.txt
builtin/apply: get rid of useless 'name' variable
builtin/apply: handle parse_binary() failure
builtin/apply: free patch when parse_chunk() fails
Git/SVN: die when there is no commit metadata
David Aguilar (4):
mergetool: support delete/delete conflicts
mergetool: honor tempfile configuration when resolving delete conflicts
difftool: initialize variables for readability
difftool: handle unmerged files in dir-diff mode
David Turner (5):
refs: move head_ref{,_submodule} to the common code
refs: move for_each_*ref* functions into common code
files-backend: break out ref reading
refs: move resolve_ref_unsafe into common code
refs: on symref reflog expire, lock symref not referrent
Dennis Kaarsemaker (1):
Makefile: remove dependency on git.spec
Elia Pinto (1):
api-trace.txt: fix typo
Elijah Newren (6):
merge-recursive: remove duplicate code
merge-recursive: do not check working copy when creating a virtual merge base
t7605: add a testcase demonstrating a bug with trivial merges
builtin/merge.c: fix a bug with trivial merges
merge-octopus: abort if index does not match HEAD
t6044: new merge testcases for when index doesn't match HEAD
Eric Sunshine (10):
lib-gpg: drop unnecessary "missing GPG" warning
t6302: normalize names and descriptions of signed tags
t6302: also test annotated in addition to signed tags
t6302: skip only signed tags rather than all tests when GPG is missing
git-format-patch.txt: don't show -s as shorthand for multiple options
t1500: be considerate to future potential tests
t1500: test_rev_parse: facilitate future test enhancements
t1500: avoid changing working directory outside of tests
t1500: avoid setting configuration options outside of tests
t1500: avoid setting environment variables outside of tests
Eric Wong (4):
send-email: more meaningful Message-ID
send-email: do not load Data::Dumper
pack-objects: warn on split packs disabling bitmaps
.mailmap: update to my shorter email address
Felipe Contreras (1):
fast-import: do not truncate exported marks file
Gabriel Souza Franco (2):
fetch-pack: fix object_id of exact sha1
fetch-pack: update the documentation for "<refs>..." arguments
Jacob Keller (7):
submodule: don't pass empty string arguments to submodule--helper clone
submodule: check argc count for git submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: fix segmentation fault in submodule--helper clone
quote: implement sq_quotef()
git: submodule honor -c credential.* from command line
xdiff: add recs_match helper function
Jacob Nisnevich (2):
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
mergetools: add support for ExamDiff
Jan Durovec (2):
git-p4: clean-up code style in tests
git-p4: add P4 jobs to git commit message
Jeff King (55):
credential: let empty credential specs reset helper list
t1515: add tests for rev-parse out-of-repo helpers
add--interactive: allow custom diff highlighting programs
rev-parse: let some options run outside repository
strbuf_getwholeline: NUL-terminate getdelim buffer on error
setup: make startup_info available everywhere
setup: set startup_info->have_repository more reliably
remote: don't resolve HEAD in non-repository
mailmap: do not resolve blobs in a non-repository
grep: turn off gitlink detection for --no-index
use setup_git_directory() in test-* programs
setup: document check_repository_format()
wrap shared_repository global in get/set accessors
lazily load core.sharedrepository
check_repository_format_gently: stop using git_config_early
config: drop git_config_early
setup: refactor repo format reading and verification
init: use setup.c's repo version verification
setup: unify repository version callbacks
setup: drop repository_format_version global
verify_repository_format: mark messages for translation
send-email: ignore trailing whitespace in mailrc alias file
credential-cache--daemon: clarify "exit" action semantics
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
branch: fix shortening of non-remote symrefs
commit: do not ignore an empty message given by -m ''
config: lower-case first word of error strings
git_config_set_multivar_in_file: all non-zero returns are errors
git_config_set_multivar_in_file: handle "unset" errors
t5532: use write_script
send-pack: close demux pipe before finishing async process
run-command: teach async threads to ignore SIGPIPE
send-pack: isolate sigpipe in demuxer thread
fetch-pack: isolate sigpipe in demuxer thread
t5504: drop sigpipe=ok from push tests
remote.c: spell __attribute__ correctly
t5550: fix typo in $HTTPD_URL
t5550: break submodule config test into multiple sub-tests
submodule: export sanitized GIT_CONFIG_PARAMETERS
submodule--helper: move config-sanitizing to submodule.c
submodule: use prepare_submodule_repo_env consistently
submodule: stop sanitizing config options
t6302: simplify non-gpg cases
rebase--interactive: avoid empty list in shell for-loop
test-lib: set BASH_XTRACEFD automatically
t/lib-git-svn: drop $remote_git_svn and $git_svn_id
t9100,t3419: enclose all test code in single-quotes
t9107: use "return 1" instead of "exit 1"
t9107: switch inverted single/double quotes in test
t9103: modernize test style
always quote shell arguments to test -z/-n
cat-file: avoid noop calls to sha1_object_info_extended
cat-file: default to --buffer when --batch-all-objects is used
archive-tar: convert snprintf to xsnprintf
Johannes Schindelin (16):
replace --edit: respect core.editor
name-rev: include taggerdate in considering the best name
win32mmap: set errno appropriately
mmap(win32): avoid copy-on-write when it is unnecessary
mmap(win32): avoid expensive fstat() call
http: support sending custom HTTP headers
tests: adjust the configuration for Apache 2.2
t5551: make the test for extra HTTP headers more robust
t3404: fix typo
submodule: ensure that -c http.extraheader is heeded
mingw: introduce the 'core.hideDotFiles' setting
mingw: remove unnecessary definition
Windows: only add a no-op pthread_sigmask() when needed
perf: let's disable symlinks when they are not available
perf: make the tests work in worktrees
perf: run "rebase -i" under perf
Johannes Sixt (3):
Windows: shorten code by re-using convert_slashes()
Windows: add pthread_sigmask() that does nothing
t6044: replace seq by test_seq
John Keeping (3):
config: fail if --get-urlmatch finds no value
Documentation/git-config: use bulleted list for exit codes
Documentation/git-config: fix --get-all description
Junio C Hamano (74):
rerere: split conflict ID further
rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
index-pack: correct --keep[=<msg>]
index-pack: add a helper function to derive .idx/.keep filename
rerere: handle leftover rr-cache/$ID directory and postimage files
rerere: delay the recording of preimage
rerere: allow multiple variants to exist
t4200: rerere a merge with two identical conflicts
rerere: do use multiple variants
apply: remove unused call to free() in gitdiff_{old,new}name()
merge: fix NULL pointer dereference when merging nothing into void
merge: refuse to create too cool a merge by default
pretty: enable --expand-tabs by default for selected pretty formats
pretty: allow tweaking tabwidth in --expand-tabs
submodule--helper: do not borrow absolute_path() result for too long
Git 2.8.1
First batch for post 2.8 cycle
pretty: test --expand-tabs
Makefile: fix misdirected redirections
Second batch for post 2.8 cycle
Makefile: stop pretending to support rpmbuild
rerere: gc and clear
rerere: move code related to "forget" together
rerere: split code to call ll_merge() further
rerere: adjust 'forget' to multi-variant world order
setup.c: do not feed NULL to "%.*s" even with precision 0
Third batch for post 2.8 cycle
http: differentiate socks5:// and socks5h://
t1020: do not overuse printf and use write_script
t3404: use write_script
Fourth batch for post 2.8 cycle
Start preparing for 2.8.2
fsck_commit_buffer(): do not special case the last validation
ll-merge: fix typo in comment
Prepare for 2.8.2
Makefile: clean *.o files we create
Fifth batch for post 2.8 cycle
t3033: avoid 'ambiguous refs' warning
pull: pass --allow-unrelated-histories to "git merge"
Sixth batch for post 2.8 cycle
send-email: fix grammo in the prompt that asks e-mail recipients
Seventh batch for post 2.8 cycle
Git 2.8.2
Eighth batch for 2.9
diff: undocument the compaction heuristic knobs for experimentation
Start preparing for 2.8.3
commit-tree: do not pay attention to commit.gpgsign
Ninth batch for 2.9
config: describe 'pathname' value type
Tenth batch for 2.9
Almost ready for 2.8.3
test-lib-functions.sh: remove misleading comment on test_seq
test-lib-functions.sh: rewrite test_seq without Perl
ll-merge: use a longer conflict marker for internal merge
t6036: remove pointless test that expects failure
Documentation: fix linkgit references
fsck: detect and warn a commit with embedded NUL
ci: validate "linkgit:" in documentation
test-parse-options: fix output when callback option fails
test-parse-options: --expect=<string> option to simplify tests
t0040: remove unused test helpers
t0040: convert a few tests to use test-parse-options --expect
Eleventh batch for 2.9
rerere: plug memory leaks upon "rerere forget" failure
Twelfth batch for 2.9
Thirteenth batch for 2.9
Git 2.8.3
rerere: remove an null statement
Git 2.9-rc0
t4204: do not let $name variable clobbered
Start preparing for 2.8.4
Final batch before 2.9-rc1
More topics for 2.8.4
Git 2.9-rc1
Karsten Blees (1):
mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
Kazuki Yamaguchi (10):
branch -d: refuse deleting a branch which is currently checked out
refs: add a new function set_worktree_head_symref
branch -m: update all per-worktree HEADs
set_worktree_head_symref(): fix error message
imap-send: use HMAC() function provided by OpenSSL
imap-send: check NULL return of SSL_CTX_new()
imap-send: avoid deprecated TLSv1_method()
configure: remove checking for HMAC_CTX_cleanup
imap-send: check for NOLOGIN capability only when using LOGIN command
imap-send: fix CRAM-MD5 response calculation
Keller Fuchs (1):
Documentation: clarify signature verification
Lars Schneider (8):
git-p4: map a P4 user to Git author name and email address
travis-ci: update Git-LFS and P4 to the latest version
travis-ci: express Linux/OS X dependency versions more clearly
git-p4: fix Git LFS pointer parsing
t9824: fix wrong reference value
Documentation: add setup instructions for Travis CI
travis-ci: build documentation
travis-ci: enable Git SVN tests t91xx on Linux
Laurent Arnoud (1):
tag: add the option to force signing of annotated tags
Li Peng (1):
typofix: assorted typofixes in comments, documentation and messages
Linus Torvalds (1):
pretty: expand tabs in indented logs to make things line up properly
Luke Diamand (3):
git-p4 tests: cd to / before running python
git-p4 tests: work with python3 as well as python2
git-p4 tests: time_in_seconds should use $PYTHON_PATH
Marios Titas (2):
ident: check for useConfigOnly before auto-detection of name/email
ident: give "please tell me" message upon useConfigOnly error
Matthieu Moy (11):
Documentation/diff-config: fix description of diff.renames
t4001-diff-rename: wrap file creations in a test
t: add tests for diff.renames (true/false/unset)
log: introduce init_log_defaults()
diff: activate diff.renames by default
lockfile: mark strings for translation
lockfile: improve error message when lockfile exists
git.spec.in: use README.md, not README
README.md: don't take 'commandname' literally
git-multimail: update to release 1.3.0
git-multimail: update to release 1.3.1
Mehul Jain (9):
git-pull.c: introduce git_pull_config()
pull --rebase: add --[no-]autostash flag
t5520: use consistent capitalization in test titles
t5520: ensure consistent test conditions
t5520: use better test to check stderr output
t5520: factor out common "successful autostash" code
t5520: factor out common "failing autostash" code
t5520: reduce commom lines of code
t5520: test --[no-]autostash with pull.rebase=true
Michael Haggerty (19):
t1430: test the output and error of some commands more carefully
t1430: clean up broken refs/tags/shadow
t1430: don't rely on symbolic-ref for creating broken symrefs
t1430: test for-each-ref in the presence of badly-named refs
t1430: improve test coverage of deletion of badly-named refs
resolve_missing_loose_ref(): simplify semantics
resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
resolve_ref_unsafe(): ensure flags is always set
resolve_ref_1(): eliminate local variable
resolve_ref_1(): reorder code
resolve_ref_1(): eliminate local variable "bad_name"
read_raw_ref(): manage own scratch space
files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
read_raw_ref(): change flags parameter to unsigned int
fsck_head_link(): remove unneeded flag variable
cmd_merge(): remove unneeded flag variable
checkout_paths(): remove unneeded flag variable
check_aliased_update(): check that dst_name is non-NULL
show_head_ref(): check the result of resolve_ref_namespace()
Michael J Gruber (1):
completion: complete --cherry-mark for git log
Michael Procter (1):
upload-pack: use argv_array for pack_objects
Michael Rappazzo (1):
Documentation: add instructions to help setup gmail 2FA
Nguyễn Thái Ngọc Duy (62):
git-apply.txt: remove a space
git-apply.txt: mention the behavior inside a subdir
apply: report patch skipping in verbose mode
test helpers: move test-* to t/helper/ subdirectory
dir.c: remove dead function fnmatch_icase()
wrapper.c: delete dead function git_mkstemps()
dir.c: rename str(n)cmp_icase to fspath(n)cmp
path.c: add git_common_path() and strbuf_git_common_path()
worktree.c: store "id" instead of "git_dir"
worktree.c: make find_shared_symref() return struct worktree *
worktree.c: mark current worktree
path.c: refactor and add worktree_git_path()
wt-status.c: split rebase detection out of wt_status_get_state()
wt-status.c: make wt_status_check_rebase() work on any worktree
worktree.c: avoid referencing to worktrees[i] multiple times
worktree.c: check whether branch is rebased in another worktree
wt-status.c: split bisect detection out of wt_status_get_state()
worktree.c: check whether branch is bisected in another worktree
branch: do not rename a branch under bisect or rebase
remote.c: specify correct plural form in "commit diverge" message
usage.c: move format processing out of die_errno()
usage.c: add warning_errno() and error_errno()
bisect.c: use die_errno() and warning_errno()
builtin/am.c: use error_errno()
builtin/branch.c: use error_errno()
builtin/fetch.c: use error_errno()
builtin/help.c: use warning_errno()
builtin/mailsplit.c: use error_errno()
builtin/merge-file.c: use error_errno()
builtin/pack-objects.c: use die_errno() and warning_errno()
builtin/rm.c: use warning_errno()
builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
builtin/upload-archive.c: use error_errno()
builtin/worktree.c: use error_errno()
check-racy.c: use error_errno()
combine-diff.c: use error_errno()
compat/win32/syslog.c: use warning_errno()
config.c: use error_errno()
connected.c: use error_errno()
copy.c: use error_errno()
credential-cache--daemon.c: use warning_errno()
diff-no-index.c: use error_errno()
editor.c: use error_errno()
entry.c: use error_errno()
fast-import.c: use error_errno()
gpg-interface.c: use error_errno()
grep.c: use error_errno()
http.c: use error_errno() and warning_errno()
ident.c: use warning_errno()
mailmap.c: use error_errno()
reachable.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
run-command.c: use error_errno()
sequencer.c: use error_errno()
server-info.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
transport-helper.c: use error_errno()
unpack-trees.c: use error_errno()
upload-pack.c: use error_errno()
vcs-svn: use error_errno()
wrapper.c: use warning_errno()
wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Nikola Forró (1):
difftool/mergetool: make the form of yes/no questions consistent
Ori Avtalion (1):
Documentation: git diff --check detects conflict markers
Pranit Bauva (9):
t/t7502 : drop duplicate test
api-parse-options.txt: document OPT_CMDMODE()
t0040-test-parse-options.sh: fix style issues
test-parse-options: print quiet as integer
t0040-parse-options: improve test coverage
t/t7507: improve test coverage
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
t7507-commit-verbose: improve test coverage by testing number of diffs
commit: add a commit.verbose config variable
Ralf Thielow (4):
completion: add option '--guides' to 'git help'
completion: add 'revisions' and 'everyday' to 'git help'
rebase-i: print an abbreviated hash when stop for editing
string_list: use string-list API in unsorted_string_list_lookup()
Ramsay Jones (3):
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
xdiff/xprepare: fix a memory leak
log: document the --decorate=auto option
Ray Zhang (1):
worktree: add: introduce --checkout option
René Nyffenegger (1):
Documentation: fix typo 'In such these cases'
SZEDER Gábor (5):
diffcore: fix iteration order of identical files during rename detection
for-each-ref: fix description of '--contains' in manpage
test-lib: simplify '--option=value' parsing
t9824: fix broken &&-chain in a subshell
t5510: run auto-gc in the foreground
Santiago Torres (6):
builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
t7030: test verifying multiple tags
verify-tag: update variable name and type
verify-tag: prepare verify_tag for libification
verify-tag: move tag verification code to tag.c
tag -v: verify directly rather than exec-ing verify-tag
Saurav Sachidanand (1):
dir: store EXC_FLAG_* values in unsigned integers
Shin Kojima (1):
gitweb: apply fallback encoding before highlight
Sidhant Sharma [:tk] (1):
builtin/receive-pack.c: use parse_options API
Stanislav Kolotinskiy (1):
git-send-pack: fix --all option when used with directory
Stefan Beller (44):
submodule-config: keep update strategy around
submodule-config: drop check against NULL
fetching submodules: respect `submodule.fetchJobs` config option
submodule update: direct error message to stderr
run_processes_parallel: treat output of children as byte array
run_processes_parallel: rename parameters for the callbacks
git submodule update: have a dedicated helper for cloning
submodule helper: remove double 'fatal: ' prefix
submodule update: expose parallelism to the user
clone: allow an explicit argument for parallel submodule clones
clone tests: rename t57* => t56*
rebase: decouple --exec from --interactive
t3404: cleanup double empty lines between tests
submodule foreach: correct path display in recursive submodules
submodule update --init: correct path handling in recursive submodules
submodule status: correct path handling in recursive submodules
submodule update: align reporting path for custom command execution
submodule update: test recursive path reporting from subdirectory
t7407: make expectation as clear as possible
recursive submodules: test for relative paths
submodule--helper: fix potential NULL-dereference
submodule--helper clone: create the submodule path just once
notes: don't leak memory in git_config_get_notes_strategy
abbrev_sha1_in_line: don't leak memory
bundle: don't leak an fd in case of early return
credential-cache, send_request: close fd when done
submodule--helper, module_clone: always operate on absolute paths
submodule--helper, module_clone: catch fprintf failure
submodule: port resolve_relative_url from shell to C
submodule: port init from shell to C
xdiff: implement empty line chunk heuristic
mv: allow moving nested submodules
clone: add `--shallow-submodules` flag
config doc: improve exit code listing
config.c: drop local variable
submodule-config: don't shadow `cache`
submodule init: fail gracefully with a missing .gitmodules file
submodule--helper update-clone: abort gracefully on missing .gitmodules
submodule deinit test: fix broken && chain in subshell
submodule init: redirect stdout to stderr
t7300: mark test with SANITY
submodule deinit: require '--all' instead of '.' for all submodules
t3513: do not compress backup tar file
t6041: do not compress backup tar file
Stephen P. Smith (1):
wt-status.c: set commitable bit if there is a meaningful merge.
Sven Strickroth (3):
commit: do not lose SQUASH_MSG contents
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
MSVC: use shipped headers instead of fallback definitions
Torsten Bögershausen (6):
correct blame for files commited with CRLF
t0027: make commit_chk_wrnNNO() reliable
convert: allow core.autocrlf=input and core.eol=crlf
t0027: test cases for combined attributes
convert.c: ident + core.autocrlf didn't work
t5601: Remove trailing space in sed expression
Vasco Almeida (16):
l10n: fr: fix transcation of "dir"
l10n: fr: fix wrongly translated option name
l10n: fr: change "id de clé" to match "id-clé"
l10n: fr: don't translate "merge" as a parameter
i18n: index-pack: use plural string instead of normal one
i18n: builtin/branch.c: mark option for translation
i18n: unpack-trees: mark strings for translation
i18n: builtin/rm.c: remove a comma ',' from string
i18n: branch: unmark string for translation
i18n: branch: move comment for translators
i18n: git-parse-remote.sh: mark strings for translation
i18n: builtin/pull.c: mark placeholders for translation
i18n: builtin/pull.c: split strings marked for translation
i18n: remote: add comment for translators
Documentation/git-mailinfo: fix typo
i18n: unpack-trees: avoid substituting only a verb in sentences
Xiaolong Ye (4):
patch-ids: make commit_patch_id() a public helper function
format-patch: add '--base' option to record base tree info
format-patch: introduce --base=auto option
format-patch: introduce format.useAutoBase configuration
brian m. carlson (6):
sha1-name: introduce a get_oid() function
test-match-trees: convert to use struct object_id
match-trees: convert shift_tree() and shift_tree_by() to use object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
tree-walk: convert tree_entry_extract() to use struct object_id
match-trees: convert several leaf functions to use struct object_id
Ævar Arnfjörð Bjarmason (4):
githooks.txt: improve the intro section
githooks.txt: amend dangerous advice about 'update' hook ACL
githooks.txt: minor improvements to the grammar & phrasing
hooks: allow customizing where the hook directory is
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] Git v2.9.0-rc0
@ 2016-05-23 23:23 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-23 23:23 UTC (permalink / raw)
To: git
An early preview release Git v2.9.0-rc0 is now available for
testing at the usual places. It is comprised of 443 non-merge
commits since v2.8.0, contributed by 60 people, 24 of which are
new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.9.0-rc0' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.8.0 are as follows.
Welcome to the Git development community!
Alexander Rinass, Armin Kunaschik, Ben Woosley, Gabriel Souza
Franco, Jacob Nisnevich, Jan Durovec, Jean-Noël Avila, Kazuki
Yamaguchi, Keller Fuchs, Laurent Arnoud, Li Peng, Marios Titas,
Mehul Jain, Michael Procter, Nikola Forró, Pranit Bauva, Ray
Zhang, René Nyffenegger, Santiago Torres, Saurav Sachidanand,
Shin Kojima, Sidhant Sharma [:tk], Stanislav Kolotinskiy,
and Xiaolong Ye.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alexander Kuleshov,
brian m. carlson, Brian Norris, Christian Couder, David Aguilar,
David Turner, Dennis Kaarsemaker, Elia Pinto, Elijah Newren,
Eric Sunshine, Eric Wong, Jacob Keller, Jeff King, Jiang Xin,
Johannes Schindelin, Johannes Sixt, John Keeping, Junio C Hamano,
Lars Schneider, Linus Torvalds, Luke Diamand, Matthieu Moy,
Michael Haggerty, Michael J Gruber, Nguyễn Thái Ngọc Duy,
Ori Avtalion, Ralf Thielow, Ramsay Jones, Stefan Beller, Stephen
P. Smith, Sven Strickroth, SZEDER Gábor, Torsten Bögershausen,
and Vasco Almeida.
----------------------------------------------------------------
Git 2.9 Release Notes (draft)
=============================
Backward compatibility note
---------------------------
The end-user facing Porcelain level commands in the "git diff" and
"git log" by default enables the rename detection; you can still use
"diff.renames" configuration variable to disable this.
Merging two branches that have no common ancestor with "git merge" is
by default forbidden now to prevent creating such an unusual merge by
mistake.
The output formats of "git log" that indents the commit log message by
4 spaces now expands HT in the log message by default. You can use
the "--no-expand-tabs" option to disable this.
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake, which this release corrects.
A script that drives commit-tree, if it relies on this mistake, now
needs to read commit.gpgsign and pass the -S option as necessary.
Updates since v2.8
------------------
UI, Workflows & Features
* Comes with git-multimail 1.3.1 (in contrib/).
* The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
* The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
* A new "interactive.diffFilter" configuration can be used to
customize the diff shown in "git add -i" session.
* "git p4" now allows P4 author names to be mapped to Git author
names.
* "git rebase -x" can be used without passing "-i" option.
* "git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
* "git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
* "git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
* "git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".
* "git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
* Shell completion (in contrib/) updates.
* The commit object name reported when "rebase -i" stops has been
shortened.
* "git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
* "git mergetools" learned to drive ExamDiff.
* "git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
* When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
"--no-expand-tabs".
* "git send-email" now uses a more readable timestamps when
formulating a message ID.
* "git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
(merge d9d501b068 jc/rerere-multi later to maint).
* "git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
* "git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
(merge 7550424 js/name-rev-use-oldest-ref later to maint).
* "git clone" learned "--shallow-submodules" option.
* HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
* Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
* A new configuration variable core.hooksPath allows customizing
where the hook directory is.
* An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
* "git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
* The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
* "git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
* "git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Performance, Internal Implementation, Development Support etc.
* The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
* The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
* A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.
* Rename bunch of tests on "git clone" for better organization.
* The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* Build updates for MSVC.
* The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* Code restructuring around the "refs" area to prepare for pluggable
refs backends.
* Sources to many test helper binaries (and the generated helpers)
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
* Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
(merge bef234b st/verify-tag later to maint).
* "merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
* Move from unsigned char[20] to struct object_id continues.
* Update of "git submodule" to move pieces of logic to C continues.
* The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
(merge 1da045f nd/error-errno later to maint).
* Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
(merge d88785e jk/test-send-sh-x-trace-elsewhere later to maint).
* t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
* Add perf test for "rebase -i"
* Common mistakes when writing gitlink: in our documentation are
found by "make check-docs".
* t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelains have also been
updated to fix possible bugs around their use of "test -z" and
"test -n".
* CI test was taught to run git-svn tests.
Also contains various documentation updates and code clean-ups.
Fixes since v2.8
----------------
Unless otherwise noted, all the fixes since v2.8 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* "git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
* Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* A small memory leak in an error codepath has been plugged in xdiff
code.
* strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* "git mergetool" did not work well with conflicts that both sides
deleted.
* "git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* "git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree,
which was wrong.
* When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* "git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
* When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
* A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
* A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
* "git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
* Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
* Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.
* The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.
* "git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
* On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.
This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds. It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
* "merge-octopus" strategy did not ensure that the index is clean
when merge begins.
* When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.
* "git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
* The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
* "git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
* "git replace -e" did not honour "core.editor" configuration.
* "git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
* mmap emulation on Windows has been optimized and work better without
consuming paging store when not needed.
* A question by "git send-email" to ask the identity of the sender
has been updated.
* UI consistency improvements for "git mergetool".
* "git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
(merge 79f4344 bw/rebase-merge-entire-branch later to maint).
* Fix a broken "p4 lfs" test.
* Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* "git fetch" test t5510 was flaky while running a (forced) automagic
garbage collection.
* Documentation updates to help contributors setting up Travis CI
test for their patches.
* Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
* "git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
(merge 6694856 jc/commit-tree-ignore-commit-gpgsign later to maint).
* "http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
(merge e5a39ad bn/http-cookiefile-config later to maint).
* Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
(merge dca83ab jc/config-pathname-type later to maint).
* Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
(merge f6a5279 sb/submodule-deinit-all later to maint).
* Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
(merge 1cca17d jc/linkgit-fix later to maint).
* "git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
(merge 0f9fd5c jc/ll-merge-internal later to maint).
* CI test was taught to build documentation pages.
(merge b98712b ls/travis-build-doc later to maint).
* "git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
(merge 6d2d780 jc/fsck-nul-in-commit later to maint).
* Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
(merge 8e98b35 jk/rebase-interative-eval-fix later to maint).
* On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
(merge ebf31e7 js/windows-dotgit later to maint).
* Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified. Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.
(merge 05a5869 kf/gpg-sig-verification-doc later to maint).
* A couple of bugs around core.autocrlf have been fixed.
(merge caa47ad tb/core-eol-fix later to maint).
* Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
(merge 90a78b8 ar/diff-args-osx-precompose later to maint).
* "git difftool" learned to handle unmerged paths correctly in
dir-diff mode.
(merge 366f9ce da/difftool later to maint).
* Other minor clean-ups and documentation updates
(merge 832c0e5 lp/typofixes later to maint).
(merge f5ee54a sb/z-is-gnutar-ism later to maint).
(merge 2e3926b va/i18n-misc-updates later to maint).
(merge f212dcc bn/config-doc-tt-varnames later to maint).
(merge f54bea4 nd/remote-plural-ours-plus-theirs later to maint).
(merge 2bb0518 ak/t4151-ls-files-could-be-empty later to maint).
(merge 4df4313 jc/test-seq later to maint).
(merge a75a308 tb/t5601-sed-fix later to maint).
(merge 6c1fbe1 va/i18n-remote-comment-to-align later to maint).
(merge dee2303 va/mailinfo-doc-typofix later to maint).
----------------------------------------------------------------
Changes since v2.8.0 are as follows:
Adam Dinwoodie (2):
config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
commit: --amend -m '' silently fails to wipe message
Alexander Kuleshov (1):
submodule-config: use hashmap_iter_first()
Alexander Rinass (1):
diff: run arguments through precompose_argv
Armin Kunaschik (1):
t4151: make sure argument to 'test -z' is given
Ben Woosley (1):
git-rebase--merge: don't include absent parent as a base
Brian Norris (3):
Documentation: config: improve word ordering for http.cookieFile
http: expand http.cookieFile as a path
config: consistently format $variables in monospaced font
Christian Couder (5):
Documentation: talk about pager in api-trace.txt
builtin/apply: get rid of useless 'name' variable
builtin/apply: handle parse_binary() failure
builtin/apply: free patch when parse_chunk() fails
Git/SVN: die when there is no commit metadata
David Aguilar (4):
mergetool: support delete/delete conflicts
mergetool: honor tempfile configuration when resolving delete conflicts
difftool: initialize variables for readability
difftool: handle unmerged files in dir-diff mode
David Turner (5):
refs: move head_ref{,_submodule} to the common code
refs: move for_each_*ref* functions into common code
files-backend: break out ref reading
refs: move resolve_ref_unsafe into common code
refs: on symref reflog expire, lock symref not referrent
Dennis Kaarsemaker (1):
Makefile: remove dependency on git.spec
Elia Pinto (1):
api-trace.txt: fix typo
Elijah Newren (6):
merge-recursive: remove duplicate code
merge-recursive: do not check working copy when creating a virtual merge base
t7605: add a testcase demonstrating a bug with trivial merges
builtin/merge.c: fix a bug with trivial merges
t6044: new merge testcases for when index doesn't match HEAD
merge-octopus: abort if index does not match HEAD
Eric Sunshine (5):
lib-gpg: drop unnecessary "missing GPG" warning
t6302: normalize names and descriptions of signed tags
t6302: also test annotated in addition to signed tags
t6302: skip only signed tags rather than all tests when GPG is missing
git-format-patch.txt: don't show -s as shorthand for multiple options
Eric Wong (4):
send-email: more meaningful Message-ID
send-email: do not load Data::Dumper
pack-objects: warn on split packs disabling bitmaps
.mailmap: update to my shorter email address
Gabriel Souza Franco (2):
fetch-pack: fix object_id of exact sha1
fetch-pack: update the documentation for "<refs>..." arguments
Jacob Keller (7):
submodule: don't pass empty string arguments to submodule--helper clone
submodule: check argc count for git submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: fix segmentation fault in submodule--helper clone
quote: implement sq_quotef()
git: submodule honor -c credential.* from command line
xdiff: add recs_match helper function
Jacob Nisnevich (2):
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
mergetools: add support for ExamDiff
Jan Durovec (2):
git-p4: clean-up code style in tests
git-p4: add P4 jobs to git commit message
Jeff King (52):
credential: let empty credential specs reset helper list
t1515: add tests for rev-parse out-of-repo helpers
add--interactive: allow custom diff highlighting programs
rev-parse: let some options run outside repository
strbuf_getwholeline: NUL-terminate getdelim buffer on error
setup: make startup_info available everywhere
setup: set startup_info->have_repository more reliably
remote: don't resolve HEAD in non-repository
mailmap: do not resolve blobs in a non-repository
grep: turn off gitlink detection for --no-index
use setup_git_directory() in test-* programs
setup: document check_repository_format()
wrap shared_repository global in get/set accessors
lazily load core.sharedrepository
check_repository_format_gently: stop using git_config_early
config: drop git_config_early
setup: refactor repo format reading and verification
init: use setup.c's repo version verification
setup: unify repository version callbacks
setup: drop repository_format_version global
verify_repository_format: mark messages for translation
send-email: ignore trailing whitespace in mailrc alias file
credential-cache--daemon: clarify "exit" action semantics
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
branch: fix shortening of non-remote symrefs
commit: do not ignore an empty message given by -m ''
config: lower-case first word of error strings
git_config_set_multivar_in_file: all non-zero returns are errors
git_config_set_multivar_in_file: handle "unset" errors
t5532: use write_script
send-pack: close demux pipe before finishing async process
run-command: teach async threads to ignore SIGPIPE
send-pack: isolate sigpipe in demuxer thread
fetch-pack: isolate sigpipe in demuxer thread
t5504: drop sigpipe=ok from push tests
remote.c: spell __attribute__ correctly
t5550: fix typo in $HTTPD_URL
t5550: break submodule config test into multiple sub-tests
submodule: export sanitized GIT_CONFIG_PARAMETERS
submodule--helper: move config-sanitizing to submodule.c
submodule: use prepare_submodule_repo_env consistently
submodule: stop sanitizing config options
t6302: simplify non-gpg cases
rebase--interactive: avoid empty list in shell for-loop
test-lib: set BASH_XTRACEFD automatically
t/lib-git-svn: drop $remote_git_svn and $git_svn_id
t9100,t3419: enclose all test code in single-quotes
t9107: use "return 1" instead of "exit 1"
t9107: switch inverted single/double quotes in test
t9103: modernize test style
always quote shell arguments to test -z/-n
Johannes Schindelin (16):
replace --edit: respect core.editor
name-rev: include taggerdate in considering the best name
win32mmap: set errno appropriately
mmap(win32): avoid copy-on-write when it is unnecessary
mmap(win32): avoid expensive fstat() call
http: support sending custom HTTP headers
tests: adjust the configuration for Apache 2.2
t5551: make the test for extra HTTP headers more robust
t3404: fix typo
submodule: ensure that -c http.extraheader is heeded
mingw: introduce the 'core.hideDotFiles' setting
mingw: remove unnecessary definition
Windows: only add a no-op pthread_sigmask() when needed
perf: let's disable symlinks when they are not available
perf: make the tests work in worktrees
perf: run "rebase -i" under perf
Johannes Sixt (2):
Windows: shorten code by re-using convert_slashes()
Windows: add pthread_sigmask() that does nothing
John Keeping (3):
config: fail if --get-urlmatch finds no value
Documentation/git-config: use bulleted list for exit codes
Documentation/git-config: fix --get-all description
Junio C Hamano (69):
rerere: split conflict ID further
rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
index-pack: correct --keep[=<msg>]
index-pack: add a helper function to derive .idx/.keep filename
rerere: handle leftover rr-cache/$ID directory and postimage files
rerere: delay the recording of preimage
rerere: allow multiple variants to exist
t4200: rerere a merge with two identical conflicts
rerere: do use multiple variants
apply: remove unused call to free() in gitdiff_{old,new}name()
merge: fix NULL pointer dereference when merging nothing into void
merge: refuse to create too cool a merge by default
pretty: enable --expand-tabs by default for selected pretty formats
pretty: allow tweaking tabwidth in --expand-tabs
submodule--helper: do not borrow absolute_path() result for too long
Git 2.8.1
First batch for post 2.8 cycle
pretty: test --expand-tabs
Makefile: fix misdirected redirections
Second batch for post 2.8 cycle
Makefile: stop pretending to support rpmbuild
rerere: gc and clear
rerere: move code related to "forget" together
rerere: split code to call ll_merge() further
rerere: adjust 'forget' to multi-variant world order
setup.c: do not feed NULL to "%.*s" even with precision 0
Third batch for post 2.8 cycle
http: differentiate socks5:// and socks5h://
t1020: do not overuse printf and use write_script
t3404: use write_script
Fourth batch for post 2.8 cycle
Start preparing for 2.8.2
fsck_commit_buffer(): do not special case the last validation
ll-merge: fix typo in comment
Prepare for 2.8.2
Makefile: clean *.o files we create
Fifth batch for post 2.8 cycle
t3033: avoid 'ambiguous refs' warning
pull: pass --allow-unrelated-histories to "git merge"
Sixth batch for post 2.8 cycle
send-email: fix grammo in the prompt that asks e-mail recipients
Seventh batch for post 2.8 cycle
Git 2.8.2
Eighth batch for 2.9
diff: undocument the compaction heuristic knobs for experimentation
Start preparing for 2.8.3
commit-tree: do not pay attention to commit.gpgsign
Ninth batch for 2.9
config: describe 'pathname' value type
Tenth batch for 2.9
Almost ready for 2.8.3
test-lib-functions.sh: remove misleading comment on test_seq
test-lib-functions.sh: rewrite test_seq without Perl
ll-merge: use a longer conflict marker for internal merge
t6036: remove pointless test that expects failure
Documentation: fix linkgit references
fsck: detect and warn a commit with embedded NUL
ci: validate "linkgit:" in documentation
test-parse-options: fix output when callback option fails
test-parse-options: --expect=<string> option to simplify tests
t0040: remove unused test helpers
t0040: convert a few tests to use test-parse-options --expect
Eleventh batch for 2.9
rerere: plug memory leaks upon "rerere forget" failure
Twelfth batch for 2.9
Thirteenth batch for 2.9
Git 2.8.3
rerere: remove an null statement
Git 2.9-rc0
Kazuki Yamaguchi (10):
branch -d: refuse deleting a branch which is currently checked out
refs: add a new function set_worktree_head_symref
branch -m: update all per-worktree HEADs
set_worktree_head_symref(): fix error message
imap-send: use HMAC() function provided by OpenSSL
imap-send: check NULL return of SSL_CTX_new()
imap-send: avoid deprecated TLSv1_method()
configure: remove checking for HMAC_CTX_cleanup
imap-send: check for NOLOGIN capability only when using LOGIN command
imap-send: fix CRAM-MD5 response calculation
Keller Fuchs (1):
Documentation: clarify signature verification
Lars Schneider (8):
git-p4: map a P4 user to Git author name and email address
travis-ci: update Git-LFS and P4 to the latest version
travis-ci: express Linux/OS X dependency versions more clearly
git-p4: fix Git LFS pointer parsing
t9824: fix wrong reference value
Documentation: add setup instructions for Travis CI
travis-ci: build documentation
travis-ci: enable Git SVN tests t91xx on Linux
Laurent Arnoud (1):
tag: add the option to force signing of annotated tags
Li Peng (1):
typofix: assorted typofixes in comments, documentation and messages
Linus Torvalds (1):
pretty: expand tabs in indented logs to make things line up properly
Luke Diamand (3):
git-p4 tests: cd to / before running python
git-p4 tests: work with python3 as well as python2
git-p4 tests: time_in_seconds should use $PYTHON_PATH
Marios Titas (2):
ident: check for useConfigOnly before auto-detection of name/email
ident: give "please tell me" message upon useConfigOnly error
Matthieu Moy (11):
Documentation/diff-config: fix description of diff.renames
t4001-diff-rename: wrap file creations in a test
t: add tests for diff.renames (true/false/unset)
log: introduce init_log_defaults()
diff: activate diff.renames by default
lockfile: mark strings for translation
lockfile: improve error message when lockfile exists
git.spec.in: use README.md, not README
README.md: don't take 'commandname' literally
git-multimail: update to release 1.3.0
git-multimail: update to release 1.3.1
Mehul Jain (9):
git-pull.c: introduce git_pull_config()
pull --rebase: add --[no-]autostash flag
t5520: use consistent capitalization in test titles
t5520: ensure consistent test conditions
t5520: use better test to check stderr output
t5520: factor out common "successful autostash" code
t5520: factor out common "failing autostash" code
t5520: reduce commom lines of code
t5520: test --[no-]autostash with pull.rebase=true
Michael Haggerty (19):
t1430: test the output and error of some commands more carefully
t1430: clean up broken refs/tags/shadow
t1430: don't rely on symbolic-ref for creating broken symrefs
t1430: test for-each-ref in the presence of badly-named refs
t1430: improve test coverage of deletion of badly-named refs
resolve_missing_loose_ref(): simplify semantics
resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
resolve_ref_unsafe(): ensure flags is always set
resolve_ref_1(): eliminate local variable
resolve_ref_1(): reorder code
resolve_ref_1(): eliminate local variable "bad_name"
read_raw_ref(): manage own scratch space
files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
read_raw_ref(): change flags parameter to unsigned int
fsck_head_link(): remove unneeded flag variable
cmd_merge(): remove unneeded flag variable
checkout_paths(): remove unneeded flag variable
check_aliased_update(): check that dst_name is non-NULL
show_head_ref(): check the result of resolve_ref_namespace()
Michael J Gruber (1):
completion: complete --cherry-mark for git log
Michael Procter (1):
upload-pack: use argv_array for pack_objects
Nguyễn Thái Ngọc Duy (62):
git-apply.txt: remove a space
git-apply.txt: mention the behavior inside a subdir
apply: report patch skipping in verbose mode
test helpers: move test-* to t/helper/ subdirectory
dir.c: remove dead function fnmatch_icase()
wrapper.c: delete dead function git_mkstemps()
dir.c: rename str(n)cmp_icase to fspath(n)cmp
path.c: add git_common_path() and strbuf_git_common_path()
worktree.c: store "id" instead of "git_dir"
worktree.c: make find_shared_symref() return struct worktree *
worktree.c: mark current worktree
path.c: refactor and add worktree_git_path()
wt-status.c: split rebase detection out of wt_status_get_state()
wt-status.c: make wt_status_check_rebase() work on any worktree
worktree.c: avoid referencing to worktrees[i] multiple times
worktree.c: check whether branch is rebased in another worktree
wt-status.c: split bisect detection out of wt_status_get_state()
worktree.c: check whether branch is bisected in another worktree
branch: do not rename a branch under bisect or rebase
remote.c: specify correct plural form in "commit diverge" message
usage.c: move format processing out of die_errno()
usage.c: add warning_errno() and error_errno()
bisect.c: use die_errno() and warning_errno()
builtin/am.c: use error_errno()
builtin/branch.c: use error_errno()
builtin/fetch.c: use error_errno()
builtin/help.c: use warning_errno()
builtin/mailsplit.c: use error_errno()
builtin/merge-file.c: use error_errno()
builtin/pack-objects.c: use die_errno() and warning_errno()
builtin/rm.c: use warning_errno()
builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
builtin/upload-archive.c: use error_errno()
builtin/worktree.c: use error_errno()
check-racy.c: use error_errno()
combine-diff.c: use error_errno()
compat/win32/syslog.c: use warning_errno()
config.c: use error_errno()
connected.c: use error_errno()
copy.c: use error_errno()
credential-cache--daemon.c: use warning_errno()
diff-no-index.c: use error_errno()
editor.c: use error_errno()
entry.c: use error_errno()
fast-import.c: use error_errno()
gpg-interface.c: use error_errno()
grep.c: use error_errno()
http.c: use error_errno() and warning_errno()
ident.c: use warning_errno()
mailmap.c: use error_errno()
reachable.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
run-command.c: use error_errno()
sequencer.c: use error_errno()
server-info.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
transport-helper.c: use error_errno()
unpack-trees.c: use error_errno()
upload-pack.c: use error_errno()
vcs-svn: use error_errno()
wrapper.c: use warning_errno()
wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Nikola Forró (1):
difftool/mergetool: make the form of yes/no questions consistent
Ori Avtalion (1):
Documentation: git diff --check detects conflict markers
Pranit Bauva (9):
t/t7502 : drop duplicate test
api-parse-options.txt: document OPT_CMDMODE()
t0040-test-parse-options.sh: fix style issues
test-parse-options: print quiet as integer
t0040-parse-options: improve test coverage
t/t7507: improve test coverage
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
t7507-commit-verbose: improve test coverage by testing number of diffs
commit: add a commit.verbose config variable
Ralf Thielow (4):
completion: add option '--guides' to 'git help'
completion: add 'revisions' and 'everyday' to 'git help'
rebase-i: print an abbreviated hash when stop for editing
string_list: use string-list API in unsorted_string_list_lookup()
Ramsay Jones (2):
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
xdiff/xprepare: fix a memory leak
Ray Zhang (1):
worktree: add: introduce --checkout option
René Nyffenegger (1):
Documentation: fix typo 'In such these cases'
SZEDER Gábor (5):
diffcore: fix iteration order of identical files during rename detection
for-each-ref: fix description of '--contains' in manpage
test-lib: simplify '--option=value' parsing
t9824: fix broken &&-chain in a subshell
t5510: run auto-gc in the foreground
Santiago Torres (6):
builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
t7030: test verifying multiple tags
verify-tag: update variable name and type
verify-tag: prepare verify_tag for libification
verify-tag: move tag verification code to tag.c
tag -v: verify directly rather than exec-ing verify-tag
Saurav Sachidanand (1):
dir: store EXC_FLAG_* values in unsigned integers
Shin Kojima (1):
gitweb: apply fallback encoding before highlight
Sidhant Sharma [:tk] (1):
builtin/receive-pack.c: use parse_options API
Stanislav Kolotinskiy (1):
git-send-pack: fix --all option when used with directory
Stefan Beller (44):
submodule-config: keep update strategy around
submodule-config: drop check against NULL
fetching submodules: respect `submodule.fetchJobs` config option
submodule update: direct error message to stderr
run_processes_parallel: treat output of children as byte array
run_processes_parallel: rename parameters for the callbacks
git submodule update: have a dedicated helper for cloning
submodule helper: remove double 'fatal: ' prefix
submodule update: expose parallelism to the user
clone: allow an explicit argument for parallel submodule clones
clone tests: rename t57* => t56*
rebase: decouple --exec from --interactive
t3404: cleanup double empty lines between tests
submodule foreach: correct path display in recursive submodules
submodule update --init: correct path handling in recursive submodules
submodule status: correct path handling in recursive submodules
submodule update: align reporting path for custom command execution
submodule update: test recursive path reporting from subdirectory
t7407: make expectation as clear as possible
recursive submodules: test for relative paths
submodule--helper: fix potential NULL-dereference
submodule--helper clone: create the submodule path just once
notes: don't leak memory in git_config_get_notes_strategy
abbrev_sha1_in_line: don't leak memory
bundle: don't leak an fd in case of early return
credential-cache, send_request: close fd when done
submodule--helper, module_clone: always operate on absolute paths
submodule--helper, module_clone: catch fprintf failure
submodule: port resolve_relative_url from shell to C
submodule: port init from shell to C
xdiff: implement empty line chunk heuristic
mv: allow moving nested submodules
clone: add `--shallow-submodules` flag
config doc: improve exit code listing
config.c: drop local variable
submodule-config: don't shadow `cache`
submodule init: fail gracefully with a missing .gitmodules file
submodule--helper update-clone: abort gracefully on missing .gitmodules
submodule deinit test: fix broken && chain in subshell
submodule init: redirect stdout to stderr
t7300: mark test with SANITY
submodule deinit: require '--all' instead of '.' for all submodules
t3513: do not compress backup tar file
t6041: do not compress backup tar file
Stephen P. Smith (1):
wt-status.c: set commitable bit if there is a meaningful merge.
Sven Strickroth (3):
commit: do not lose SQUASH_MSG contents
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
MSVC: use shipped headers instead of fallback definitions
Torsten Bögershausen (6):
correct blame for files commited with CRLF
t0027: make commit_chk_wrnNNO() reliable
convert: allow core.autocrlf=input and core.eol=crlf
t0027: test cases for combined attributes
convert.c: ident + core.autocrlf didn't work
t5601: Remove trailing space in sed expression
Vasco Almeida (16):
l10n: fr: fix transcation of "dir"
l10n: fr: fix wrongly translated option name
l10n: fr: change "id de clé" to match "id-clé"
l10n: fr: don't translate "merge" as a parameter
i18n: index-pack: use plural string instead of normal one
i18n: builtin/branch.c: mark option for translation
i18n: unpack-trees: mark strings for translation
i18n: builtin/rm.c: remove a comma ',' from string
i18n: branch: unmark string for translation
i18n: branch: move comment for translators
i18n: git-parse-remote.sh: mark strings for translation
i18n: builtin/pull.c: mark placeholders for translation
i18n: builtin/pull.c: split strings marked for translation
i18n: remote: add comment for translators
Documentation/git-mailinfo: fix typo
i18n: unpack-trees: avoid substituting only a verb in sentences
Xiaolong Ye (4):
patch-ids: make commit_patch_id() a public helper function
format-patch: add '--base' option to record base tree info
format-patch: introduce --base=auto option
format-patch: introduce format.useAutoBase configuration
brian m. carlson (6):
sha1-name: introduce a get_oid() function
test-match-trees: convert to use struct object_id
match-trees: convert shift_tree() and shift_tree_by() to use object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
tree-walk: convert tree_entry_extract() to use struct object_id
match-trees: convert several leaf functions to use struct object_id
Ævar Arnfjörð Bjarmason (4):
githooks.txt: improve the intro section
githooks.txt: amend dangerous advice about 'update' hook ACL
githooks.txt: minor improvements to the grammar & phrasing
hooks: allow customizing where the hook directory is
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (May 2016, #06; Tue, 17)
@ 2016-05-17 22:47 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-17 22:47 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has 390 non-merge commits in this cycle. On
the 'maint' front, 2.8.2 is out and fixes that have been in 'master'
accumulates on it for 2.8.3, which probably should be tagged sometime
late this week.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ab/hooks (2016-05-04) 4 commits
(merged to 'next' on 2016-05-09 at 23cf808)
+ hooks: allow customizing where the hook directory is
+ githooks.txt: minor improvements to the grammar & phrasing
+ githooks.txt: amend dangerous advice about 'update' hook ACL
+ githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 36ae38c)
+ t4151: make sure argument to 'test -z' is given
Test fix.
* bn/config-doc-tt-varnames (2016-05-05) 1 commit
(merged to 'next' on 2016-05-10 at aa7b834)
+ config: consistently format $variables in monospaced font
(this branch uses jc/config-pathname-type.)
Doc formatting fixes.
* bn/http-cookiefile-config (2016-05-04) 2 commits
(merged to 'next' on 2016-05-09 at d519b13)
+ http: expand http.cookieFile as a path
+ Documentation: config: improve word ordering for http.cookieFile
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
* es/test-gpg-tags (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 9fcb98b)
+ t6302: simplify non-gpg cases
Test fix.
* jc/config-pathname-type (2016-05-04) 1 commit
(merged to 'next' on 2016-05-09 at 0876e55)
+ config: describe 'pathname' value type
(this branch is used by bn/config-doc-tt-varnames.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
* jc/fsck-nul-in-commit (2016-05-10) 2 commits
(merged to 'next' on 2016-05-10 at 3bc3ca3)
+ fsck: detect and warn a commit with embedded NUL
+ fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* jc/linkgit-fix (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 0e5ba60)
+ Documentation: fix linkgit references
Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
* jc/ll-merge-internal (2016-05-09) 3 commits
(merged to 'next' on 2016-05-10 at a6bf1d0)
+ t6036: remove pointless test that expects failure
+ ll-merge: use a longer conflict marker for internal merge
+ ll-merge: fix typo in comment
"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
* jc/test-seq (2016-05-09) 2 commits
(merged to 'next' on 2016-05-10 at 1512890)
+ test-lib-functions.sh: rewrite test_seq without Perl
+ test-lib-functions.sh: remove misleading comment on test_seq
Test fix.
* jk/rebase-interative-eval-fix (2016-05-10) 1 commit
(merged to 'next' on 2016-05-11 at 4fdf387)
+ rebase--interactive: avoid empty list in shell for-loop
Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
* jk/submodule-c-credential (2016-05-06) 6 commits
(merged to 'next' on 2016-05-10 at 4abe871)
+ submodule: stop sanitizing config options
+ submodule: use prepare_submodule_repo_env consistently
+ submodule--helper: move config-sanitizing to submodule.c
+ submodule: export sanitized GIT_CONFIG_PARAMETERS
+ t5550: break submodule config test into multiple sub-tests
+ t5550: fix typo in $HTTPD_URL
(this branch is used by js/http-custom-headers.)
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
* jk/test-send-sh-x-trace-elsewhere (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at 273a137)
+ test-lib: set BASH_XTRACEFD automatically
Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
* js/http-custom-headers (2016-05-10) 4 commits
(merged to 'next' on 2016-05-10 at 7cf5cca)
+ submodule: ensure that -c http.extraheader is heeded
+ Merge branch 'jk/submodule-c-credential' into js/http-custom-headers
+ t5551: make the test for extra HTTP headers more robust
+ tests: adjust the configuration for Apache 2.2
(this branch uses jk/submodule-c-credential.)
Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).
* js/t3404-typofix (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at cbeabc0)
+ t3404: fix typo
Test fix.
* js/windows-dotgit (2016-05-11) 2 commits
(merged to 'next' on 2016-05-11 at d10caa2)
+ mingw: remove unnecessary definition
+ mingw: introduce the 'core.hideDotFiles' setting
On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
* kf/gpg-sig-verification-doc (2016-05-13) 1 commit
(merged to 'next' on 2016-05-13 at 2cec353)
+ Documentation: clarify signature verification
Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified. Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.
* lp/typofixes (2016-05-06) 1 commit
(merged to 'next' on 2016-05-09 at 59683be)
+ typofix: assorted typofixes in comments, documentation and messages
Typofixes.
* ls/travis-build-doc (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at 7f63497)
+ travis-ci: build documentation
CI test was taught to build documentation pages.
* nd/error-errno (2016-05-09) 41 commits
(merged to 'next' on 2016-05-10 at 1cdeda8)
+ wrapper.c: use warning_errno()
+ vcs-svn: use error_errno()
+ upload-pack.c: use error_errno()
+ unpack-trees.c: use error_errno()
+ transport-helper.c: use error_errno()
+ sha1_file.c: use {error,die,warning}_errno()
+ server-info.c: use error_errno()
+ sequencer.c: use error_errno()
+ run-command.c: use error_errno()
+ rerere.c: use error_errno() and warning_errno()
+ reachable.c: use error_errno()
+ mailmap.c: use error_errno()
+ ident.c: use warning_errno()
+ http.c: use error_errno() and warning_errno()
+ grep.c: use error_errno()
+ gpg-interface.c: use error_errno()
+ fast-import.c: use error_errno()
+ entry.c: use error_errno()
+ editor.c: use error_errno()
+ diff-no-index.c: use error_errno()
+ credential-cache--daemon.c: use warning_errno()
+ copy.c: use error_errno()
+ connected.c: use error_errno()
+ config.c: use error_errno()
+ compat/win32/syslog.c: use warning_errno()
+ combine-diff.c: use error_errno()
+ check-racy.c: use error_errno()
+ builtin/worktree.c: use error_errno()
+ builtin/upload-archive.c: use error_errno()
+ builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
+ builtin/rm.c: use warning_errno()
+ builtin/pack-objects.c: use die_errno() and warning_errno()
+ builtin/merge-file.c: use error_errno()
+ builtin/mailsplit.c: use error_errno()
+ builtin/help.c: use warning_errno()
+ builtin/fetch.c: use error_errno()
+ builtin/branch.c: use error_errno()
+ builtin/am.c: use error_errno()
+ bisect.c: use die_errno() and warning_errno()
+ usage.c: add warning_errno() and error_errno()
+ usage.c: move format processing out of die_errno()
The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit
(merged to 'next' on 2016-05-10 at aea08dc)
+ remote.c: specify correct plural form in "commit diverge" message
Message fix.
* nd/test-helpers (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at e8ad58d)
+ wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.
* sb/submodule-deinit-all (2016-05-05) 1 commit
(merged to 'next' on 2016-05-09 at 0fd4518)
+ submodule deinit: require '--all' instead of '.' for all submodules
Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
* sb/submodule-init (2016-05-03) 7 commits
(merged to 'next' on 2016-05-03 at 8a5fce4)
+ submodule init: redirect stdout to stderr
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
* sb/z-is-gnutar-ism (2016-05-09) 2 commits
(merged to 'next' on 2016-05-09 at 51d527d)
+ t6041: do not compress backup tar file
+ t3513: do not compress backup tar file
Test fix.
* tb/t5601-sed-fix (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at d3e54e8)
+ t5601: Remove trailing space in sed expression
Test fix.
* va/i18n-misc-updates (2016-05-12) 10 commits
(merged to 'next' on 2016-05-13 at 0361b16)
+ i18n: unpack-trees: avoid substituting only a verb in sentences
(merged to 'next' on 2016-05-10 at b5dbd0d)
+ i18n: builtin/pull.c: split strings marked for translation
+ i18n: builtin/pull.c: mark placeholders for translation
+ i18n: git-parse-remote.sh: mark strings for translation
+ i18n: branch: move comment for translators
+ i18n: branch: unmark string for translation
+ i18n: builtin/rm.c: remove a comma ',' from string
+ i18n: unpack-trees: mark strings for translation
+ i18n: builtin/branch.c: mark option for translation
+ i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
* va/i18n-remote-comment-to-align (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at edbacbb)
+ i18n: remote: add comment for translators
Message fix.
* va/mailinfo-doc-typofix (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at 7180176)
+ Documentation/git-mailinfo: fix typo
Typofix.
--------------------------------------------------
[New Topics]
* da/difftool (2016-05-16) 2 commits
(merged to 'next' on 2016-05-17 at ef5a435)
+ difftool: handle unmerged files in dir-diff mode
+ difftool: initialize variables for readability
"git difftool" learned to handle unmerged paths correctly in
dir-diff mode.
Will merge to 'master'.
* jc/attr (2016-05-17) 14 commits
- SQUASH???
- attr: retire git_check_attrs() API
- attr: convert git_check_attrs() callers to use the new API
- attr: convert git_all_attrs() to use "struct git_attr_check"
- attr: (re)introduce git_check_attr() and struct git_attr_check
- attr: rename function and struct related to checking attributes
- attr.c: tighten constness around "git_attr" structure
- attr.c: simplify macroexpand_one()
- attr.c: mark where #if DEBUG ends more clearly
- attr.c: complete a sentence in a comment
- attr.c: explain the lack of attr-name syntax check in parse_attr()
- attr.c: update a stale comment on "struct match_attr"
- attr.c: use strchrnul() to scan for one line
- commit.c: use strchrnul() to scan for one line
The attributes API has been updated so that it can later be
optimized using the knowledge of which attributes are queried.
* fc/fast-import-broken-marks-file (2016-05-17) 1 commit
- fast-import: do not truncate exported marks file
"git fast-import --export-marks" would overwrite the existing marks
file even when it makes a dump from its custom die routine.
Prevent it from doing so when we have an import-marks file but
haven't finished reading it.
--------------------------------------------------
[Stalled]
* ep/http-curl-trace (2016-05-02) 2 commits
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
. http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Expecting a reroll.
($gmane/292074, 293236)
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
Will discard.
--------------------------------------------------
[Cooking]
* es/t1500-modernize (2016-05-17) 5 commits
- t1500: avoid setting environment variables outside of tests
- t1500: avoid setting configuration options outside of tests
- t1500: avoid changing working directory outside of tests
- t1500: test_rev_parse: facilitate future test enhancements
- t1500: be considerate to future potential tests
test updates to make it more readable and maintainable.
* jc/rerere-multi (2016-05-11) 1 commit
(merged to 'next' on 2016-05-13 at f4d1d82)
+ rerere: plug memory leaks upon "rerere forget" failure
Will merge to 'master'.
* cc/apply-introduce-state (2016-05-12) 48 commits
- builtin/apply: rename 'prefix_' parameter to 'prefix'
- builtin/apply: move applying patches into apply_all_patches()
- builtin/apply: move 'state' check into check_apply_state()
- builtin/apply: move 'symlink_changes' global into 'struct apply_state'
- builtin/apply: move 'fn_table' global into 'struct apply_state'
- builtin/apply: move 'state_linenr' global into 'struct apply_state'
- builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
- builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
- builtin/apply: move 'ws_error_action' into 'struct apply_state'
- builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
- builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
- builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
- builtin/apply: move 'whitespace_option' into 'struct apply_state'
- builtin/apply: move 'whitespace_error' global into 'struct apply_state'
- builtin/apply: move 'root' global into 'struct apply_state'
- builtin/apply: move 'p_value_known' global into 'struct apply_state'
- builtin/apply: move 'p_value' global into 'struct apply_state'
- builtin/apply: move 'has_include' global into 'struct apply_state'
- builtin/apply: move 'limit_by_name' global into 'struct apply_state'
- builtin/apply: move 'patch_input_file' global into 'struct apply_state'
- builtin/apply: move 'apply' global into 'struct apply_state'
- builtin/apply: move 'p_context' global into 'struct apply_state'
- builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
- builtin/apply: move 'line_termination' global into 'struct apply_state'
- builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
- builtin/apply: move 'no_add' global into 'struct apply_state'
- builtin/apply: move 'threeway' global into 'struct apply_state'
- builtin/apply: move 'summary' global into 'struct apply_state'
- builtin/apply: move 'numstat' global into 'struct apply_state'
- builtin/apply: move 'diffstat' global into 'struct apply_state'
- builtin/apply: move 'cached' global into 'struct apply_state'
- builtin/apply: move 'allow_overlap' global into 'struct apply_state'
- builtin/apply: move 'update_index' global into 'struct apply_state'
- builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
- builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
- builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
- builtin/apply: move 'check_index' global into 'struct apply_state'
- builtin/apply: move 'check' global into 'struct apply_state'
- builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
- builtin/apply: move 'state' init into init_apply_state()
- builtin/apply: introduce 'struct apply_state' to start libifying
- builtin/apply: move 'read_stdin' global into cmd_apply()
- builtin/apply: move 'options' variable into cmd_apply()
- builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
- builtin/apply: avoid local variable shadowing 'len' parameter
- builtin/apply: avoid parameter shadowing 'linenr' global
- builtin/apply: avoid parameter shadowing 'p_value' global
- builtin/apply: make gitdiff_verify_name() return void
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
Will be rerolled.
* jk/test-z-n-unquoted (2016-05-14) 6 commits
(merged to 'next' on 2016-05-17 at 65372cf)
+ always quote shell arguments to test -z/-n
+ t9103: modernize test style
+ t9107: switch inverted single/double quotes in test
+ t9107: use "return 1" instead of "exit 1"
+ t9100,t3419: enclose all test code in single-quotes
+ t/lib-git-svn: drop $remote_git_svn and $git_svn_id
t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelains have also been
updated to fix possible bugs around their use of "test -z" and
"test -n".
Will merge to 'master'.
* pb/bisect (2016-05-13) 4 commits
- t6030: explicitly test for bisection cleanup
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
* sb/pathspec-label (2016-05-14) 5 commits
. pathspec: record labels
. pathspec: move prefix check out of the inner loop
. pathspec: move long magic parsing out of prefix_pathspec
. Documentation: correct typo in example for querying attributes
. Documentation: fix a typo
The pathspec mechanism learned ":(label=X)$pattern" pathspec magic
to limit paths that match $pattern further by labels defined by the
attributes mechanism for the paths.
(RFC/WIP)
* ar/diff-args-osx-precompose (2016-05-13) 1 commit
(merged to 'next' on 2016-05-17 at 7b59b79)
+ diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will merge to 'master'.
* js/perf-rebase-i (2016-05-13) 3 commits
(merged to 'next' on 2016-05-13 at eb51ddd)
+ perf: run "rebase -i" under perf
+ perf: make the tests work in worktrees
+ perf: let's disable symlinks when they are not available
Add perf test for "rebase -i"
Will merge to 'master'.
* nd/worktree-cleanup-post-head-protection (2016-05-10) 7 commits
- worktree: simplify prefixing paths
- worktree: avoid 0{40}, too many zeroes, hard to read
- worktree.c: add clear_worktree()
- worktree.c: use is_dot_or_dotdot()
- git-worktree.txt: keep subcommand listing in alphabetical order
- worktree.c: rewrite mark_current_worktree() to avoid strbuf
- completion: support git-worktree
(this branch uses nd/worktree-various-heads.)
Further preparatory clean-up for "worktree" feature.
Expecting a reroll.
($gmane/294136, etc.)
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
(merged to 'next' on 2016-05-10 at 2ada404)
+ wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
Will merge to 'master'.
* tb/core-eol-fix (2016-04-25) 4 commits
(merged to 'next' on 2016-05-10 at fa8a200)
+ convert.c: ident + core.autocrlf didn't work
+ t0027: test cases for combined attributes
+ convert: allow core.autocrlf=input and core.eol=crlf
+ t0027: make commit_chk_wrnNNO() reliable
A couple of bugs around core.autocrlf have been fixed.
Will merge to 'master'.
* jc/test-parse-options-expect (2016-05-10) 4 commits
(merged to 'next' on 2016-05-10 at 3ca5783)
+ t0040: convert a few tests to use test-parse-options --expect
+ t0040: remove unused test helpers
+ test-parse-options: --expect=<string> option to simplify tests
+ test-parse-options: fix output when callback option fails
(this branch uses pb/commit-verbose-config.)
t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
Will merge to 'master'.
* jc/doc-lint (2016-05-10) 1 commit
(merged to 'next' on 2016-05-17 at 9032aa5)
+ ci: validate "linkgit:" in documentation
Find common mistakes when writing gitlink: in our documentation and
drive the check from "make check-docs".
I am not entirely happy with the way the script chooses what input
file to validate, but it is not worse than not having anything, so
let's move it forward and have the logic improved later when people
care about it deeply.
Will merge to 'master'.
* jk/push-client-deadlock-fix (2016-05-11) 2 commits
(merged to 'next' on 2016-05-11 at 8f4abf9)
+ Windows: only add a no-op pthread_sigmask() when needed
(merged to 'next' on 2016-05-06 at e91626c)
+ Windows: add pthread_sigmask() that does nothing
Some Windows SDK lacks pthread_sigmask() implementation and fails
to compile the recently updated "git push" codepath that uses it.
Will merge to 'master'.
* mh/split-under-lock (2016-05-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
Further preparatory work on the refs API before the pluggable
backend series can land.
Updated (again). Will wait for comments for the last time, and
then merge to 'next'.
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
Will discard.
* ew/fast-import-unpack-limit (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will merge to 'master'.
* nd/worktree-various-heads (2016-04-22) 13 commits
(merged to 'next' on 2016-05-10 at 61d3415)
+ branch: do not rename a branch under bisect or rebase
+ worktree.c: check whether branch is bisected in another worktree
+ wt-status.c: split bisect detection out of wt_status_get_state()
+ worktree.c: check whether branch is rebased in another worktree
+ worktree.c: avoid referencing to worktrees[i] multiple times
+ wt-status.c: make wt_status_check_rebase() work on any worktree
+ wt-status.c: split rebase detection out of wt_status_get_state()
+ path.c: refactor and add worktree_git_path()
+ worktree.c: mark current worktree
+ worktree.c: make find_shared_symref() return struct worktree *
+ worktree.c: store "id" instead of "git_dir"
+ path.c: add git_common_path() and strbuf_git_common_path()
+ dir.c: rename str(n)cmp_icase to fspath(n)cmp
(this branch is used by nd/worktree-cleanup-post-head-protection.)
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Will merge to 'master'.
* pb/commit-verbose-config (2016-05-10) 7 commits
+ commit: add a commit.verbose config variable
+ t7507-commit-verbose: improve test coverage by testing number of diffs
+ parse-options.c: make OPTION_COUNTUP respect "unspecified" values
+ t/t7507: improve test coverage
+ t0040-parse-options: improve test coverage
+ test-parse-options: print quiet as integer
+ t0040-test-parse-options.sh: fix style issues
(this branch is used by jc/test-parse-options-expect.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Will merge to 'master'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* kn/ref-filter-branch-list (2016-05-17) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
(merged to 'next' on 2016-05-10 at dd19e0a)
+ format-patch: introduce format.useAutoBase configuration
+ format-patch: introduce --base=auto option
+ format-patch: add '--base' option to record base tree info
+ patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will merge to 'master'.
* dt/index-helper (2016-05-13) 20 commits
- untracked-cache: config option
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Under review.
($gmane/294470).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
. diff: enable "compaction heuristics" and lose experimentation knob
Superseded by the tip commit on the jk/diff-compact-heuristic topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (May 2016, #05; Fri, 13)
@ 2016-05-13 22:11 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-13 22:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the eleventh batch of topics of this
cycle. On the 'maint' front, 2.8.2 is out and fixes that have been
in 'master' accumulates on it for 2.8.3.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 08eccb2)
+ commit-tree: do not pay attention to commit.gpgsign
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at ab6dac3)
+ submodule deinit test: fix broken && chain in subshell
--------------------------------------------------
[New Topics]
* jc/rerere-multi (2016-05-11) 1 commit
(merged to 'next' on 2016-05-13 at f4d1d82)
+ rerere: plug memory leaks upon "rerere forget" failure
Will merge to 'master'.
* cc/apply-introduce-state (2016-05-12) 48 commits
- builtin/apply: rename 'prefix_' parameter to 'prefix'
- builtin/apply: move applying patches into apply_all_patches()
- builtin/apply: move 'state' check into check_apply_state()
- builtin/apply: move 'symlink_changes' global into 'struct apply_state'
- builtin/apply: move 'fn_table' global into 'struct apply_state'
- builtin/apply: move 'state_linenr' global into 'struct apply_state'
- builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
- builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
- builtin/apply: move 'ws_error_action' into 'struct apply_state'
- builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
- builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
- builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
- builtin/apply: move 'whitespace_option' into 'struct apply_state'
- builtin/apply: move 'whitespace_error' global into 'struct apply_state'
- builtin/apply: move 'root' global into 'struct apply_state'
- builtin/apply: move 'p_value_known' global into 'struct apply_state'
- builtin/apply: move 'p_value' global into 'struct apply_state'
- builtin/apply: move 'has_include' global into 'struct apply_state'
- builtin/apply: move 'limit_by_name' global into 'struct apply_state'
- builtin/apply: move 'patch_input_file' global into 'struct apply_state'
- builtin/apply: move 'apply' global into 'struct apply_state'
- builtin/apply: move 'p_context' global into 'struct apply_state'
- builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
- builtin/apply: move 'line_termination' global into 'struct apply_state'
- builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
- builtin/apply: move 'no_add' global into 'struct apply_state'
- builtin/apply: move 'threeway' global into 'struct apply_state'
- builtin/apply: move 'summary' global into 'struct apply_state'
- builtin/apply: move 'numstat' global into 'struct apply_state'
- builtin/apply: move 'diffstat' global into 'struct apply_state'
- builtin/apply: move 'cached' global into 'struct apply_state'
- builtin/apply: move 'allow_overlap' global into 'struct apply_state'
- builtin/apply: move 'update_index' global into 'struct apply_state'
- builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
- builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
- builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
- builtin/apply: move 'check_index' global into 'struct apply_state'
- builtin/apply: move 'check' global into 'struct apply_state'
- builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
- builtin/apply: move 'state' init into init_apply_state()
- builtin/apply: introduce 'struct apply_state' to start libifying
- builtin/apply: move 'read_stdin' global into cmd_apply()
- builtin/apply: move 'options' variable into cmd_apply()
- builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
- builtin/apply: avoid local variable shadowing 'len' parameter
- builtin/apply: avoid parameter shadowing 'linenr' global
- builtin/apply: avoid parameter shadowing 'p_value' global
- builtin/apply: make gitdiff_verify_name() return void
The "git apply" standalone program is being libified; this is the
first step to move many state variables into a structure that can
be explicitly (re)initialized to make the machinery callable more
than once.
The next step that moves some remaining state variables into the
structure and turns die()s into an error return that propagates up
to the caller is not queued yet but in flight. It would be good to
review the above first and give the remainder of the series a solid
base to build on.
* jk/test-z-n-unquoted (2016-05-13) 6 commits
- always quote shell arguments to test -z/-n
- t9103: modernize test style
- t9107: switch inverted single/double quotes in test
- t9107: use "return 1" instead of "exit 1"
- t9100,t3419: enclose all test code in single-quotes
- t/lib-git-svn: drop $remote_git_svn and $git_svn_id
t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelains have also been
updated to fix possible bugs around their use of "test -z" and
"test -n".
Will merge to 'next'.
* kf/gpg-sig-verification-doc (2016-05-13) 1 commit
(merged to 'next' on 2016-05-13 at 2cec353)
+ Documentation: clarify signature verification
Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified. Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.
Will merge to 'master'.
* pb/bisect (2016-05-13) 4 commits
- t6030: explicitly test for bisection cleanup
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
Beginning of GSoC "git bisect" project.
* sb/pathspec-label (2016-05-12) 5 commits
- pathspec: record labels
- pathspec: move prefix check out of the inner loop
- pathspec: move long magic parsing out of prefix_pathspec
- Documentation: correct typo in example for querying attributes
- Documentation: fix a typo
The pathspec mechanism learned ":(label=X)$pattern" pathspec magic
to limit paths that match $pattern further by labels defined by the
attributes mechanism for the paths.
(RFC/WIP)
--------------------------------------------------
[Stalled]
* es/t1500-modernize (2016-05-10) 7 commits
- t1500: finish preparation upfront
- t1500: be considerate to future potential tests
- t1500: avoid setting environment variables outside of tests
- t1500: avoid setting configuration options outside of tests
- t1500: avoid changing working directory outside of tests
- t1500: reduce dependence upon global state
- t1500: test_rev_parse: facilitate future test enhancements
test updates to make it more readable and maintainable.
Will be rerolled.
($gmane/294181)
* ep/http-curl-trace (2016-05-02) 2 commits
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
. http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Expecting a reroll.
($gmane/292074, 293236)
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
Will discard.
--------------------------------------------------
[Cooking]
* ar/diff-args-osx-precompose (2016-05-13) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will merge to 'next'.
* ls/travis-build-doc (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at 7f63497)
+ travis-ci: build documentation
CI test was taught to build documentation pages.
Will merge to 'master'.
* js/t3404-typofix (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at cbeabc0)
+ t3404: fix typo
Will merge to 'master'.
* jk/rebase-interative-eval-fix (2016-05-10) 1 commit
(merged to 'next' on 2016-05-11 at 4fdf387)
+ rebase--interactive: avoid empty list in shell for-loop
Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
Will merge to 'master'.
* jk/test-send-sh-x-trace-elsewhere (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at 273a137)
+ test-lib: set BASH_XTRACEFD automatically
Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
Will merge to 'master'.
* js/perf-rebase-i (2016-05-13) 3 commits
(merged to 'next' on 2016-05-13 at eb51ddd)
+ perf: run "rebase -i" under perf
+ perf: make the tests work in worktrees
+ perf: let's disable symlinks when they are not available
Add perf test for "rebase -i"
Will merge to 'master'.
* nd/worktree-cleanup-post-head-protection (2016-05-10) 7 commits
- worktree: simplify prefixing paths
- worktree: avoid 0{40}, too many zeroes, hard to read
- worktree.c: add clear_worktree()
- worktree.c: use is_dot_or_dotdot()
- git-worktree.txt: keep subcommand listing in alphabetical order
- worktree.c: rewrite mark_current_worktree() to avoid strbuf
- completion: support git-worktree
(this branch uses nd/worktree-various-heads.)
Further preparatory clean-up for "worktree" feature.
Expecting a reroll.
($gmane/294136, etc.)
* va/mailinfo-doc-typofix (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at 7180176)
+ Documentation/git-mailinfo: fix typo
Typofix.
Will merge to 'master'.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
(merged to 'next' on 2016-05-10 at 2ada404)
+ wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
Will merge to 'master'.
* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 36ae38c)
+ t4151: make sure argument to 'test -z' is given
Test fix.
Will merge to 'master'.
* es/test-gpg-tags (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 9fcb98b)
+ t6302: simplify non-gpg cases
Test fix.
Will merge to 'master'.
* jc/test-seq (2016-05-09) 2 commits
(merged to 'next' on 2016-05-10 at 1512890)
+ test-lib-functions.sh: rewrite test_seq without Perl
+ test-lib-functions.sh: remove misleading comment on test_seq
Test fix.
Will merge to 'master'.
* js/windows-dotgit (2016-05-11) 2 commits
(merged to 'next' on 2016-05-11 at d10caa2)
+ mingw: remove unnecessary definition
+ mingw: introduce the 'core.hideDotFiles' setting
On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
Will merge to 'master'.
* nd/error-errno (2016-05-09) 41 commits
(merged to 'next' on 2016-05-10 at 1cdeda8)
+ wrapper.c: use warning_errno()
+ vcs-svn: use error_errno()
+ upload-pack.c: use error_errno()
+ unpack-trees.c: use error_errno()
+ transport-helper.c: use error_errno()
+ sha1_file.c: use {error,die,warning}_errno()
+ server-info.c: use error_errno()
+ sequencer.c: use error_errno()
+ run-command.c: use error_errno()
+ rerere.c: use error_errno() and warning_errno()
+ reachable.c: use error_errno()
+ mailmap.c: use error_errno()
+ ident.c: use warning_errno()
+ http.c: use error_errno() and warning_errno()
+ grep.c: use error_errno()
+ gpg-interface.c: use error_errno()
+ fast-import.c: use error_errno()
+ entry.c: use error_errno()
+ editor.c: use error_errno()
+ diff-no-index.c: use error_errno()
+ credential-cache--daemon.c: use warning_errno()
+ copy.c: use error_errno()
+ connected.c: use error_errno()
+ config.c: use error_errno()
+ compat/win32/syslog.c: use warning_errno()
+ combine-diff.c: use error_errno()
+ check-racy.c: use error_errno()
+ builtin/worktree.c: use error_errno()
+ builtin/upload-archive.c: use error_errno()
+ builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
+ builtin/rm.c: use warning_errno()
+ builtin/pack-objects.c: use die_errno() and warning_errno()
+ builtin/merge-file.c: use error_errno()
+ builtin/mailsplit.c: use error_errno()
+ builtin/help.c: use warning_errno()
+ builtin/fetch.c: use error_errno()
+ builtin/branch.c: use error_errno()
+ builtin/am.c: use error_errno()
+ bisect.c: use die_errno() and warning_errno()
+ usage.c: add warning_errno() and error_errno()
+ usage.c: move format processing out of die_errno()
The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
Will merge to 'master'.
* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit
(merged to 'next' on 2016-05-10 at aea08dc)
+ remote.c: specify correct plural form in "commit diverge" message
Message fix.
Will merge to 'master'.
* nd/test-helpers (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at e8ad58d)
+ wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.
Will merge to 'master'.
* tb/core-eol-fix (2016-04-25) 4 commits
(merged to 'next' on 2016-05-10 at fa8a200)
+ convert.c: ident + core.autocrlf didn't work
+ t0027: test cases for combined attributes
+ convert: allow core.autocrlf=input and core.eol=crlf
+ t0027: make commit_chk_wrnNNO() reliable
A couple of bugs around core.autocrlf have been fixed.
Will merge to 'master'.
* tb/t5601-sed-fix (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at d3e54e8)
+ t5601: Remove trailing space in sed expression
Test fix.
Will merge to 'master'.
* va/i18n-remote-comment-to-align (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at edbacbb)
+ i18n: remote: add comment for translators
Message fix.
Will merge to 'master'.
* jc/linkgit-fix (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 0e5ba60)
+ Documentation: fix linkgit references
Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
Will merge to 'master'.
* js/http-custom-headers (2016-05-10) 4 commits
(merged to 'next' on 2016-05-10 at 7cf5cca)
+ submodule: ensure that -c http.extraheader is heeded
+ Merge branch 'jk/submodule-c-credential' into js/http-custom-headers
+ t5551: make the test for extra HTTP headers more robust
+ tests: adjust the configuration for Apache 2.2
(this branch uses jk/submodule-c-credential.)
Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).
Will merge to 'master'.
* sb/submodule-deinit-all (2016-05-05) 1 commit
(merged to 'next' on 2016-05-09 at 0fd4518)
+ submodule deinit: require '--all' instead of '.' for all submodules
Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
Will merge to 'master'.
* bn/config-doc-tt-varnames (2016-05-05) 1 commit
(merged to 'next' on 2016-05-10 at aa7b834)
+ config: consistently format $variables in monospaced font
(this branch uses jc/config-pathname-type.)
Doc formatting fixes.
Will merge to 'master'.
* lp/typofixes (2016-05-06) 1 commit
(merged to 'next' on 2016-05-09 at 59683be)
+ typofix: assorted typofixes in comments, documentation and messages
Will merge to 'master'.
* sb/z-is-gnutar-ism (2016-05-09) 2 commits
(merged to 'next' on 2016-05-09 at 51d527d)
+ t6041: do not compress backup tar file
+ t3513: do not compress backup tar file
Will merge to 'master'.
* jc/test-parse-options-expect (2016-05-10) 4 commits
(merged to 'next' on 2016-05-10 at 3ca5783)
+ t0040: convert a few tests to use test-parse-options --expect
+ t0040: remove unused test helpers
+ test-parse-options: --expect=<string> option to simplify tests
+ test-parse-options: fix output when callback option fails
(this branch uses pb/commit-verbose-config.)
t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
Will merge to 'master'.
* jc/doc-lint (2016-05-10) 1 commit
- ci: validate "linkgit:" in documentation
Find common mistakes when writing gitlink: in our documentation and
drive the check from "make check-docs".
I am not entirely happy with the way the script chooses what input
file to validate, but it is not worse than not having anything, so
let's move it forward and have the logic improved later when people
care about it deeply.
Will merge to 'next'.
* jk/push-client-deadlock-fix (2016-05-11) 2 commits
(merged to 'next' on 2016-05-11 at 8f4abf9)
+ Windows: only add a no-op pthread_sigmask() when needed
(merged to 'next' on 2016-05-06 at e91626c)
+ Windows: add pthread_sigmask() that does nothing
Some Windows SDK lacks pthread_sigmask() implementation and fails
to compile the recently updated "git push" codepath that uses it.
Will merge to 'master'.
* ab/hooks (2016-05-04) 4 commits
(merged to 'next' on 2016-05-09 at 23cf808)
+ hooks: allow customizing where the hook directory is
+ githooks.txt: minor improvements to the grammar & phrasing
+ githooks.txt: amend dangerous advice about 'update' hook ACL
+ githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
Will merge to 'master'.
* mh/split-under-lock (2016-05-13) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
Further preparatory work on the refs API before the pluggable
backend series can land.
Updated (again). Will wait for comments for the last time, and
then merge to 'next'.
* bn/http-cookiefile-config (2016-05-04) 2 commits
(merged to 'next' on 2016-05-09 at d519b13)
+ http: expand http.cookieFile as a path
+ Documentation: config: improve word ordering for http.cookieFile
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
Will merge to 'master'.
* jc/config-pathname-type (2016-05-04) 1 commit
(merged to 'next' on 2016-05-09 at 0876e55)
+ config: describe 'pathname' value type
(this branch is used by bn/config-doc-tt-varnames.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
Will merge to 'master'.
* jk/submodule-c-credential (2016-05-06) 6 commits
(merged to 'next' on 2016-05-10 at 4abe871)
+ submodule: stop sanitizing config options
+ submodule: use prepare_submodule_repo_env consistently
+ submodule--helper: move config-sanitizing to submodule.c
+ submodule: export sanitized GIT_CONFIG_PARAMETERS
+ t5550: break submodule config test into multiple sub-tests
+ t5550: fix typo in $HTTPD_URL
(this branch is used by js/http-custom-headers.)
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
Will merge to 'master'.
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
Will discard.
* ew/fast-import-unpack-limit (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will merge to 'master'.
* nd/worktree-various-heads (2016-04-22) 13 commits
(merged to 'next' on 2016-05-10 at 61d3415)
+ branch: do not rename a branch under bisect or rebase
+ worktree.c: check whether branch is bisected in another worktree
+ wt-status.c: split bisect detection out of wt_status_get_state()
+ worktree.c: check whether branch is rebased in another worktree
+ worktree.c: avoid referencing to worktrees[i] multiple times
+ wt-status.c: make wt_status_check_rebase() work on any worktree
+ wt-status.c: split rebase detection out of wt_status_get_state()
+ path.c: refactor and add worktree_git_path()
+ worktree.c: mark current worktree
+ worktree.c: make find_shared_symref() return struct worktree *
+ worktree.c: store "id" instead of "git_dir"
+ path.c: add git_common_path() and strbuf_git_common_path()
+ dir.c: rename str(n)cmp_icase to fspath(n)cmp
(this branch is used by nd/worktree-cleanup-post-head-protection.)
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Will merge to 'master'.
* pb/commit-verbose-config (2016-05-10) 7 commits
+ commit: add a commit.verbose config variable
+ t7507-commit-verbose: improve test coverage by testing number of diffs
+ parse-options.c: make OPTION_COUNTUP respect "unspecified" values
+ t/t7507: improve test coverage
+ t0040-parse-options: improve test coverage
+ test-parse-options: print quiet as integer
+ t0040-test-parse-options.sh: fix style issues
(this branch is used by jc/test-parse-options-expect.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Will merge to 'master'.
* jc/fsck-nul-in-commit (2016-05-10) 2 commits
(merged to 'next' on 2016-05-10 at 3bc3ca3)
+ fsck: detect and warn a commit with embedded NUL
+ fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
Will merge to 'master'.
* jc/ll-merge-internal (2016-05-09) 3 commits
(merged to 'next' on 2016-05-10 at a6bf1d0)
+ t6036: remove pointless test that expects failure
+ ll-merge: use a longer conflict marker for internal merge
+ ll-merge: fix typo in comment
"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
Will merge to 'master'.
* sb/submodule-init (2016-05-03) 7 commits
(merged to 'next' on 2016-05-03 at 8a5fce4)
+ submodule init: redirect stdout to stderr
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will cook for a bit more in 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* va/i18n-misc-updates (2016-05-12) 10 commits
(merged to 'next' on 2016-05-13 at 0361b16)
+ i18n: unpack-trees: avoid substituting only a verb in sentences
(merged to 'next' on 2016-05-10 at b5dbd0d)
+ i18n: builtin/pull.c: split strings marked for translation
+ i18n: builtin/pull.c: mark placeholders for translation
+ i18n: git-parse-remote.sh: mark strings for translation
+ i18n: branch: move comment for translators
+ i18n: branch: unmark string for translation
+ i18n: builtin/rm.c: remove a comma ',' from string
+ i18n: unpack-trees: mark strings for translation
+ i18n: builtin/branch.c: mark option for translation
+ i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
(merged to 'next' on 2016-05-10 at dd19e0a)
+ format-patch: introduce format.useAutoBase configuration
+ format-patch: introduce --base=auto option
+ format-patch: add '--base' option to record base tree info
+ patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will merge to 'master'.
* dt/index-helper (2016-05-13) 20 commits
- untracked-cache: config option
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: log warnings
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- pkt-line: add gentle version of packet_write
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
A new "index-helper" daemon has been introduced to give newly
spawned Git process a quicker access to the data in the index, and
optionally interface with the watchman daemon to further reduce the
refresh cost.
Under review.
($gmane/294470).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
. diff: enable "compaction heuristics" and lose experimentation knob
Superseded by the tip commit on the jk/diff-compact-heuristic topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (May 2016, #04; Wed, 11)
@ 2016-05-11 22:13 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-11 22:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the eleventh batch of topics of this
cycle. On the 'maint' front, 2.8.2 is out and fixes that have been
in 'master' accumulates on it for 2.8.3.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit
(merged to 'next' on 2016-05-06 at 6343d1e)
+ pack-objects: warn on split packs disabling bitmaps
Doc update.
* ew/normal-to-e (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 65a2c52)
+ .mailmap: update to my shorter email address
* js/close-packs-before-gc (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at bfd39bf)
+ t5510: run auto-gc in the foreground
* ls/p4-lfs (2016-04-28) 3 commits
(merged to 'next' on 2016-05-06 at 3e1354d)
+ git-p4: fix Git LFS pointer parsing
+ travis-ci: express Linux/OS X dependency versions more clearly
+ travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* ls/travis-submitting-patches (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 467930e)
+ Documentation: add setup instructions for Travis CI
* rn/glossary-typofix (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 1e73e76)
+ Documentation: fix typo 'In such these cases'
* sb/clean-test-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at d80c9c6)
+ t7300: mark test with SANITY
* sb/misc-cleanups (2016-04-28) 2 commits
(merged to 'next' on 2016-05-06 at 87bc8a5)
+ submodule-config: don't shadow `cache`
+ config.c: drop local variable
* sk/gitweb-highlight-encoding (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 441302c)
+ gitweb: apply fallback encoding before highlight
Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
--------------------------------------------------
[New Topics]
* es/t1500-modernize (2016-05-10) 7 commits
- t1500: finish preparation upfront
- t1500: be considerate to future potential tests
- t1500: avoid setting environment variables outside of tests
- t1500: avoid setting configuration options outside of tests
- t1500: avoid changing working directory outside of tests
- t1500: reduce dependence upon global state
- t1500: test_rev_parse: facilitate future test enhancements
test updates to make it more readable and maintainable.
Will be rerolled.
* ls/travis-build-doc (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at 7f63497)
+ travis-ci: build documentation
CI test was taught to build documentation pages.
Will merge to 'master'.
* js/t3404-typofix (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at cbeabc0)
+ t3404: fix typo
Will merge to 'master'.
* jk/rebase-interative-eval-fix (2016-05-10) 1 commit
(merged to 'next' on 2016-05-11 at 4fdf387)
+ rebase--interactive: avoid empty list in shell for-loop
Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
Will merge to 'master'.
* jk/test-send-sh-x-trace-elsewhere (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at 273a137)
+ test-lib: set BASH_XTRACEFD automatically
Running tests with '-x' option to trace the individual command
executions is a useful way to debug test scripts, but some tests
that capture the standard error stream and check what the command
said can be broken with the trace output mixed in. When running
our tests under "bash", however, we can redirect the trace output
to another file descriptor to keep the standard error of programs
being tested intact.
Will merge to 'master'.
* js/perf-rebase-i (2016-05-11) 3 commits
- Add a perf test for rebase -i
- perf: make the tests work in worktrees
- perf: let's disable symlinks when they are not available
Add perf test for "rebase -i"
* nd/worktree-cleanup-post-head-protection (2016-05-10) 7 commits
- worktree: simplify prefixing paths
- worktree: avoid 0{40}, too many zeroes, hard to read
- worktree.c: add clear_worktree()
- worktree.c: use is_dot_or_dotdot()
- git-worktree.txt: keep subcommand listing in alphabetical order
- worktree.c: rewrite mark_current_worktree() to avoid strbuf
- completion: support git-worktree
(this branch uses nd/worktree-various-heads.)
* va/mailinfo-doc-typofix (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at 7180176)
+ Documentation/git-mailinfo: fix typo
Typofix.
Will merge to 'master'.
--------------------------------------------------
[Stalled]
* ep/http-curl-trace (2016-05-02) 2 commits
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
. http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Expecting a reroll.
($gmane/292074, 293236)
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will this be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
. completion: cache the path to the repository
. completion: extract repository discovery from __gitdir()
. completion: don't guard git executions with __gitdir()
. completion: consolidate silencing errors from git commands
. completion: don't use __gitdir() for git commands
. completion: respect 'git -C <path>'
. completion: fix completion after 'git -C <path>'
. completion: don't offer commands when 'git --opt' needs an argument
. rev-parse: add '--absolute-git-dir' option
. completion: list short refs from a remote given as a URL
. completion: don't list 'HEAD' when trying refs completion outside of a repo
. completion: list refs from remote when remote's name matches a directory
. completion: respect 'git --git-dir=<path>' when listing remote refs
. completion: fix most spots not respecting 'git --git-dir=<path>'
. completion: ensure that the repository path given on the command line exists
. completion tests: add tests for the __git_refs() helper function
. completion tests: check __gitdir()'s output in the error cases
. completion tests: consolidate getting path of current working directory
. completion tests: make the $cur variable local to the test helper functions
. completion tests: don't add test cruft to the test repository
. completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
(merged to 'next' on 2016-05-10 at 2ada404)
+ wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example). This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.
Will merge to 'master'.
* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 36ae38c)
+ t4151: make sure argument to 'test -z' is given
Test fix.
Will merge to 'master'.
* es/test-gpg-tags (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 9fcb98b)
+ t6302: simplify non-gpg cases
Test fix.
Will merge to 'master'.
* jc/test-seq (2016-05-09) 2 commits
(merged to 'next' on 2016-05-10 at 1512890)
+ test-lib-functions.sh: rewrite test_seq without Perl
+ test-lib-functions.sh: remove misleading comment on test_seq
Test fix.
Will merge to 'master'.
* js/windows-dotgit (2016-05-11) 2 commits
(merged to 'next' on 2016-05-11 at d10caa2)
+ mingw: remove unnecessary definition
+ mingw: introduce the 'core.hideDotFiles' setting
On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
Will merge to 'master'.
* nd/error-errno (2016-05-09) 41 commits
(merged to 'next' on 2016-05-10 at 1cdeda8)
+ wrapper.c: use warning_errno()
+ vcs-svn: use error_errno()
+ upload-pack.c: use error_errno()
+ unpack-trees.c: use error_errno()
+ transport-helper.c: use error_errno()
+ sha1_file.c: use {error,die,warning}_errno()
+ server-info.c: use error_errno()
+ sequencer.c: use error_errno()
+ run-command.c: use error_errno()
+ rerere.c: use error_errno() and warning_errno()
+ reachable.c: use error_errno()
+ mailmap.c: use error_errno()
+ ident.c: use warning_errno()
+ http.c: use error_errno() and warning_errno()
+ grep.c: use error_errno()
+ gpg-interface.c: use error_errno()
+ fast-import.c: use error_errno()
+ entry.c: use error_errno()
+ editor.c: use error_errno()
+ diff-no-index.c: use error_errno()
+ credential-cache--daemon.c: use warning_errno()
+ copy.c: use error_errno()
+ connected.c: use error_errno()
+ config.c: use error_errno()
+ compat/win32/syslog.c: use warning_errno()
+ combine-diff.c: use error_errno()
+ check-racy.c: use error_errno()
+ builtin/worktree.c: use error_errno()
+ builtin/upload-archive.c: use error_errno()
+ builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
+ builtin/rm.c: use warning_errno()
+ builtin/pack-objects.c: use die_errno() and warning_errno()
+ builtin/merge-file.c: use error_errno()
+ builtin/mailsplit.c: use error_errno()
+ builtin/help.c: use warning_errno()
+ builtin/fetch.c: use error_errno()
+ builtin/branch.c: use error_errno()
+ builtin/am.c: use error_errno()
+ bisect.c: use die_errno() and warning_errno()
+ usage.c: add warning_errno() and error_errno()
+ usage.c: move format processing out of die_errno()
The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
Will merge to 'master'.
* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit
(merged to 'next' on 2016-05-10 at aea08dc)
+ remote.c: specify correct plural form in "commit diverge" message
Message fix.
Will merge to 'master'.
* nd/test-helpers (2016-05-10) 1 commit
(merged to 'next' on 2016-05-10 at e8ad58d)
+ wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.
Will merge to 'master'.
* tb/core-eol-fix (2016-04-25) 4 commits
(merged to 'next' on 2016-05-10 at fa8a200)
+ convert.c: ident + core.autocrlf didn't work
+ t0027: test cases for combined attributes
+ convert: allow core.autocrlf=input and core.eol=crlf
+ t0027: make commit_chk_wrnNNO() reliable
A couple of bugs around core.autocrlf have been fixed.
Will merge to 'master'.
* tb/t5601-sed-fix (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at d3e54e8)
+ t5601: Remove trailing space in sed expression
Test fix.
Will merge to 'master'.
* va/i18n-remote-comment-to-align (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at edbacbb)
+ i18n: remote: add comment for translators
Message fix.
Will merge to 'master'.
* jc/linkgit-fix (2016-05-09) 1 commit
(merged to 'next' on 2016-05-10 at 0e5ba60)
+ Documentation: fix linkgit references
Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
Will merge to 'master'.
* js/http-custom-headers (2016-05-10) 4 commits
(merged to 'next' on 2016-05-10 at 7cf5cca)
+ submodule: ensure that -c http.extraheader is heeded
+ Merge branch 'jk/submodule-c-credential' into js/http-custom-headers
+ t5551: make the test for extra HTTP headers more robust
+ tests: adjust the configuration for Apache 2.2
(this branch uses jk/submodule-c-credential.)
Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).
Will merge to 'master'.
* sb/submodule-deinit-all (2016-05-05) 1 commit
(merged to 'next' on 2016-05-09 at 0fd4518)
+ submodule deinit: require '--all' instead of '.' for all submodules
Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
Will merge to 'master'.
* bn/config-doc-tt-varnames (2016-05-05) 1 commit
(merged to 'next' on 2016-05-10 at aa7b834)
+ config: consistently format $variables in monospaced font
(this branch uses jc/config-pathname-type.)
Doc formatting fixes.
Will merge to 'master'.
* lp/typofixes (2016-05-06) 1 commit
(merged to 'next' on 2016-05-09 at 59683be)
+ typofix: assorted typofixes in comments, documentation and messages
Will merge to 'master'.
* sb/z-is-gnutar-ism (2016-05-09) 2 commits
(merged to 'next' on 2016-05-09 at 51d527d)
+ t6041: do not compress backup tar file
+ t3513: do not compress backup tar file
Will merge to 'master'.
* jc/test-parse-options-expect (2016-05-10) 4 commits
(merged to 'next' on 2016-05-10 at 3ca5783)
+ t0040: convert a few tests to use test-parse-options --expect
+ t0040: remove unused test helpers
+ test-parse-options: --expect=<string> option to simplify tests
+ test-parse-options: fix output when callback option fails
(this branch uses pb/commit-verbose-config.)
t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
Will merge to 'master'.
* jc/doc-lint (2016-05-10) 1 commit
- ci: validate "linkgit:" in documentation
Find common mistakes when writing gitlink: in our documentation and
drive the check from "make check-docs".
* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 08eccb2)
+ commit-tree: do not pay attention to commit.gpgsign
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
Will merge to 'master'.
* jk/push-client-deadlock-fix (2016-05-11) 2 commits
(merged to 'next' on 2016-05-11 at 8f4abf9)
+ Windows: only add a no-op pthread_sigmask() when needed
(merged to 'next' on 2016-05-06 at e91626c)
+ Windows: add pthread_sigmask() that does nothing
Some Windows SDK lacks pthread_sigmask() implementation and fails
to compile the recently updated "git push" codepath that uses it.
Will merge to 'master'.
* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at ab6dac3)
+ submodule deinit test: fix broken && chain in subshell
Will merge to 'master'.
* ab/hooks (2016-05-04) 4 commits
(merged to 'next' on 2016-05-09 at 23cf808)
+ hooks: allow customizing where the hook directory is
+ githooks.txt: minor improvements to the grammar & phrasing
+ githooks.txt: amend dangerous advice about 'update' hook ACL
+ githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
Will merge to 'master'.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
* mh/split-under-lock (2016-05-06) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
Further preparatory work on the refs API before the pluggable
backend series can land.
Updated. Will wait for comments for the last time, and then
merge to 'next'.
* bn/http-cookiefile-config (2016-05-04) 2 commits
(merged to 'next' on 2016-05-09 at d519b13)
+ http: expand http.cookieFile as a path
+ Documentation: config: improve word ordering for http.cookieFile
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
Will merge to 'master'.
* jc/config-pathname-type (2016-05-04) 1 commit
(merged to 'next' on 2016-05-09 at 0876e55)
+ config: describe 'pathname' value type
(this branch is used by bn/config-doc-tt-varnames.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
Will merge to 'master'.
* jk/submodule-c-credential (2016-05-06) 6 commits
(merged to 'next' on 2016-05-10 at 4abe871)
+ submodule: stop sanitizing config options
+ submodule: use prepare_submodule_repo_env consistently
+ submodule--helper: move config-sanitizing to submodule.c
+ submodule: export sanitized GIT_CONFIG_PARAMETERS
+ t5550: break submodule config test into multiple sub-tests
+ t5550: fix typo in $HTTPD_URL
(this branch is used by js/http-custom-headers.)
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
Will merge to 'master'.
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
Will discard.
* ew/fast-import-unpack-limit (2016-05-11) 1 commit
(merged to 'next' on 2016-05-11 at ffd4efb)
+ fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Will merge to 'master'.
* nd/worktree-various-heads (2016-04-22) 13 commits
(merged to 'next' on 2016-05-10 at 61d3415)
+ branch: do not rename a branch under bisect or rebase
+ worktree.c: check whether branch is bisected in another worktree
+ wt-status.c: split bisect detection out of wt_status_get_state()
+ worktree.c: check whether branch is rebased in another worktree
+ worktree.c: avoid referencing to worktrees[i] multiple times
+ wt-status.c: make wt_status_check_rebase() work on any worktree
+ wt-status.c: split rebase detection out of wt_status_get_state()
+ path.c: refactor and add worktree_git_path()
+ worktree.c: mark current worktree
+ worktree.c: make find_shared_symref() return struct worktree *
+ worktree.c: store "id" instead of "git_dir"
+ path.c: add git_common_path() and strbuf_git_common_path()
+ dir.c: rename str(n)cmp_icase to fspath(n)cmp
(this branch is used by nd/worktree-cleanup-post-head-protection.)
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Will merge to 'master'.
* pb/commit-verbose-config (2016-05-10) 7 commits
+ commit: add a commit.verbose config variable
+ t7507-commit-verbose: improve test coverage by testing number of diffs
+ parse-options.c: make OPTION_COUNTUP respect "unspecified" values
+ t/t7507: improve test coverage
+ t0040-parse-options: improve test coverage
+ test-parse-options: print quiet as integer
+ t0040-test-parse-options.sh: fix style issues
(this branch is used by jc/test-parse-options-expect.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Will merge to 'master'.
* jc/fsck-nul-in-commit (2016-05-10) 2 commits
(merged to 'next' on 2016-05-10 at 3bc3ca3)
+ fsck: detect and warn a commit with embedded NUL
+ fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
Will merge to 'master'.
* jc/ll-merge-internal (2016-05-09) 3 commits
(merged to 'next' on 2016-05-10 at a6bf1d0)
+ t6036: remove pointless test that expects failure
+ ll-merge: use a longer conflict marker for internal merge
+ ll-merge: fix typo in comment
"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
Will merge to 'master'.
* sb/submodule-init (2016-05-03) 7 commits
(merged to 'next' on 2016-05-03 at 8a5fce4)
+ submodule init: redirect stdout to stderr
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will cook for a bit more in 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* va/i18n-misc-updates (2016-04-19) 9 commits
(merged to 'next' on 2016-05-10 at b5dbd0d)
+ i18n: builtin/pull.c: split strings marked for translation
+ i18n: builtin/pull.c: mark placeholders for translation
+ i18n: git-parse-remote.sh: mark strings for translation
+ i18n: branch: move comment for translators
+ i18n: branch: unmark string for translation
+ i18n: builtin/rm.c: remove a comma ',' from string
+ i18n: unpack-trees: mark strings for translation
+ i18n: builtin/branch.c: mark option for translation
+ i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
(merged to 'next' on 2016-05-10 at dd19e0a)
+ format-patch: introduce format.useAutoBase configuration
+ format-patch: introduce --base=auto option
+ format-patch: add '--base' option to record base tree info
+ patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will merge to 'master'.
* dt/index-helper (2016-05-09) 19 commits
- untracked-cache: config option
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: log warnings
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review.
($gmane/294056).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
. diff: enable "compaction heuristics" and lose experimentation knob
Superseded by the tip commit on the jk/diff-compact-heuristic topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (May 2016, #03; Mon, 9)
@ 2016-05-09 23:00 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-09 23:00 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the tenth batch of topics of this cycle.
On the 'maint' front, 2.8.2 is out and fixes that have been in
'master' accumulates on it for 2.8.3.
Ones with questionable status has a '?' character in their comments.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit
- t4151: make sure argument to 'test -z' is given
Test fix.
Will merge to 'next'.
* es/test-gpg-tags (2016-05-09) 1 commit
- t6302: simplify non-gpg cases
Test fix.
Will merge to 'next'.
* jc/test-seq (2016-05-09) 2 commits
- test-lib-functions.sh: rewrite test_seq without Perl
- test-lib-functions.sh: remove misleading comment on test_seq
Test fix.
Will merge to 'next'.
* js/windows-dotgit (2016-05-09) 2 commits
- mingw: remove unnecessary definition
- mingw: introduce the 'core.hideDotFiles' setting
On Windows, .git and optionally any files whose name starts with a
dot are now marked as hidden, with a core.hideDotFiles knob to
customize this behaviour.
* nd/error-errno (2016-05-09) 41 commits
- wrapper.c: use warning_errno()
- vcs-svn: use error_errno()
- upload-pack.c: use error_errno()
- unpack-trees.c: use error_errno()
- transport-helper.c: use error_errno()
- sha1_file.c: use {error,die,warning}_errno()
- server-info.c: use error_errno()
- sequencer.c: use error_errno()
- run-command.c: use error_errno()
- rerere.c: use error_errno() and warning_errno()
- reachable.c: use error_errno()
- mailmap.c: use error_errno()
- ident.c: use warning_errno()
- http.c: use error_errno() and warning_errno()
- grep.c: use error_errno()
- gpg-interface.c: use error_errno()
- fast-import.c: use error_errno()
- entry.c: use error_errno()
- editor.c: use error_errno()
- diff-no-index.c: use error_errno()
- credential-cache--daemon.c: use warning_errno()
- copy.c: use error_errno()
- connected.c: use error_errno()
- config.c: use error_errno()
- compat/win32/syslog.c: use warning_errno()
- combine-diff.c: use error_errno()
- check-racy.c: use error_errno()
- builtin/worktree.c: use error_errno()
- builtin/upload-archive.c: use error_errno()
- builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
- builtin/rm.c: use warning_errno()
- builtin/pack-objects.c: use die_errno() and warning_errno()
- builtin/merge-file.c: use error_errno()
- builtin/mailsplit.c: use error_errno()
- builtin/help.c: use warning_errno()
- builtin/fetch.c: use error_errno()
- builtin/branch.c: use error_errno()
- builtin/am.c: use error_errno()
- bisect.c: use die_errno() and warning_errno()
- usage.c: add warning_errno() and error_errno()
- usage.c: move format processing out of die_errno()
The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
Will merge to 'next'.
* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit
- remote.c: specify correct plural form in "commit diverge" message
Message fix.
Will merge to 'next'.
* nd/test-helpers (2016-05-09) 1 commit
- wrap-for-bin.sh: handle t/helper/ paths internally
Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.
Will merge to 'next'.
* tb/core-eol-fix (2016-04-25) 4 commits
- convert.c: ident + core.autocrlf didn't work
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- t0027: make commit_chk_wrnNNO() reliable
A couple of bugs around core.autocrlf have been fixed.
Will merge to 'next'.
* tb/t5601-sed-fix (2016-05-09) 1 commit
- t5601: Remove trailing space in sed expression
Test fix.
Will merge to 'next'.
* va/i18n-remote-comment-to-align (2016-05-09) 1 commit
- i18n: remote: add comment for translators
Message fix.
Will merge to 'next'.
* jc/linkgit-fix (2016-05-09) 1 commit
- Documentation: fix linkgit references
Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.
Will merge to 'next'.
* js/http-custom-headers (2016-05-09) 2 commits
- t5551: make the test for extra HTTP headers more robust
- tests: adjust the configuration for Apache 2.2
Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will this be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* sb/submodule-deinit-all (2016-05-05) 1 commit
(merged to 'next' on 2016-05-09 at 0fd4518)
+ submodule deinit: require '--all' instead of '.' for all submodules
Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
Will merge to 'master'.
* bn/config-doc-tt-varnames (2016-05-05) 1 commit
- config: consistently format $variables in monospaced font
(this branch uses jc/config-pathname-type.)
Doc formatting fixes.
Will merge to 'next'.
* lp/typofixes (2016-05-06) 1 commit
(merged to 'next' on 2016-05-09 at 59683be)
+ typofix: assorted typofixes in comments, documentation and messages
Will merge to 'master'.
* sb/z-is-gnutar-ism (2016-05-09) 2 commits
(merged to 'next' on 2016-05-09 at 51d527d)
+ t6041: do not compress backup tar file
+ t3513: do not compress backup tar file
Will merge to 'master'.
* jc/test-parse-options-expect (2016-05-06) 4 commits
- t0040: convert a few tests to use test-parse-options --expect
- t0040: remove unused test helpers
- test-parse-options: --expect=<string> option to simplify tests
- test-parse-options: fix output when callback option fails
(this branch uses pb/commit-verbose-config.)
t0040 had too many unnecessary repetitions in its test data. Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.
Will merge to 'next'.
* jc/doc-lint (2016-05-04) 1 commit
- ci: validate "gitlink:" in documentation
Find common mistakes when writing gitlink: in our documentation and
drive the check from "make check-docs".
* ew/normal-to-e (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 65a2c52)
+ .mailmap: update to my shorter email address
Will merge to 'master'.
* js/close-packs-before-gc (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at bfd39bf)
+ t5510: run auto-gc in the foreground
Will merge to 'master'.
* ls/travis-submitting-patches (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 467930e)
+ Documentation: add setup instructions for Travis CI
Will merge to 'master'.
* rn/glossary-typofix (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 1e73e76)
+ Documentation: fix typo 'In such these cases'
Will merge to 'master'.
* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 08eccb2)
+ commit-tree: do not pay attention to commit.gpgsign
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
Will merge to 'master'.
* jk/push-client-deadlock-fix (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at e91626c)
+ Windows: add pthread_sigmask() that does nothing
Will merge to 'master'.
* sb/clean-test-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at d80c9c6)
+ t7300: mark test with SANITY
Will merge to 'master'.
* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at ab6dac3)
+ submodule deinit test: fix broken && chain in subshell
Will merge to 'master'.
* sk/gitweb-highlight-encoding (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 441302c)
+ gitweb: apply fallback encoding before highlight
Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
Will merge to 'master'.
* ab/hooks (2016-05-04) 4 commits
(merged to 'next' on 2016-05-09 at 23cf808)
+ hooks: allow customizing where the hook directory is
+ githooks.txt: minor improvements to the grammar & phrasing
+ githooks.txt: amend dangerous advice about 'update' hook ACL
+ githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
Will merge to 'master'.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
* mh/split-under-lock (2016-05-06) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
Further preparatory work on the refs API before the pluggable
backend series can land.
Updated. Will wait for comments for the last time, and then
merge to 'next'.
* bn/http-cookiefile-config (2016-05-04) 2 commits
(merged to 'next' on 2016-05-09 at d519b13)
+ http: expand http.cookieFile as a path
+ Documentation: config: improve word ordering for http.cookieFile
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
Will merge to 'master'.
* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit
(merged to 'next' on 2016-05-06 at 6343d1e)
+ pack-objects: warn on split packs disabling bitmaps
Doc update.
Will merge to 'master'.
* jc/config-pathname-type (2016-05-04) 1 commit
(merged to 'next' on 2016-05-09 at 0876e55)
+ config: describe 'pathname' value type
(this branch is used by bn/config-doc-tt-varnames.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
Will merge to 'master'.
* jk/submodule-c-credential (2016-05-06) 6 commits
- submodule: stop sanitizing config options
- submodule: use prepare_submodule_repo_env consistently
- submodule--helper: move config-sanitizing to submodule.c
- submodule: export sanitized GIT_CONFIG_PARAMETERS
- t5550: break submodule config test into multiple sub-tests
- t5550: fix typo in $HTTPD_URL
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly.
Everybody happy?
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
Will discard.
* sb/misc-cleanups (2016-04-28) 2 commits
(merged to 'next' on 2016-05-06 at 87bc8a5)
+ submodule-config: don't shadow `cache`
+ config.c: drop local variable
Will merge to 'master'.
* ew/fast-import-unpack-limit (2016-04-24) 1 commit
- fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Need to pick up the rerolled version.
($gmane/292562)
* ls/p4-lfs (2016-04-28) 3 commits
(merged to 'next' on 2016-05-06 at 3e1354d)
+ git-p4: fix Git LFS pointer parsing
+ travis-ci: express Linux/OS X dependency versions more clearly
+ travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
Will merge to 'master'.
* ep/http-curl-trace (2016-05-02) 2 commits
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
. http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Still under discussion.
($gmane/292074, 293236)
* nd/worktree-various-heads (2016-04-22) 13 commits
- branch: do not rename a branch under bisect or rebase
- worktree.c: check whether branch is bisected in another worktree
- wt-status.c: split bisect detection out of wt_status_get_state()
- worktree.c: check whether branch is rebased in another worktree
- worktree.c: avoid referencing to worktrees[i] multiple times
- wt-status.c: make wt_status_check_rebase() work on any worktree
- wt-status.c: split rebase detection out of wt_status_get_state()
- path.c: refactor and add worktree_git_path()
- worktree.c: mark current worktree
- worktree.c: make find_shared_symref() return struct worktree *
- worktree.c: store "id" instead of "git_dir"
- path.c: add git_common_path() and strbuf_git_common_path()
- dir.c: rename str(n)cmp_icase to fspath(n)cmp
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Will merge to 'next'.
* pb/commit-verbose-config (2016-05-05) 8 commits
- SQUASH???
- commit: add a commit.verbose config variable
- t7507-commit-verbose: improve test coverage by testing number of diffs
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
- t/t7507: improve test coverage
- t0040-parse-options: improve test coverage
- test-parse-options: print quiet as integer
- t0040-test-parse-options.sh: fix style issues
(this branch is used by jc/test-parse-options-expect.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Almost there.
($gmane/293663).
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
What was the status of this one? Ready to proceed?
* jc/ll-merge-internal (2016-05-09) 3 commits
- t6036: remove pointless test that expects failure
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
Will merge to 'next'.
* sb/submodule-init (2016-05-03) 7 commits
(merged to 'next' on 2016-05-03 at 8a5fce4)
+ submodule init: redirect stdout to stderr
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will cook for a bit more in 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* va/i18n-misc-updates (2016-04-19) 9 commits
- i18n: builtin/pull.c: split strings marked for translation
- i18n: builtin/pull.c: mark placeholders for translation
- i18n: git-parse-remote.sh: mark strings for translation
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Will merge to 'next'.
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
- format-patch: introduce format.useAutoBase configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will merge to 'next'.
* dt/index-helper (2016-05-09) 19 commits
- untracked-cache: config option
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: support watchman to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: log warnings
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review.
($gmane/294056).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
. diff: enable "compaction heuristics" and lose experimentation knob
Superseded by the tip commit on the jk/diff-compact-heuristic topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (May 2016, #02; Fri, 6)
@ 2016-05-06 22:46 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-06 22:46 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the tenth batch of topics of this cycle.
On the 'maint' front, 2.8.2 is out and fixes that have been in
'master' accumulates on it for 2.8.3.
Ones with questionable status has a '?' character in their comments.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* bc/object-id (2016-04-25) 6 commits
(merged to 'next' on 2016-04-29 at 02f13a4)
+ match-trees: convert several leaf functions to use struct object_id
+ tree-walk: convert tree_entry_extract() to use struct object_id
+ struct name_entry: use struct object_id instead of unsigned char sha1[20]
+ match-trees: convert shift_tree() and shift_tree_by() to use object_id
+ test-match-trees: convert to use struct object_id
+ sha1-name: introduce a get_oid() function
Move from unsigned char[20] to struct object_id continues.
* bw/rebase-merge-entire-branch (2016-04-24) 1 commit
(merged to 'next' on 2016-04-29 at 7a9487f)
+ git-rebase--merge: don't include absent parent as a base
"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
* jc/drop-git-spec-in (2016-04-27) 2 commits
(merged to 'next' on 2016-04-27 at 2b85030)
+ Makefile: remove dependency on git.spec
(merged to 'next' on 2016-04-22 at 531583f)
+ Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
* jk/diff-compact-heuristic (2016-05-02) 3 commits
(merged to 'next' on 2016-05-02 at 2a74763)
+ diff: undocument the compaction heuristic knobs for experimentation
(merged to 'next' on 2016-04-22 at 0c117ea)
+ xdiff: implement empty line chunk heuristic
+ xdiff: add recs_match helper function
(this branch is tangled with jc/diff-compact-always-use-blank-heuristics.)
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
* js/http-custom-headers (2016-04-27) 1 commit
(merged to 'next' on 2016-04-27 at 0c97a50)
+ http: support sending custom HTTP headers
HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
* ld/p4-test-py3 (2016-04-26) 3 commits
(merged to 'next' on 2016-04-27 at d5d5fca)
+ git-p4 tests: time_in_seconds should use $PYTHON_PATH
+ git-p4 tests: work with python3 as well as python2
+ git-p4 tests: cd to / before running python
The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* ls/p4-lfs-test-fix-2.7.0 (2016-04-29) 2 commits
(merged to 'next' on 2016-04-29 at da56b67)
+ t9824: fix wrong reference value
(merged to 'next' on 2016-04-27 at be87c63)
+ t9824: fix broken &&-chain in a subshell
Fix a broken test.
* sb/clone-shallow-passthru (2016-04-26) 1 commit
(merged to 'next' on 2016-04-27 at 3112b24)
+ clone: add `--shallow-submodules` flag
"git clone" learned "--shallow-submodules" option.
* sb/config-exit-status-list (2016-04-26) 1 commit
(merged to 'next' on 2016-04-27 at 44fe343)
+ config doc: improve exit code listing
Doc update.
--------------------------------------------------
[New Topics]
* sb/submodule-deinit-all (2016-05-05) 1 commit
- submodule deinit: require '--all' instead of '.' for all submodules
Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.
Will merge to 'next'.
* bn/config-doc-tt-varnames (2016-05-05) 1 commit
- config: consistently format $variables in monospaced font
(this branch uses jc/config-pathname-type.)
Doc formatting fixes.
* lp/typofixes (2016-05-06) 1 commit
- typofix: assorted typofixes in comments, documentation and messages
Will merge to 'next'.
* sb/z-is-gnutar-ism (2016-05-06) 1 commit
- t3513: do not compress backup tar file
Will merge to 'next'.
* jc/test-parse-options-expect (2016-05-06) 4 commits
- t0040: convert a few tests to use test-parse-options --expect
- t0040: remove unused test helpers
- test-parse-options: --expect=<string> option to simplify tests
- test-parse-options: fix output when callback option fails
(this branch uses pb/commit-verbose-config.)
* jc/doc-lint (2016-05-04) 2 commits
- Documentation: fix linkgit references
- ci: validate "gitlink:" in documentation
--------------------------------------------------
[Stalled]
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will this be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ew/normal-to-e (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 65a2c52)
+ .mailmap: update to my shorter email address
Will merge to 'master'.
* js/close-packs-before-gc (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at bfd39bf)
+ t5510: run auto-gc in the foreground
Will merge to 'master'.
* ls/travis-submitting-patches (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 467930e)
+ Documentation: add setup instructions for Travis CI
Will merge to 'master'.
* rn/glossary-typofix (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at 1e73e76)
+ Documentation: fix typo 'In such these cases'
Will merge to 'master'.
* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 08eccb2)
+ commit-tree: do not pay attention to commit.gpgsign
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
Will merge to 'master'.
* jk/push-client-deadlock-fix (2016-05-02) 1 commit
(merged to 'next' on 2016-05-06 at e91626c)
+ Windows: add pthread_sigmask() that does nothing
Will merge to 'master'.
* sb/clean-test-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at d80c9c6)
+ t7300: mark test with SANITY
Will merge to 'master'.
* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at ab6dac3)
+ submodule deinit test: fix broken && chain in subshell
Will merge to 'master'.
* sk/gitweb-highlight-encoding (2016-05-03) 1 commit
(merged to 'next' on 2016-05-06 at 441302c)
+ gitweb: apply fallback encoding before highlight
Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
Will merge to 'master'.
* ab/hooks (2016-05-04) 4 commits
- hooks: allow customizing where the hook directory is
- githooks.txt: minor improvements to the grammar & phrasing
- githooks.txt: amend dangerous advice about 'update' hook ACL
- githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
Will merge to 'next'.
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
* mh/split-under-lock (2016-05-06) 33 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): move docstring to header file
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
- read_raw_ref(): don't get confused by an empty directory
- commit_ref(): if there is an empty dir in the way, delete it
- t1404: demonstrate a bug resolving references
Further preparatory work on the refs API before the pluggable
backend series can land.
Updated. Will wait for comments for the last time, and then
merge to 'next'.
* bn/http-cookiefile-config (2016-05-04) 2 commits
- http: expand http.cookieFile as a path
- Documentation: config: improve word ordering for http.cookieFile
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
Will merge to 'next'.
* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit
(merged to 'next' on 2016-05-06 at 6343d1e)
+ pack-objects: warn on split packs disabling bitmaps
Doc update.
Will merge to 'master'.
* jc/config-pathname-type (2016-05-04) 1 commit
- config: describe 'pathname' value type
(this branch is used by bn/config-doc-tt-varnames.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
Will merge to 'next'.
* jk/submodule-c-credential (2016-05-06) 6 commits
- submodule: stop sanitizing config options
- submodule: use prepare_submodule_repo_env consistently
- submodule--helper: move config-sanitizing to submodule.c
- submodule: export sanitized GIT_CONFIG_PARAMETERS
- t5550: break submodule config test into multiple sub-tests
- t5550: fix typo in $HTTPD_URL
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly.
Everybody happy?
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
Will discard.
* sb/misc-cleanups (2016-04-28) 2 commits
(merged to 'next' on 2016-05-06 at 87bc8a5)
+ submodule-config: don't shadow `cache`
+ config.c: drop local variable
Will merge to 'master'.
* ew/fast-import-unpack-limit (2016-04-24) 1 commit
- fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Need to pick up the rerolled version.
($gmane/292562)
* ls/p4-lfs (2016-04-28) 3 commits
(merged to 'next' on 2016-05-06 at 3e1354d)
+ git-p4: fix Git LFS pointer parsing
+ travis-ci: express Linux/OS X dependency versions more clearly
+ travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
Will merge to 'master'.
* tb/convert-eol-autocrlf (2016-04-29) 10 commits
- ce_compare_data() did not respect conversion
- t6038; use crlf on all platforms
- convert.c: more safer crlf handling with text attribute
- convert: unify the "auto" handling of CRLF
- convert.c: stream and early out
- read-cache: factor out get_sha1_from_index() helper
- convert.c: ident + core.autocrlf didn't work
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- t0027: make commit_chk_wrnNNO() reliable
The combination of text=auto & eol=crlf (or eol=lf for that matter)
is taught to be much more useful; it used to be "auto detection"
was defeated as if setting eol declares that the file _is_ text,
but now text=auto is still in effect for such a path and the code
refrains from applying eol conversion if it found the path is not
text. Also setting core.autocrlf to 'input' and core.eol to 'crlf'
used to be rejected, but because the code gives precedence to
core.autocrlf, there is no need to, hence we no longer reject the
combination.
Earlier steps looked alright, but it veers into a wrong direction
in the middle.
* ep/http-curl-trace (2016-05-02) 2 commits
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
. http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Still under discussion.
($gmane/292074, 293236)
* nd/worktree-various-heads (2016-04-22) 13 commits
- branch: do not rename a branch under bisect or rebase
- worktree.c: check whether branch is bisected in another worktree
- wt-status.c: split bisect detection out of wt_status_get_state()
- worktree.c: check whether branch is rebased in another worktree
- worktree.c: avoid referencing to worktrees[i] multiple times
- wt-status.c: make wt_status_check_rebase() work on any worktree
- wt-status.c: split rebase detection out of wt_status_get_state()
- path.c: refactor and add worktree_git_path()
- worktree.c: mark current worktree
- worktree.c: make find_shared_symref() return struct worktree *
- worktree.c: store "id" instead of "git_dir"
- path.c: add git_common_path() and strbuf_git_common_path()
- dir.c: rename str(n)cmp_icase to fspath(n)cmp
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Being reviewed.
($gmane/292189)
* pb/commit-verbose-config (2016-05-05) 8 commits
- SQUASH???
- commit: add a commit.verbose config variable
- t7507-commit-verbose: improve test coverage by testing number of diffs
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
- t/t7507: improve test coverage
- t0040-parse-options: improve test coverage
- test-parse-options: print quiet as integer
- t0040-test-parse-options.sh: fix style issues
(this branch is used by jc/test-parse-options-expect.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Almost there.
($gmane/293663).
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
What was the status of this one? Ready to proceed?
* jc/ll-merge-internal (2016-04-27) 3 commits
- t6036: remove pointless test that expects failure
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
Will rebase to remove the comment after three-dash line and then merge.
* sb/submodule-init (2016-05-03) 7 commits
(merged to 'next' on 2016-05-03 at 8a5fce4)
+ submodule init: redirect stdout to stderr
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will cook for a bit more in 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* va/i18n-misc-updates (2016-04-19) 9 commits
- i18n: builtin/pull.c: split strings marked for translation
- i18n: builtin/pull.c: mark placeholders for translation
- i18n: git-parse-remote.sh: mark strings for translation
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Comments? They looked all sensible to me.
Does the lack of response mean lack of interest and support?
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
- format-patch: introduce format.useAutoBase configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Looking close to be ready.
($gmane/292622).
* dt/index-helper (2016-05-05) 19 commits
- untracked-cache: config option
- trace: measure where most of the time is spent
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- watchman: add a config option to enable the extension
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- watchman: add support to watchman to reduce refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: log warnings
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review. Reported to break its own tests.
($gmane/293687).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
--------------------------------------------------
[Discarded]
* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
. diff: enable "compaction heuristics" and lose experimentation knob
Superseded by the tip commit on the jk/diff-compact-heuristic topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (May 2016, #01; Tue, 3)
@ 2016-05-03 22:49 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-05-03 22:49 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the ninth batch of topics of this cycle.
On the 'maint' front, 2.8.2 is out and fixes that have been in
'master' accumulates on it for 2.8.3.
Ones with questionable status has a '?' character in their comments.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* en/merge-fixes (2016-04-12) 2 commits
(merged to 'next' on 2016-04-27 at 14d7d10)
+ merge-recursive: do not check working copy when creating a virtual merge base
+ merge-recursive: remove duplicate code
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* jd/p4-jobs-in-commit (2016-04-19) 2 commits
(merged to 'next' on 2016-04-27 at 654d946)
+ git-p4: add P4 jobs to git commit message
+ git-p4: clean-up code style in tests
"git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
* jd/send-email-to-whom (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 47ae363)
+ send-email: fix grammo in the prompt that asks e-mail recipients
A question by "git send-email" to ask the identity of the sender
has been updated.
* jk/fix-attribute-macro-in-2.5 (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 2e42613)
+ remote.c: spell __attribute__ correctly
Code fixup.
* js/name-rev-use-oldest-ref (2016-04-22) 1 commit
(merged to 'next' on 2016-04-27 at 8fdc0ac)
+ name-rev: include taggerdate in considering the best name
"git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
* nd/remove-unused (2016-04-22) 2 commits
(merged to 'next' on 2016-04-27 at 7917efa)
+ wrapper.c: delete dead function git_mkstemps()
+ dir.c: remove dead function fnmatch_icase()
Code cleanup.
* nf/mergetool-prompt (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 1c992df)
+ difftool/mergetool: make the form of yes/no questions consistent
UI consistency improvements.
* rt/string-list-lookup-cleanup (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 53514e1)
+ string_list: use string-list API in unsorted_string_list_lookup()
Code cleanup.
* sg/test-lib-simplify-expr-away (2016-04-22) 1 commit
(merged to 'next' on 2016-04-27 at 8f40952)
+ test-lib: simplify '--option=value' parsing
Code cleanup.
--------------------------------------------------
[New Topics]
* ew/normal-to-e (2016-05-02) 1 commit
- .mailmap: update to my shorter email address
Will merge to 'next'.
* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 3 commits
- diff: enable "compaction heuristics" and lose experimentation knob
(merged to 'next' on 2016-04-22 at 0c117ea)
+ xdiff: implement empty line chunk heuristic
+ xdiff: add recs_match helper function
(this branch is tangled with jk/diff-compact-heuristic.)
This should be discarded.
* js/close-packs-before-gc (2016-05-02) 1 commit
- t5510: run auto-gc in the foreground
Will merge to 'next'.
* ls/travis-submitting-patches (2016-05-02) 1 commit
- Documentation: add setup instructions for Travis CI
Will merge to 'next'.
* rn/glossary-typofix (2016-05-02) 1 commit
- Documentation: fix typo 'In such these cases'
Will merge to 'next'.
* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
- commit-tree: do not pay attention to commit.gpgsign
"git commit-tree" plumbing command required the user to always sign
its result when the user sets the commit.gpgsign configuration
variable, which was an ancient mistake. Rework "git rebase" that
relied on this mistake so that it reads commit.gpgsign and pass (or
not pass) the -S option to "git commit-tree" to keep the end-user
expectation the same, while teaching "git commit-tree" to ignore
the configuration variable. This will stop requiring the users to
sign commit objects used internally as an implementation detail of
"git stash".
Will merge to 'next'.
* jk/push-client-deadlock-fix (2016-05-02) 1 commit
- Windows: add pthread_sigmask() that does nothing
Will merge to 'next'.
* sb/clean-test-fix (2016-05-03) 1 commit
- t7300: mark test with SANITY
Will merge to 'next'.
* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
- submodule deinit test: fix broken && chain in subshell
Will merge to 'next'.
* sk/gitweb-highlight-encoding (2016-05-03) 1 commit
- gitweb: apply fallback encoding before highlight
Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will this be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ab/hooks (2016-04-26) 4 commits
- hooks: allow customizing where the hook directory is
- githooks.txt: minor improvements to the grammar & phrasing
- githooks.txt: amend dangerous advice about 'update' hook ACL
- githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
Almost there.
($gmane/292635)
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
* js/http-custom-headers (2016-04-27) 1 commit
(merged to 'next' on 2016-04-27 at 0c97a50)
+ http: support sending custom HTTP headers
HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
Will merge to 'master'.
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sb/config-exit-status-list (2016-04-26) 1 commit
(merged to 'next' on 2016-04-27 at 44fe343)
+ config doc: improve exit code listing
Doc update.
Will merge to 'master'.
* mh/split-under-lock (2016-04-27) 29 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
Further preparatory work on the refs API before the pluggable
backend series can land.
Almost there.
($gmane/292772)
* bn/http-cookiefile-config (2016-04-29) 2 commits
- http: expand http.cookieFile as a path
- Documentation: config: improve word ordering for http.cookieFile
(this branch uses jc/config-pathname-type.)
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
Waiting for an Ack to what's queued with tweaks, or a reroll.
($gmane/292969)
* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit
- pack-objects: warn on split packs disabling bitmaps
Doc update.
Will merge to 'next'.
* jc/config-pathname-type (2016-04-29) 1 commit
- config: describe 'pathname' value type
(this branch is used by bn/http-cookiefile-config.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
Will merge to 'next'.
* jk/submodule-config-sanitize-fix (2016-04-28) 5 commits
- submodule: use prepare_submodule_repo_env consistently
- submodule--helper: move config-sanitizing to submodule.c
- submodule: export sanitized GIT_CONFIG_PARAMETERS
- t5550: break submodule config test into multiple sub-tests
- t5550: fix typo in $HTTPD_URL
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly.
With a rethink of the merit of "sanitization" going on, we may end
up doing the configuration propagation very differently, though.
Will hold.
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
Will discard.
* sb/misc-cleanups (2016-04-28) 2 commits
- submodule-config: don't shadow `cache`
- config.c: drop local variable
Will merge to 'next'.
* ew/fast-import-unpack-limit (2016-04-24) 1 commit
- fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Need to pick up the rerolled version.
($gmane/292562)
* ld/p4-test-py3 (2016-04-26) 3 commits
(merged to 'next' on 2016-04-27 at d5d5fca)
+ git-p4 tests: time_in_seconds should use $PYTHON_PATH
+ git-p4 tests: work with python3 as well as python2
+ git-p4 tests: cd to / before running python
The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
Will merge to 'master'.
* ls/p4-lfs-test-fix-2.7.0 (2016-04-29) 2 commits
(merged to 'next' on 2016-04-29 at da56b67)
+ t9824: fix wrong reference value
(merged to 'next' on 2016-04-27 at be87c63)
+ t9824: fix broken &&-chain in a subshell
Fix a broken test.
Will merge to 'master'.
* sb/clone-shallow-passthru (2016-04-26) 1 commit
(merged to 'next' on 2016-04-27 at 3112b24)
+ clone: add `--shallow-submodules` flag
"git clone" learned "--shallow-submodules" option.
Will merge to 'master'.
* ls/p4-lfs (2016-04-28) 3 commits
- git-p4: fix Git LFS pointer parsing
- travis-ci: express Linux/OS X dependency versions more clearly
- travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
Will merge to 'next'.
* tb/convert-eol-autocrlf (2016-04-29) 10 commits
- ce_compare_data() did not respect conversion
- t6038; use crlf on all platforms
- convert.c: more safer crlf handling with text attribute
- convert: unify the "auto" handling of CRLF
- convert.c: stream and early out
- read-cache: factor out get_sha1_from_index() helper
- convert.c: ident + core.autocrlf didn't work
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- t0027: make commit_chk_wrnNNO() reliable
The combination of text=auto & eol=crlf (or eol=lf for that matter)
is taught to be much more useful; it used to be "auto detection"
was defeated as if setting eol declares that the file _is_ text,
but now text=auto is still in effect for such a path and the code
refrains from applying eol conversion if it found the path is not
text. Also setting core.autocrlf to 'input' and core.eol to 'crlf'
used to be rejected, but because the code gives precedence to
core.autocrlf, there is no need to, hence we no longer reject the
combination.
Earlier steps looked alright, but it veers into a wrong direction
in the middle.
* bc/object-id (2016-04-25) 6 commits
(merged to 'next' on 2016-04-29 at 02f13a4)
+ match-trees: convert several leaf functions to use struct object_id
+ tree-walk: convert tree_entry_extract() to use struct object_id
+ struct name_entry: use struct object_id instead of unsigned char sha1[20]
+ match-trees: convert shift_tree() and shift_tree_by() to use object_id
+ test-match-trees: convert to use struct object_id
+ sha1-name: introduce a get_oid() function
Move from unsigned char[20] to struct object_id continues.
Will merge to 'master'.
* ep/http-curl-trace (2016-05-02) 2 commits
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
. http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Still under discussion.
($gmane/292074, 293236)
* nd/worktree-various-heads (2016-04-22) 13 commits
- branch: do not rename a branch under bisect or rebase
- worktree.c: check whether branch is bisected in another worktree
- wt-status.c: split bisect detection out of wt_status_get_state()
- worktree.c: check whether branch is rebased in another worktree
- worktree.c: avoid referencing to worktrees[i] multiple times
- wt-status.c: make wt_status_check_rebase() work on any worktree
- wt-status.c: split rebase detection out of wt_status_get_state()
- path.c: refactor and add worktree_git_path()
- worktree.c: mark current worktree
- worktree.c: make find_shared_symref() return struct worktree *
- worktree.c: store "id" instead of "git_dir"
- path.c: add git_common_path() and strbuf_git_common_path()
- dir.c: rename str(n)cmp_icase to fspath(n)cmp
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Being reviewed.
($gmane/292189)
* bw/rebase-merge-entire-branch (2016-04-24) 1 commit
(merged to 'next' on 2016-04-29 at 7a9487f)
+ git-rebase--merge: don't include absent parent as a base
"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
Will merge to 'master'.
* pb/commit-verbose-config (2016-05-02) 7 commits
- t/t7507: tests for broken behavior of status
- commit: add a commit.verbose config variable
- t7507-commit-verbose: improve test coverage by testing number of diffs
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
- t0040-parse-options: improve test coverage
- test-parse-options: print quiet as integer
- t0040-test-parse-options.sh: fix style issues
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Almost there.
($gmane/293410).
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
What was the status of this one? Ready to proceed?
* jc/ll-merge-internal (2016-04-27) 3 commits
- t6036: remove pointless test that expects failure
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
"git rerere" can get confused by conflict markers deliberately left
by the inner merge step, because they are indistinguishable from
the real conflict markers left by the outermost merge which are
what the end user and "rerere" need to look at. This was fixed by
making the conflict markers left by the inner merges a bit longer.
Will rebase to remove the comment after three-dash line and then merge.
* jk/diff-compact-heuristic (2016-05-02) 3 commits
(merged to 'next' on 2016-05-02 at 2a74763)
+ diff: undocument the compaction heuristic knobs for experimentation
(merged to 'next' on 2016-04-22 at 0c117ea)
+ xdiff: implement empty line chunk heuristic
+ xdiff: add recs_match helper function
(this branch is tangled with jc/diff-compact-always-use-blank-heuristics.)
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
Will merge to 'master'.
* sb/submodule-init (2016-05-03) 7 commits
(merged to 'next' on 2016-05-03 at 8a5fce4)
+ submodule init: redirect stdout to stderr
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will cook for a bit more in 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* va/i18n-misc-updates (2016-04-19) 9 commits
- i18n: builtin/pull.c: split strings marked for translation
- i18n: builtin/pull.c: mark placeholders for translation
- i18n: git-parse-remote.sh: mark strings for translation
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Comments? They looked all sensible to me.
Does the lack of response mean lack of interest and support?
* jc/drop-git-spec-in (2016-04-27) 2 commits
(merged to 'next' on 2016-04-27 at 2b85030)
+ Makefile: remove dependency on git.spec
(merged to 'next' on 2016-04-22 at 531583f)
+ Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
- format-patch: introduce format.useAutoBase configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Looking close to be ready.
($gmane/292622).
* dt/index-helper (2016-05-02) 19 commits
. untracked-cache: config option
. Add tracing to measure where most of the time is spent
. index-helper: optionally automatically run
. index-helper: autorun mode
. index-helper: don't run if already running
. index-helper: kill mode
. watchman: add a config option to enable the extension
. unpack-trees: preserve index extensions
. update-index: enable/disable watchman support
. index-helper: use watchman to avoid refreshing index with lstat()
. watchman: add support to watchman to reduce refresh cost
. read-cache: add watchman 'WAMA' extension
. index-helper: add --detach
. daemonize(): set a flag before exiting the main process
. index-helper: log warnings
. index-helper: add --strict
. index-helper: new daemon for caching index and related stuff
. read-cache: allow to keep mmap'd memory after reading
. read-cache.c: fix constness of verify_hdr()
Needs review. Reported to break its own tests.
($gmane/293461).
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Apr 2016, #08; Fri, 29)
@ 2016-04-29 22:04 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-29 22:04 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the eighths batch of topics of this
cycle. On the 'maint' front, 2.8.2 is out.
There are a handful of topics that are stuck; they are marked as
"Needs review", "Needs an Ack", etc. in the following list.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* da/user-useconfigonly (2016-04-01) 2 commits
(merged to 'next' on 2016-04-22 at 26845a5)
+ ident: give "please tell me" message upon useConfigOnly error
+ ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
* jc/merge-refuse-new-root (2016-04-21) 2 commits
(merged to 'next' on 2016-04-22 at 74eb957)
+ pull: pass --allow-unrelated-histories to "git merge"
+ t3033: avoid 'ambiguous refs' warning
"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".
* jk/push-client-deadlock-fix (2016-04-20) 5 commits
(merged to 'next' on 2016-04-22 at d59a2af)
+ t5504: drop sigpipe=ok from push tests
+ fetch-pack: isolate sigpipe in demuxer thread
+ send-pack: isolate sigpipe in demuxer thread
+ run-command: teach async threads to ignore SIGPIPE
+ send-pack: close demux pipe before finishing async process
"git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
* js/replace-edit-use-editor-configuration (2016-04-20) 1 commit
(merged to 'next' on 2016-04-22 at 8df6d30)
+ replace --edit: respect core.editor
"git replace -e" did not honour "core.editor" configuration.
* js/win32-mmap (2016-04-22) 3 commits
(merged to 'next' on 2016-04-22 at cd39c60)
+ mmap(win32): avoid expensive fstat() call
+ mmap(win32): avoid copy-on-write when it is unnecessary
+ win32mmap: set errno appropriately
mmap emulation on Windows has been optimized and work better without
consuming paging store when not needed.
* nd/test-helpers (2016-04-15) 2 commits
(merged to 'next' on 2016-04-22 at 55ea5cd)
+ test helpers: move test-* to t/helper/ subdirectory
+ Makefile: clean *.o files we create
Sources to many test helper binaries (and the generated helpers)
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
* sb/mv-submodule-fix (2016-04-19) 1 commit
(merged to 'next' on 2016-04-22 at 089e788)
+ mv: allow moving nested submodules
"git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
* st/verify-tag (2016-04-22) 6 commits
(merged to 'next' on 2016-04-22 at 98ba239)
+ tag -v: verify directly rather than exec-ing verify-tag
+ verify-tag: move tag verification code to tag.c
+ verify-tag: prepare verify_tag for libification
+ verify-tag: update variable name and type
+ t7030: test verifying multiple tags
+ builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
--------------------------------------------------
[New Topics]
* ab/hooks (2016-04-26) 4 commits
- hooks: allow customizing where the hook directory is
- githooks.txt: minor improvements to the grammar & phrasing
- githooks.txt: amend dangerous advice about 'update' hook ACL
- githooks.txt: improve the intro section
A new configuration variable core.hooksPath allows customizing
where the hook directory is.
Almost there.
($gmane/292635)
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
- merge: warn --no-commit merge when no new commit is created
- merge: do not contaminate option_commit with --squash
"git merge --no-commit" silently succeeded when there is no need to
create any commit, either when you are more recent than the commit
you tried to merge, or you can fast-forward to the commit you tried
to merge. The command gives a warning message in such cases.
Just tying loose ends in a discussion. Unless somebody else
champions this topic, I'll drop it.
* jk/fix-attribute-macro-in-2.5 (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 2e42613)
+ remote.c: spell __attribute__ correctly
Code fixup.
Will merge to 'master'.
* js/http-custom-headers (2016-04-27) 1 commit
(merged to 'next' on 2016-04-27 at 0c97a50)
+ http: support sending custom HTTP headers
HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
Will merge to 'master'.
* sb/bisect (2016-04-15) 22 commits
- SQUASH???
- bisect: get back halfway shortcut
- bisect: compute best bisection in compute_relevant_weights()
- bisect: use a bottom-up traversal to find relevant weights
- bisect: prepare for different algorithms based on find_all
- bisect: rename count_distance() to compute_weight()
- bisect: make total number of commits global
- bisect: introduce distance_direction()
- bisect: extract get_distance() function from code duplication
- bisect: use commit instead of commit list as arguments when appropriate
- bisect: replace clear_distance() by unique markers
- bisect: use struct node_data array instead of int array
- bisect: get rid of recursion in count_distance()
- bisect: make algorithm behavior independent of DEBUG_BISECT
- bisect: make bisect compile if DEBUG_BISECT is set
- bisect: plug the biggest memory leak
- bisect: add test for the bisect algorithm
- t6030: generalize test to not rely on current implementation
- t: use test_cmp_rev() where appropriate
- t/test-lib-functions.sh: generalize test_cmp_rev
- bisect: allow 'bisect run' if no good commit is known
- bisect: write about `bisect next` in documentation
The internal algorithm used in "git bisect" to find the next commit
to check has been optimized greatly.
Expecting a reroll.
($gmane/291163)
* sb/config-exit-status-list (2016-04-26) 1 commit
(merged to 'next' on 2016-04-27 at 44fe343)
+ config doc: improve exit code listing
Doc update.
Will merge to 'master'.
* mh/split-under-lock (2016-04-27) 29 commits
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
- commit_ref_update(): remove the flags parameter
- lock_ref_for_update(): don't resolve symrefs
- lock_ref_for_update(): don't re-read non-symbolic references
- refs: resolve symbolic refs first
- ref_transaction_update(): check refname_is_safe() at a minimum
- unlock_ref(): move definition higher in the file
- lock_ref_for_update(): new function
- add_update(): initialize the whole ref_update
- verify_refname_available(): adjust constness in declaration
- refs: don't dereference on rename
- refs: allow log-only updates
- delete_branches(): use resolve_refdup()
- ref_transaction_commit(): correctly report close_ref() failure
- ref_transaction_create(): disallow recursive pruning
- refs: make error messages more consistent
- lock_ref_sha1_basic(): remove unneeded local variable
- read_raw_ref(): improve docstring
- read_raw_ref(): rename symref argument to referent
- read_raw_ref(): clear *type at start of function
- read_raw_ref(): rename flags argument to type
- ref_transaction_commit(): remove local variable n
- rename_ref(): remove unneeded local variable
- commit_ref_update(): write error message to *err, not stderr
- refname_is_safe(): insist that the refname already be normalized
- refname_is_safe(): don't allow the empty string
- refname_is_safe(): use skip_prefix()
- remove_dir_recursively(): add docstring
- safe_create_leading_directories(): improve docstring
Further preparatory work on the refs API before the pluggable
backend series can land.
Almost there.
($gmane/292772)
* bn/http-cookiefile-config (2016-04-29) 2 commits
- http: expand http.cookieFile as a path
- Documentation: config: improve word ordering for http.cookieFile
(this branch uses jc/config-pathname-type.)
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
Waiting for an Ack to what's queued with tweaks, or a reroll.
($gmane/292969)
* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit
- pack-objects: warn on split packs disabling bitmaps
Doc update.
Will merge to 'next'.
* jc/config-pathname-type (2016-04-29) 1 commit
- config: describe 'pathname' value type
(this branch is used by bn/http-cookiefile-config.)
Consolidate description of tilde-expansion that is done to
configuration variables that take pathname to a single place.
Will merge to 'next'.
* jk/submodule-config-sanitize-fix (2016-04-28) 5 commits
- submodule: use prepare_submodule_repo_env consistently
- submodule--helper: move config-sanitizing to submodule.c
- submodule: export sanitized GIT_CONFIG_PARAMETERS
- t5550: break submodule config test into multiple sub-tests
- t5550: fix typo in $HTTPD_URL
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly.
With a rethink of the merit of "sanitization" going on, we may end
up doing the configuration propagation very differently, though.
Will hold.
* mh/connect-leak (2016-04-28) 1 commit
- git_connect(): fix memory leak with CONNECT_DIAG_URL
Is already made obsolete with a patch in flight under discussion.
($gmane/292962)
* sb/misc-cleanups (2016-04-28) 2 commits
- submodule-config: don't shadow `cache`
- config.c: drop local variable
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* js/name-rev-use-oldest-ref (2016-04-22) 1 commit
(merged to 'next' on 2016-04-27 at 8fdc0ac)
+ name-rev: include taggerdate in considering the best name
"git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
Will merge to 'master'.
* nd/remove-unused (2016-04-22) 2 commits
(merged to 'next' on 2016-04-27 at 7917efa)
+ wrapper.c: delete dead function git_mkstemps()
+ dir.c: remove dead function fnmatch_icase()
Code cleanup.
Will merge to 'master'.
* rt/string-list-lookup-cleanup (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 53514e1)
+ string_list: use string-list API in unsorted_string_list_lookup()
Code cleanup.
Will merge to 'master'.
* sg/test-lib-simplify-expr-away (2016-04-22) 1 commit
(merged to 'next' on 2016-04-27 at 8f40952)
+ test-lib: simplify '--option=value' parsing
Code cleanup.
Will merge to 'master'.
* ew/fast-import-unpack-limit (2016-04-24) 1 commit
- fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Need to pick up the rerolled version.
($gmane/292562)
* jd/send-email-to-whom (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 47ae363)
+ send-email: fix grammo in the prompt that asks e-mail recipients
A question by "git send-email" to ask the identity of the sender
has been updated.
Will merge to 'master'.
* ld/p4-test-py3 (2016-04-26) 3 commits
(merged to 'next' on 2016-04-27 at d5d5fca)
+ git-p4 tests: time_in_seconds should use $PYTHON_PATH
+ git-p4 tests: work with python3 as well as python2
+ git-p4 tests: cd to / before running python
The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
Will merge to 'master'.
* ls/p4-lfs-test-fix-2.7.0 (2016-04-29) 2 commits
(merged to 'next' on 2016-04-29 at da56b67)
+ t9824: fix wrong reference value
(merged to 'next' on 2016-04-27 at be87c63)
+ t9824: fix broken &&-chain in a subshell
Fix a broken test.
Will merge to 'master'.
* sb/clone-shallow-passthru (2016-04-26) 1 commit
(merged to 'next' on 2016-04-27 at 3112b24)
+ clone: add `--shallow-submodules` flag
"git clone" learned "--shallow-submodules" option.
Will merge to 'master'.
* jd/p4-jobs-in-commit (2016-04-19) 2 commits
(merged to 'next' on 2016-04-27 at 654d946)
+ git-p4: add P4 jobs to git commit message
+ git-p4: clean-up code style in tests
"git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
Will merge to 'master'.
* ls/p4-lfs (2016-04-28) 3 commits
- git-p4: fix Git LFS pointer parsing
- travis-ci: express Linux/OS X dependency versions more clearly
- travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
Will merge to 'next'.
* tb/convert-eol-autocrlf (2016-04-29) 10 commits
- ce_compare_data() did not respect conversion
- t6038; use crlf on all platforms
- convert.c: more safer crlf handling with text attribute
- convert: unify the "auto" handling of CRLF
- convert.c: stream and early out
- read-cache: factor out get_sha1_from_index() helper
- convert.c: ident + core.autocrlf didn't work
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- t0027: make commit_chk_wrnNNO() reliable
The combination of text=auto & eol=crlf (or eol=lf for that matter)
is taught to be much more useful; it used to be "auto detection"
was defeated as if setting eol declares that the file _is_ text,
but now text=auto is still in effect for such a path and the code
refrains from applying eol conversion if it found the path is not
text. Also setting core.autocrlf to 'input' and core.eol to 'crlf'
used to be rejected, but because the code gives precedence to
core.autocrlf, there is no need to, hence we no longer reject the
combination.
The last step seems to be identical to what I earlier did and
discarded because the approach is fundamentally wrong, but I may be
misreading the patch.
* bc/object-id (2016-04-25) 6 commits
(merged to 'next' on 2016-04-29 at 02f13a4)
+ match-trees: convert several leaf functions to use struct object_id
+ tree-walk: convert tree_entry_extract() to use struct object_id
+ struct name_entry: use struct object_id instead of unsigned char sha1[20]
+ match-trees: convert shift_tree() and shift_tree_by() to use object_id
+ test-match-trees: convert to use struct object_id
+ sha1-name: introduce a get_oid() function
Move from unsigned char[20] to struct object_id continues.
Will merge to 'master'.
* ep/http-curl-trace (2016-04-20) 3 commits
- git.txt: document the new GIT_TRACE_CURL environment variable
- imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
- http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Still under discussion.
($gmane/292074)
* nd/worktree-various-heads (2016-04-22) 13 commits
- branch: do not rename a branch under bisect or rebase
- worktree.c: check whether branch is bisected in another worktree
- wt-status.c: split bisect detection out of wt_status_get_state()
- worktree.c: check whether branch is rebased in another worktree
- worktree.c: avoid referencing to worktrees[i] multiple times
- wt-status.c: make wt_status_check_rebase() work on any worktree
- wt-status.c: split rebase detection out of wt_status_get_state()
- path.c: refactor and add worktree_git_path()
- worktree.c: mark current worktree
- worktree.c: make find_shared_symref() return struct worktree *
- worktree.c: store "id" instead of "git_dir"
- path.c: add git_common_path() and strbuf_git_common_path()
- dir.c: rename str(n)cmp_icase to fspath(n)cmp
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Being reviewed.
($gmane/292189)
* bw/rebase-merge-entire-branch (2016-04-24) 1 commit
(merged to 'next' on 2016-04-29 at 7a9487f)
+ git-rebase--merge: don't include absent parent as a base
"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
Will merge to 'master'.
* pb/commit-verbose-config (2016-04-19) 6 commits
- commit: add a commit.verbose config variable
- t7507-commit-verbose: improve test coverage by testing number of diffs
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
- t0040-parse-options: improve test coverage
- test-parse-options: print quiet as integer
- t0040-test-parse-options.sh: fix style issues
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Need a reroll but it will be some time before that happens.
($gmane/292160).
* en/merge-fixes (2016-04-12) 2 commits
(merged to 'next' on 2016-04-27 at 14d7d10)
+ merge-recursive: do not check working copy when creating a virtual merge base
+ merge-recursive: remove duplicate code
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
Will merge to 'master'.
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* jc/ll-merge-internal (2016-04-27) 3 commits
- t6036: remove pointless test that expects failure
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
RFC.
* jk/diff-compact-heuristic (2016-04-19) 2 commits
(merged to 'next' on 2016-04-22 at 0c117ea)
+ xdiff: implement empty line chunk heuristic
+ xdiff: add recs_match helper function
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
Will merge to 'master' after removing the experimentation knob.
* sb/submodule-init (2016-04-29) 6 commits
(merged to 'next' on 2016-04-29 at 3e81ee88)
+ submodule--helper update-clone: abort gracefully on missing .gitmodules
+ submodule init: fail gracefully with a missing .gitmodules file
(merged to 'next' on 2016-04-27 at afaad81)
+ submodule: port init from shell to C
+ submodule: port resolve_relative_url from shell to C
+ Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
+ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will cook for a bit more in 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* nf/mergetool-prompt (2016-04-25) 1 commit
(merged to 'next' on 2016-04-27 at 1c992df)
+ difftool/mergetool: make the form of yes/no questions consistent
UI consistency improvements.
Will merge to 'master'.
* va/i18n-misc-updates (2016-04-19) 9 commits
- i18n: builtin/pull.c: split strings marked for translation
- i18n: builtin/pull.c: mark placeholders for translation
- i18n: git-parse-remote.sh: mark strings for translation
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Comments? They looked all sensible to me.
* jc/drop-git-spec-in (2016-04-27) 2 commits
(merged to 'next' on 2016-04-27 at 2b85030)
+ Makefile: remove dependency on git.spec
(merged to 'next' on 2016-04-22 at 531583f)
+ Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-26) 4 commits
- format-patch: introduce format.useAutoBase configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Looking close to be ready.
($gmane/292622).
* dt/index-helper (2016-04-28) 19 commits
. untracked-cache: config option
. Add tracing to measure where most of the time is spent
. index-helper: optionally automatically run
. index-helper: autorun mode
. index-helper: don't run if already running
. index-helper: kill mode
. watchman: add a config option to enable the extension
. unpack-trees: preserve index extensions
. update-index: enable/disable watchman support
. index-helper: use watchman to avoid refreshing index with lstat()
. Add watchman support to reduce index refresh cost
. read-cache: add watchman 'WAMA' extension
. index-helper: add --detach
. daemonize(): set a flag before exiting the main process
. index-helper: log warnings
. index-helper: add --strict
. index-helper: new daemon for caching index and related stuff
. read-cache: allow to keep mmap'd memory after reading
. read-cache.c: fix constness of verify_hdr()
Needs review.
t7900#5 seems to fail for me.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v2.8.2
@ 2016-04-29 22:04 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-29 22:04 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest maintenance release Git v2.8.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.8.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
----------------------------------------------------------------
Git v2.8.2 Release Notes
========================
Fixes since v2.8.1
------------------
* The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* Bunch of tests on "git clone" has been renumbered for better
organization.
* The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* "index-pack --keep=<msg>" was broken since v2.1.0 timeframe.
* "git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* A small memory leak in an error codepath has been plugged in xdiff
code.
* strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* "git mergetool" did not work well with conflicts that both sides
deleted.
* "git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* "git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* Build updates for MSVC.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
Also contains minor documentation updates and code clean-ups.
----------------------------------------------------------------
Changes since v2.8.1 are as follows:
Alexander Kuleshov (1):
submodule-config: use hashmap_iter_first()
Christian Couder (1):
Documentation: talk about pager in api-trace.txt
David Aguilar (2):
mergetool: support delete/delete conflicts
mergetool: honor tempfile configuration when resolving delete conflicts
Elia Pinto (1):
api-trace.txt: fix typo
Gabriel Souza Franco (2):
fetch-pack: fix object_id of exact sha1
fetch-pack: update the documentation for "<refs>..." arguments
Jeff King (12):
t1515: add tests for rev-parse out-of-repo helpers
rev-parse: let some options run outside repository
strbuf_getwholeline: NUL-terminate getdelim buffer on error
setup: make startup_info available everywhere
setup: set startup_info->have_repository more reliably
remote: don't resolve HEAD in non-repository
mailmap: do not resolve blobs in a non-repository
grep: turn off gitlink detection for --no-index
use setup_git_directory() in test-* programs
send-email: ignore trailing whitespace in mailrc alias file
credential-cache--daemon: clarify "exit" action semantics
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Johannes Sixt (1):
Windows: shorten code by re-using convert_slashes()
John Keeping (3):
config: fail if --get-urlmatch finds no value
Documentation/git-config: use bulleted list for exit codes
Documentation/git-config: fix --get-all description
Junio C Hamano (7):
index-pack: correct --keep[=<msg>]
index-pack: add a helper function to derive .idx/.keep filename
merge: fix NULL pointer dereference when merging nothing into void
Makefile: fix misdirected redirections
Start preparing for 2.8.2
Prepare for 2.8.2
Git 2.8.2
Matthieu Moy (2):
lockfile: mark strings for translation
lockfile: improve error message when lockfile exists
Michael Procter (1):
upload-pack: use argv_array for pack_objects
Nguyễn Thái Ngọc Duy (2):
git-apply.txt: remove a space
git-apply.txt: mention the behavior inside a subdir
Ori Avtalion (1):
Documentation: git diff --check detects conflict markers
Pranit Bauva (2):
t/t7502 : drop duplicate test
api-parse-options.txt: document OPT_CMDMODE()
Ramsay Jones (2):
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
xdiff/xprepare: fix a memory leak
SZEDER Gábor (1):
diffcore: fix iteration order of identical files during rename detection
Saurav Sachidanand (1):
dir: store EXC_FLAG_* values in unsigned integers
Stanislav Kolotinskiy (1):
git-send-pack: fix --all option when used with directory
Stefan Beller (1):
clone tests: rename t57* => t56*
Sven Strickroth (3):
commit: do not lose SQUASH_MSG contents
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
MSVC: use shipped headers instead of fallback definitions
Torsten Bögershausen (1):
correct blame for files commited with CRLF
Vasco Almeida (4):
l10n: fr: fix transcation of "dir"
l10n: fr: fix wrongly translated option name
l10n: fr: change "id de clé" to match "id-clé"
l10n: fr: don't translate "merge" as a parameter
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Apr 2016, #07; Mon, 25)
@ 2016-04-25 22:43 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-25 22:43 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the seventh batch of topics of this
cycle.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ad/commit-have-m-option (2016-04-07) 2 commits
(merged to 'next' on 2016-04-13 at 74088c2)
+ commit: do not ignore an empty message given by -m ''
+ commit: --amend -m '' silently fails to wipe message
"git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
(merged to 'next' on 2016-04-19 at 1352ede)
+ config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.
This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds. It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
($gmane/275680, $gmane/291853).
* dt/pre-refs-backend (2016-04-10) 24 commits
(merged to 'next' on 2016-04-13 at 0a8f9dd)
+ refs: on symref reflog expire, lock symref not referrent
+ refs: move resolve_ref_unsafe into common code
+ show_head_ref(): check the result of resolve_ref_namespace()
+ check_aliased_update(): check that dst_name is non-NULL
+ checkout_paths(): remove unneeded flag variable
+ cmd_merge(): remove unneeded flag variable
+ fsck_head_link(): remove unneeded flag variable
+ read_raw_ref(): change flags parameter to unsigned int
+ files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
+ read_raw_ref(): manage own scratch space
+ files-backend: break out ref reading
+ resolve_ref_1(): eliminate local variable "bad_name"
+ resolve_ref_1(): reorder code
+ resolve_ref_1(): eliminate local variable
+ resolve_ref_unsafe(): ensure flags is always set
+ resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
+ resolve_missing_loose_ref(): simplify semantics
+ t1430: improve test coverage of deletion of badly-named refs
+ t1430: test for-each-ref in the presence of badly-named refs
+ t1430: don't rely on symbolic-ref for creating broken symrefs
+ t1430: clean up broken refs/tags/shadow
+ t1430: test the output and error of some commands more carefully
+ refs: move for_each_*ref* functions into common code
+ refs: move head_ref{,_submodule} to the common code
Code restructuring around the "refs" area to prepare for pluggable
refs backends.
* en/merge-octopus-fix (2016-04-12) 2 commits
(merged to 'next' on 2016-04-13 at 600b479)
+ merge-octopus: abort if index does not match HEAD
+ t6044: new merge testcases for when index doesn't match HEAD
"merge-octopus" strategy did not ensure that the index is clean
when merge begins.
* en/merge-trivial-fix (2016-04-12) 2 commits
(merged to 'next' on 2016-04-13 at fb3ea86)
+ builtin/merge.c: fix a bug with trivial merges
+ t7605: add a testcase demonstrating a bug with trivial merges
When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.
* ew/send-email-drop-data-dumper (2016-04-06) 1 commit
(merged to 'next' on 2016-04-13 at 180266c)
+ send-email: do not load Data::Dumper
Code clean-up.
* ew/send-email-readable-message-id (2016-04-06) 1 commit
(merged to 'next' on 2016-04-13 at 422959a)
+ send-email: more meaningful Message-ID
"git send-email" now uses a more readable timestamps when
formulating a message ID.
* jc/http-socks5h (2016-04-10) 1 commit
(merged to 'next' on 2016-04-13 at eb27afc)
+ http: differentiate socks5:// and socks5h://
The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.
* jc/rerere-multi (2016-04-06) 11 commits
(merged to 'next' on 2016-04-13 at 3db2753)
+ rerere: adjust 'forget' to multi-variant world order
+ rerere: split code to call ll_merge() further
+ rerere: move code related to "forget" together
+ rerere: gc and clear
+ rerere: do use multiple variants
+ t4200: rerere a merge with two identical conflicts
+ rerere: allow multiple variants to exist
+ rerere: delay the recording of preimage
+ rerere: handle leftover rr-cache/$ID directory and postimage files
+ rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
+ rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/xstrfmt-null-with-prec-0 (2016-04-07) 1 commit
(merged to 'next' on 2016-04-13 at 2457462)
+ setup.c: do not feed NULL to "%.*s" even with precision 0
Code cleanup.
* jk/do-not-printf-NULL (2016-04-10) 3 commits
(merged to 'next' on 2016-04-13 at 60912e3)
+ git_config_set_multivar_in_file: handle "unset" errors
+ git_config_set_multivar_in_file: all non-zero returns are errors
+ config: lower-case first word of error strings
"git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
* jk/use-write-script-more (2016-04-12) 3 commits
(merged to 'next' on 2016-04-13 at d6718bf)
+ t3404: use write_script
+ t1020: do not overuse printf and use write_script
+ t5532: use write_script
Code clean-up.
* ky/imap-send (2016-04-13) 2 commits
(merged to 'next' on 2016-04-13 at 52cf493)
+ imap-send: fix CRAM-MD5 response calculation
+ imap-send: check for NOLOGIN capability only when using LOGIN command
Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
* ky/imap-send-openssl-1.1.0 (2016-04-08) 4 commits
(merged to 'next' on 2016-04-13 at 49d2643)
+ configure: remove checking for HMAC_CTX_cleanup
+ imap-send: avoid deprecated TLSv1_method()
+ imap-send: check NULL return of SSL_CTX_new()
+ imap-send: use HMAC() function provided by OpenSSL
Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.
* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
(merged to 'next' on 2016-04-13 at c6584bb)
+ submodule--helper, module_clone: catch fprintf failure
+ submodule--helper: do not borrow absolute_path() result for too long
+ submodule--helper, module_clone: always operate on absolute paths
+ submodule--helper clone: create the submodule path just once
+ submodule--helper: fix potential NULL-dereference
+ recursive submodules: test for relative paths
(this branch is used by sb/submodule-init.)
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
(merged to 'next' on 2016-04-18 at 9daa5ce)
+ t7407: make expectation as clear as possible
+ submodule update: test recursive path reporting from subdirectory
+ submodule update: align reporting path for custom command execution
+ submodule status: correct path handling in recursive submodules
+ submodule update --init: correct path handling in recursive submodules
+ submodule foreach: correct path display in recursive submodules
(this branch is used by sb/submodule-init.)
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
--------------------------------------------------
[New Topics]
* js/name-rev-use-oldest-ref (2016-04-22) 1 commit
- name-rev: include taggerdate in considering the best name
"git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag. It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge. The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."
Will merge to 'next'.
* js/win32-mmap (2016-04-22) 3 commits
(merged to 'next' on 2016-04-22 at cd39c60)
+ mmap(win32): avoid expensive fstat() call
+ mmap(win32): avoid copy-on-write when it is unnecessary
+ win32mmap: set errno appropriately
mmap emulation on Windows has been optimized.
Will merge to 'master'.
* nd/remove-unused (2016-04-22) 2 commits
- wrapper.c: delete dead function git_mkstemps()
- dir.c: remove dead function fnmatch_icase()
Code cleanup.
Will merge to 'next'.
* rt/string-list-lookup-cleanup (2016-04-25) 1 commit
- string_list: use string-list API in unsorted_string_list_lookup()
Code cleanup.
Will merge to 'next'.
* sg/test-lib-simplify-expr-away (2016-04-22) 1 commit
- test-lib: simplify '--option=value' parsing
Code cleanup.
Will merge to 'next'.
* ew/fast-import-unpack-limit (2016-04-24) 1 commit
- fast-import: implement unpack limit
"git fast-import" learned the same performance trick to avoid
creating too small a packfile as "git fetch" and "git push" have,
using *.unpackLimit configuration.
Need to pick up the rerolled version.
($gmane/292562)
* jd/send-email-to-whom (2016-04-25) 1 commit
- send-email: fix grammo in the prompt that asks e-mail recipients
A question by "git send-email" to ask the identity of the sender
has been updated.
Will merge to 'next'.
* ld/p4-test-py3 (2016-04-25) 2 commits
- git-p4 tests: work with python3 as well as python2
- git-p4 tests: cd to testdir before running python
The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* ls/p4-lfs-test-fix-2.7.0 (2016-04-24) 1 commit
- t9824: fix broken &&-chain in a subshell
Fix a broken test.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will be rerolled.
($gmane/292205)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* sb/clone-shallow-passthru (2016-04-25) 1 commit
- clone: add `--shallow-submodules` flag
"git clone" learned "--shallow-submodules" option.
Modulo minor nits, looked ready.
($gmane/292539)
* da/user-useconfigonly (2016-04-01) 2 commits
(merged to 'next' on 2016-04-22 at 26845a5)
+ ident: give "please tell me" message upon useConfigOnly error
+ ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
Will merge to 'master'.
* jd/p4-jobs-in-commit (2016-04-19) 2 commits
- git-p4: add P4 jobs to git commit message
- git-p4: clean-up code style in tests
"git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
Will merge to 'next'.
* js/replace-edit-use-editor-configuration (2016-04-20) 1 commit
(merged to 'next' on 2016-04-22 at 8df6d30)
+ replace --edit: respect core.editor
"git replace -e" did not honour "core.editor" configuration.
Will merge to 'master'.
* ls/p4-lfs (2016-04-19) 2 commits
- git-p4: fix Git LFS pointer parsing
- travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* sb/mv-submodule-fix (2016-04-19) 1 commit
(merged to 'next' on 2016-04-22 at 089e788)
+ mv: allow moving nested submodules
"git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
Will merge to 'master'.
* tb/convert-eol-autocrlf (2016-04-25) 10 commits
- ce_compare_data() did not respect conversion
- t6038; use crlf on all platforms
- convert.c: more safer crlf handling with text attribute
- convert: unify the "auto" handling of CRLF
- convert.c: stream and early out
- read-cache: factor out get_sha1_from_index() helper
- convert.c: ident + core.autocrlf didn't work
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- t0027: make commit_chk_wrnNNO() reliable
The combination of text=auto & eol=crlf (or eol=lf for that matter)
is taught to be much more useful; it used to be "auto detection"
was defeated as if setting eol declares that the file _is_ text,
but now text=auto is still in effect for such a path and the code
refrains from applying eol conversion if it found the path is not
text. Also setting core.autocrlf to 'input' and core.eol to 'crlf'
used to be rejected, but because the code gives precedence to
core.autcrlf, there is no need to, hence we no longer reject the
combination.
Modulo minor nits, looked almost ready.
($gmane/292521, $gmane/292550)
* bc/object-id (2016-04-25) 6 commits
- match-trees: convert several leaf functions to use struct object_id
- tree-walk: convert tree_entry_extract() to use struct object_id
- struct name_entry: use struct object_id instead of unsigned char sha1[20]
- match-trees: convert shift_tree() and shift_tree_by() to use object_id
- test-match-trees: convert to use struct object_id
- sha1-name: introduce a get_oid() function
Move from unsigned char[20] to struct object_id continues.
Will merge to 'next'.
* ep/http-curl-trace (2016-04-20) 3 commits
- git.txt: document the new GIT_TRACE_CURL environment variable
- imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
- http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Still under discussion.
($gmane/292074)
* nd/worktree-various-heads (2016-04-22) 13 commits
- branch: do not rename a branch under bisect or rebase
- worktree.c: check whether branch is bisected in another worktree
- wt-status.c: split bisect detection out of wt_status_get_state()
- worktree.c: check whether branch is rebased in another worktree
- worktree.c: avoid referencing to worktrees[i] multiple times
- wt-status.c: make wt_status_check_rebase() work on any worktree
- wt-status.c: split rebase detection out of wt_status_get_state()
- path.c: refactor and add worktree_git_path()
- worktree.c: mark current worktree
- worktree.c: make find_shared_symref() return struct worktree *
- worktree.c: store "id" instead of "git_dir"
- path.c: add git_common_path() and strbuf_git_common_path()
- dir.c: rename str(n)cmp_icase to fspath(n)cmp
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Being reviewed.
($gmane/292189)
* bw/rebase-merge-entire-branch (2016-04-24) 1 commit
- git-rebase--merge: don't include absent parent as a base
"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
Will merge to 'next'.
* jk/push-client-deadlock-fix (2016-04-20) 5 commits
(merged to 'next' on 2016-04-22 at d59a2af)
+ t5504: drop sigpipe=ok from push tests
+ fetch-pack: isolate sigpipe in demuxer thread
+ send-pack: isolate sigpipe in demuxer thread
+ run-command: teach async threads to ignore SIGPIPE
+ send-pack: close demux pipe before finishing async process
"git push" from a corrupt repository that attempts to push a large
number of refs deadlocked; the thread to relay rejection notices
for these ref updates blocked on writing them to the main thread,
after the main thread at the receiving end notices that the push
failed and decides not to read these notices and return a failure.
Will merge to 'master'.
* jc/merge-refuse-new-root (2016-04-21) 2 commits
(merged to 'next' on 2016-04-22 at 74eb957)
+ pull: pass --allow-unrelated-histories to "git merge"
+ t3033: avoid 'ambiguous refs' warning
"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".
Will merge to 'master'.
* pb/commit-verbose-config (2016-04-19) 6 commits
- commit: add a commit.verbose config variable
- t7507-commit-verbose: improve test coverage by testing number of diffs
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
- t0040-parse-options: improve test coverage
- test-parse-options: print quiet as integer
- t0040-test-parse-options.sh: fix style issues
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Need a reroll but it will be some time before that happens.
($gmane/292160).
* en/merge-fixes (2016-04-12) 2 commits
- merge-recursive: do not check working copy when creating a virtual merge base
- merge-recursive: remove duplicate code
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
Will merge to 'next'.
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* jc/ll-merge-internal (2016-04-14) 2 commits
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
RFC.
* jk/diff-compact-heuristic (2016-04-19) 2 commits
(merged to 'next' on 2016-04-22 at 0c117ea)
+ xdiff: implement empty line chunk heuristic
+ xdiff: add recs_match helper function
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
Will merge to 'master'.
* nd/test-helpers (2016-04-15) 2 commits
(merged to 'next' on 2016-04-22 at 55ea5cd)
+ test helpers: move test-* to t/helper/ subdirectory
+ Makefile: clean *.o files we create
Sources to many test helper binaries (and the generated helpers)
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
Will merge to 'master'.
* sb/submodule-init (2016-04-16) 4 commits
- submodule: port init from shell to C
- submodule: port resolve_relative_url from shell to C
- Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
- Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
Update of "git submodule" to move pieces of logic to C continues.
Will merge to 'next'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* nf/mergetool-prompt (2016-04-25) 1 commit
- difftool/mergetool: make the form of yes/no questions consistent
UI consistency improvements.
Will merge to 'next'.
* va/i18n-misc-updates (2016-04-19) 9 commits
- i18n: builtin/pull.c: split strings marked for translation
- i18n: builtin/pull.c: mark placeholders for translation
- i18n: git-parse-remote.sh: mark strings for translation
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Comments? They looked all sensible to me.
* jc/drop-git-spec-in (2016-04-06) 1 commit
(merged to 'next' on 2016-04-22 at 531583f)
+ Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
Will merge to 'master'.
* st/verify-tag (2016-04-22) 6 commits
(merged to 'next' on 2016-04-22 at 98ba239)
+ tag -v: verify directly rather than exec-ing verify-tag
+ verify-tag: move tag verification code to tag.c
+ verify-tag: prepare verify_tag for libification
+ verify-tag: update variable name and type
+ t7030: test verifying multiple tags
+ builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-25) 17 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- branch, tag: use porcelain output
- ref-filter: allow porcelain to translate messages in the output
- ref-filter: add `:dir` and `:base` options for ref printing atoms
- ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- ref-filter: introduce symref_atom_parser() and refname_atom_parser()
- ref-filter: introduce refname_atom_parser_internal()
- ref-filter: make "%(symref)" atom work with the ':short' modifier
- ref-filter: add support for %(upstream:track,nobracket)
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: move get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: include reference to 'used_atom' within 'atom_value'
- ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Needs review.
* xy/format-patch-base (2016-04-22) 4 commits
. format-patch: introduce format.useAutoBase configuration
. format-patch: introduce --base=auto option
. format-patch: add '--base' option to record base tree info
. patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Review comments sent.
($gmane/292168)
* dt/index-helper (2016-04-14) 16 commits
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- index-helper: add watchman support to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Apr 2016, #06; Thu, 21)
@ 2016-04-21 22:20 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-21 22:20 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the fifth batch of topics of this cycle.
There are a handful of topics that are stuck; they are marked as
"Needs review", "Needs an Ack", etc. in the following list.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* jd/p4-jobs-in-commit (2016-04-19) 2 commits
- git-p4: add P4 jobs to git commit message
- git-p4: clean-up code style in tests
"git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.
Will merge to 'next'.
* js/replace-edit-use-editor-configuration (2016-04-20) 1 commit
- replace --edit: respect core.editor
"git replace -e" did not honour "core.editor" configuration.
Will merge to 'next'.
* ls/p4-lfs (2016-04-19) 2 commits
- git-p4: fix Git LFS pointer parsing
- travis-ci: update Git-LFS and P4 to the latest version
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* sb/mv-submodule-fix (2016-04-19) 1 commit
- mv: allow moving nested submodules
"git mv old new" did not adjust the path for a submodule that lives
as a subdirectory inside old/ directory correctly.
Will merge to 'next'.
* tb/convert-eol-autocrlf (2016-04-19) 4 commits
- convert.c: ident + core.autocrlf didn't work
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- t0027: avoid false "unchanged" due to lstat() matching after a change
Setting core.autocrlf to 'input' and core.eol to 'crlf' used to be
rejected, but because the code gives precedence to core.autcrlf,
there is no need to, hence we no longer reject the combination.
Will merge to 'next'.
* bc/object-id (2016-04-19) 6 commits
- match-trees: convert several leaf functions to use struct object_id
- tree-walk: convert tree_entry_extract() to use struct object_id
- struct name_entry: use struct object_id instead of unsigned char sha1[20]
- match-trees: convert shift_tree() and shift_tree_by() to use object_id
- test-match-trees: convert to use struct object_id
- sha1-name: introduce a get_oid() function
Will be rerolled.
($gmane/291950)
* ep/http-curl-trace (2016-04-20) 3 commits
- git.txt: document the new GIT_TRACE_CURL environment variable
- imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
- http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
Still under discussion.
($gmane/292074)
* nd/worktree-various-heads (2016-04-20) 13 commits
- branch: do not rename a branch under bisect or rebase
- worktree.c: test if branch being bisected in another worktree
- wt-status.c: split bisect detection out of wt_status_get_state()
- worktree.c: test if branch being rebased in another worktree
- worktree.c: avoid referencing to worktrees[i] multiple times
- wt-status.c: make wt_status_check_rebase() work on any worktree
- SQUASH???
- wt-status.c: split rebase detection out of wt_status_get_state()
- path.c: refactor and add worktree_git_path()
- worktree.c: mark current worktree
- worktree.c: make find_shared_symref() return struct worktree *
- worktree.c: store "id" instead of "git_dir"
- path.c: add git_common_path() and strbuf_git_common_path()
The experimental "multiple worktree" feature gains more safety to
forbid operations on a branch that is checked out or being actively
worked on elsewhere, by noticing that e.g. it is being rebased.
Being reviewed.
($gmane/292050)
* bw/rebase-merge-entire-branch (2016-04-20) 1 commit
- git-rebase--merge: don't include absent parent as a base
"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
Will merge to 'next'.
* jk/push-client-deadlock-fix (2016-04-20) 5 commits
- t5504: drop sigpipe=ok from push tests
- fetch-pack: isolate sigpipe in demuxer thread
- send-pack: isolate sigpipe in demuxer thread
- run-command: teach async threads to ignore SIGPIPE
- send-pack: close demux pipe before finishing async process
"git push" from a corrupt repository that attempts to push a large
number of refs deadlocked waiting for a rejection from the
receiving end that will never come.
Will merge to 'next'.
* jc/merge-refuse-new-root (2016-04-21) 2 commits
- pull: pass --allow-unrelated-histories to "git merge"
- t3033: avoid 'ambiguous refs' warning
"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will be rerolled?
($gmane/290724)
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sb/clone-shallow-passthru (2016-04-13) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- clone: add `--shallow-submodules` flag
- submodule clone: pass along `local` option
"git clone" learned "--shallow-submodules" option.
Needs review.
* da/user-useconfigonly (2016-04-01) 2 commits
- ident: give "please tell me" message upon useConfigOnly error
- ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
Waiting for Acks.
($gmane/290340)
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* pb/commit-verbose-config (2016-04-19) 6 commits
- commit: add a commit.verbose config variable
- t7507-commit-verbose: improve test coverage by testing number of diffs
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
- t0040-parse-options: improve test coverage
- test-parse-options: print quiet as integer
- t0040-test-parse-options.sh: fix style issues
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Is this going to be rerolled?
($gmane/291382)
* en/merge-fixes (2016-04-12) 2 commits
- merge-recursive: do not check working copy when creating a virtual merge base
- merge-recursive: remove duplicate code
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
Will merge to 'next'.
* en/merge-octopus-fix (2016-04-12) 2 commits
(merged to 'next' on 2016-04-13 at 600b479)
+ merge-octopus: abort if index does not match HEAD
+ t6044: new merge testcases for when index doesn't match HEAD
"merge-octopus" strategy did not ensure that the index is clean
when merge begins.
Will merge to 'master'.
* en/merge-trivial-fix (2016-04-12) 2 commits
(merged to 'next' on 2016-04-13 at fb3ea86)
+ builtin/merge.c: fix a bug with trivial merges
+ t7605: add a testcase demonstrating a bug with trivial merges
When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.
Will merge to 'master'.
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* jc/ll-merge-internal (2016-04-14) 2 commits
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
RFC.
* jk/diff-compact-heuristic (2016-04-19) 2 commits
- xdiff: implement empty line chunk heuristic
- xdiff: add recs_match helper function
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
Will merge to 'next'.
* nd/test-helpers (2016-04-15) 2 commits
- test helpers: move test-* to t/helper/ subdirectory
- Makefile: clean *.o files we create
Sources to many test helper binaries (and the generated helpers)
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
Will merge to 'next'.
* sb/submodule-init (2016-04-16) 4 commits
- submodule: port init from shell to C
- submodule: port resolve_relative_url from shell to C
- Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
- Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
(this branch uses sb/submodule-helper-clone-regression-fix and sb/submodule-path-misc-bugs.)
Update of "git submodule" to move pieces of logic to C continues.
Will merge to 'next'.
* ad/commit-have-m-option (2016-04-07) 2 commits
(merged to 'next' on 2016-04-13 at 74088c2)
+ commit: do not ignore an empty message given by -m ''
+ commit: --amend -m '' silently fails to wipe message
"git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
Will merge to 'master'.
* jc/xstrfmt-null-with-prec-0 (2016-04-07) 1 commit
(merged to 'next' on 2016-04-13 at 2457462)
+ setup.c: do not feed NULL to "%.*s" even with precision 0
Will merge to 'master'.
* dt/pre-refs-backend (2016-04-10) 24 commits
(merged to 'next' on 2016-04-13 at 0a8f9dd)
+ refs: on symref reflog expire, lock symref not referrent
+ refs: move resolve_ref_unsafe into common code
+ show_head_ref(): check the result of resolve_ref_namespace()
+ check_aliased_update(): check that dst_name is non-NULL
+ checkout_paths(): remove unneeded flag variable
+ cmd_merge(): remove unneeded flag variable
+ fsck_head_link(): remove unneeded flag variable
+ read_raw_ref(): change flags parameter to unsigned int
+ files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
+ read_raw_ref(): manage own scratch space
+ files-backend: break out ref reading
+ resolve_ref_1(): eliminate local variable "bad_name"
+ resolve_ref_1(): reorder code
+ resolve_ref_1(): eliminate local variable
+ resolve_ref_unsafe(): ensure flags is always set
+ resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
+ resolve_missing_loose_ref(): simplify semantics
+ t1430: improve test coverage of deletion of badly-named refs
+ t1430: test for-each-ref in the presence of badly-named refs
+ t1430: don't rely on symbolic-ref for creating broken symrefs
+ t1430: clean up broken refs/tags/shadow
+ t1430: test the output and error of some commands more carefully
+ refs: move for_each_*ref* functions into common code
+ refs: move head_ref{,_submodule} to the common code
Code restructuring around the "refs" area to prepare for pluggable
refs backends.
Will merge to 'master'.
* ky/imap-send (2016-04-13) 2 commits
(merged to 'next' on 2016-04-13 at 52cf493)
+ imap-send: fix CRAM-MD5 response calculation
+ imap-send: check for NOLOGIN capability only when using LOGIN command
Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
Will merge to 'master'.
* ky/imap-send-openssl-1.1.0 (2016-04-08) 4 commits
(merged to 'next' on 2016-04-13 at 49d2643)
+ configure: remove checking for HMAC_CTX_cleanup
+ imap-send: avoid deprecated TLSv1_method()
+ imap-send: check NULL return of SSL_CTX_new()
+ imap-send: use HMAC() function provided by OpenSSL
Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.
Will merge to 'master'.
* jc/http-socks5h (2016-04-10) 1 commit
(merged to 'next' on 2016-04-13 at eb27afc)
+ http: differentiate socks5:// and socks5h://
The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.
Will merge to 'master'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* jk/do-not-printf-NULL (2016-04-10) 3 commits
(merged to 'next' on 2016-04-13 at 60912e3)
+ git_config_set_multivar_in_file: handle "unset" errors
+ git_config_set_multivar_in_file: all non-zero returns are errors
+ config: lower-case first word of error strings
"git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
Will merge to 'master'.
* jk/use-write-script-more (2016-04-12) 3 commits
(merged to 'next' on 2016-04-13 at d6718bf)
+ t3404: use write_script
+ t1020: do not overuse printf and use write_script
+ t5532: use write_script
Code clean-up.
Will merge to 'master'.
* nf/mergetool-prompt (2016-04-12) 2 commits
- SQUASH???
- difftool/mergetool: make the form of yes/no questions consistent
UI consistency improvements.
* va/i18n-misc-updates (2016-04-19) 9 commits
- i18n: builtin/pull.c: split strings marked for translation
- i18n: builtin/pull.c: mark placeholders for translation
- i18n: git-parse-remote.sh: mark strings for translation
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
Comments? They looked all sensible to me.
* jc/drop-git-spec-in (2016-04-06) 1 commit
- Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
Will merge to 'next'.
* ew/send-email-readable-message-id (2016-04-06) 1 commit
(merged to 'next' on 2016-04-13 at 422959a)
+ send-email: more meaningful Message-ID
"git send-email" now uses a more readable timestamps when
formulating a message ID.
Will merge to 'master'.
* st/verify-tag (2016-04-19) 6 commits
- tag -v: verfy directly rather than exec-ing verify-tag
- verify-tag: move tag verification code to tag.c
- verify-tag: prepare verify_tag for libification
- verify-tag: update variable name and type
- t7030: test verifying multiple tags
- builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
Unify internal logic between "git tag -v" and "git verify-tag"
commands by making one directly call into the other.
Will merge to 'next'.
* ew/send-email-drop-data-dumper (2016-04-06) 1 commit
(merged to 'next' on 2016-04-13 at 180266c)
+ send-email: do not load Data::Dumper
Code clean-up.
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-12) 16 commits
. branch: implement '--format' option
. branch: use ref-filter printing APIs
. branch, tag: use porcelain output
. ref-filter: allow porcelain to translate messages in the output
. ref-filter: add support for %(refname:dir) and %(refname:base)
. ref-filter: introduce refname_atom_parser()
. ref-filter: introduce symref_atom_parser()
. ref-filter: make "%(symref)" atom work with the ':short' modifier
. ref-filter: add support for %(upstream:track,nobracket)
. ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
. ref-filter: introduce format_ref_array_item()
. ref-filter: move get_head_description() from branch.c
. ref-filter: modify "%(objectname:short)" to take length
. ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
. ref-filter: include reference to 'used_atom' within 'atom_value'
. ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled but seems to lack jk/branch-shortening-funny-symrefs aka
$gmane/291295 yet.
* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
(merged to 'next' on 2016-04-13 at c6584bb)
+ submodule--helper, module_clone: catch fprintf failure
+ submodule--helper: do not borrow absolute_path() result for too long
+ submodule--helper, module_clone: always operate on absolute paths
+ submodule--helper clone: create the submodule path just once
+ submodule--helper: fix potential NULL-dereference
+ recursive submodules: test for relative paths
(this branch is used by sb/submodule-init.)
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
Will merge to 'master'.
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
(merged to 'next' on 2016-04-18 at 9daa5ce)
+ t7407: make expectation as clear as possible
+ submodule update: test recursive path reporting from subdirectory
+ submodule update: align reporting path for custom command execution
+ submodule status: correct path handling in recursive submodules
+ submodule update --init: correct path handling in recursive submodules
+ submodule foreach: correct path display in recursive submodules
(this branch is used by sb/submodule-init.)
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
Will merge to 'master'.
* xy/format-patch-base (2016-04-12) 4 commits
- format-patch: introduce format.base configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Review comments sent.
($gmane/291198)
* dt/index-helper (2016-04-14) 16 commits
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- index-helper: add watchman support to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
(merged to 'next' on 2016-04-19 at 1352ede)
+ config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.
This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds. It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
Will merge to 'master'.
($gmane/275680, $gmane/291853).
* jc/rerere-multi (2016-04-06) 11 commits
(merged to 'next' on 2016-04-13 at 3db2753)
+ rerere: adjust 'forget' to multi-variant world order
+ rerere: split code to call ll_merge() further
+ rerere: move code related to "forget" together
+ rerere: gc and clear
+ rerere: do use multiple variants
+ t4200: rerere a merge with two identical conflicts
+ rerere: allow multiple variants to exist
+ rerere: delay the recording of preimage
+ rerere: handle leftover rr-cache/$ID directory and postimage files
+ rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
+ rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
Will merge to 'master'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Apr 2016, #05; Mon, 18)
@ 2016-04-18 22:48 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-18 22:48 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the fifth batch of topics of this cycle.
There are a handful of topics that are stuck; they are marked as
"Needs review", "Needs an Ack", etc. in the following list.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
(merged to 'next' on 2016-04-06 at 2aab890)
+ submodule-config: use hashmap_iter_first()
Minor code cleanup.
* cc/apply (2016-04-01) 4 commits
(merged to 'next' on 2016-04-06 at 2e23c44)
+ builtin/apply: free patch when parse_chunk() fails
+ builtin/apply: handle parse_binary() failure
+ apply: remove unused call to free() in gitdiff_{old,new}name()
+ builtin/apply: get rid of useless 'name' variable
Minor code clean-up.
* ep/trace-doc-sample-fix (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at 0df7357)
+ api-trace.txt: fix typo
Fix a typo in an example in the trace API documentation.
* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
(merged to 'next' on 2016-04-06 at 25d79bb)
+ git-format-patch.txt: don't show -s as shorthand for multiple options
"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
* jc/makefile-redirection-stderr (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at e3f2ded)
+ Makefile: fix misdirected redirections
A minor fix in the Makefile.
* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit
(merged to 'next' on 2016-04-06 at 1a3f8be)
+ branch: fix shortening of non-remote symrefs
A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
Will merge down to maint-2.7.
* jk/check-repository-format (2016-03-11) 10 commits
(merged to 'next' on 2016-04-06 at a0dada0)
+ verify_repository_format: mark messages for translation
+ setup: drop repository_format_version global
+ setup: unify repository version callbacks
+ init: use setup.c's repo version verification
+ setup: refactor repo format reading and verification
+ config: drop git_config_early
+ check_repository_format_gently: stop using git_config_early
+ lazily load core.sharedrepository
+ wrap shared_repository global in get/set accessors
+ setup: document check_repository_format()
(this branch is used by dt/pre-refs-backend.)
The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* jn/mergetools-examdiff (2016-04-04) 2 commits
(merged to 'next' on 2016-04-06 at 819e858)
+ mergetools: add support for ExamDiff
+ mergetools: create mergetool_find_win32_cmd() helper function for winmerge
"git mergetools" learned to drive ExamDiff.
* js/mingw-tests-2.8 (2016-04-04) 1 commit
(merged to 'next' on 2016-04-06 at f85a013)
+ Windows: shorten code by re-using convert_slashes()
Code clean-up.
* kn/for-each-tag-branch (2016-03-30) 1 commit
(merged to 'next' on 2016-04-06 at 4595ad3)
+ for-each-ref: fix description of '--contains' in manpage
A minor documentation update.
* ky/branch-d-worktree (2016-03-29) 1 commit
(merged to 'next' on 2016-04-06 at 00f9bff)
+ branch -d: refuse deleting a branch which is currently checked out
When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree
* ky/branch-m-worktree (2016-04-08) 3 commits
(merged to 'next' on 2016-04-08 at b673b5e)
+ set_worktree_head_symref(): fix error message
(merged to 'next' on 2016-04-06 at e7b285c)
+ branch -m: update all per-worktree HEADs
+ refs: add a new function set_worktree_head_symref
When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
* lt/pretty-expand-tabs (2016-04-04) 4 commits
(merged to 'next' on 2016-04-06 at 186ac2a)
+ pretty: test --expand-tabs
+ pretty: allow tweaking tabwidth in --expand-tabs
+ pretty: enable --expand-tabs by default for selected pretty formats
+ pretty: expand tabs in indented logs to make things line up properly
When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
'--no-expand-tabs'.
* mg/complete-cherry-mark-to-log (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at 3002be6)
+ completion: complete --cherry-mark for git log
The completion scripts (in contrib/) did not include the
"--cherry-mark" option when completing "git log <HT>".
* mj/pull-rebase-autostash (2016-04-04) 9 commits
(merged to 'next' on 2016-04-06 at b4e4f31)
+ t5520: test --[no-]autostash with pull.rebase=true
+ t5520: reduce commom lines of code
+ t5520: factor out common "failing autostash" code
+ t5520: factor out common "successful autostash" code
+ t5520: use better test to check stderr output
+ t5520: ensure consistent test conditions
+ t5520: use consistent capitalization in test titles
+ pull --rebase: add --[no-]autostash flag
+ git-pull.c: introduce git_pull_config()
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
* rt/completion-help (2016-03-24) 2 commits
(merged to 'next' on 2016-04-06 at 8c3ee08)
+ completion: add 'revisions' and 'everyday' to 'git help'
+ completion: add option '--guides' to 'git help'
Shell completion (in contrib/) updates.
* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit
(merged to 'next' on 2016-04-06 at 7a766b7)
+ rebase-i: print an abbreviated hash when stop for editing
The commit object name reported when "rebase -i" stops has been
shortened.
* rz/worktree-no-checkout (2016-03-29) 1 commit
(merged to 'next' on 2016-04-06 at e725216)
+ worktree: add: introduce --checkout option
"git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
* sb/misc-cleanups (2016-04-01) 4 commits
(merged to 'next' on 2016-04-06 at 4e63691)
+ credential-cache, send_request: close fd when done
+ bundle: don't leak an fd in case of early return
+ abbrev_sha1_in_line: don't leak memory
+ notes: don't leak memory in git_config_get_notes_strategy
Assorted minor clean-ups.
* sg/diff-multiple-identical-renames (2016-03-30) 1 commit
(merged to 'next' on 2016-04-06 at ac19e48)
+ diffcore: fix iteration order of identical files during rename detection
"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* sk/send-pack-all-fix (2016-03-31) 1 commit
(merged to 'next' on 2016-04-06 at 31e1e1b)
+ git-send-pack: fix --all option when used with directory
"git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at 263bba8)
+ correct blame for files commited with CRLF
When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
--------------------------------------------------
[New Topics]
* en/merge-fixes (2016-04-12) 2 commits
- merge-recursive: do not check working copy when creating a virtual merge base
- merge-recursive: remove duplicate code
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
Will merge to 'next'.
* en/merge-octopus-fix (2016-04-12) 2 commits
(merged to 'next' on 2016-04-13 at 600b479)
+ merge-octopus: abort if index does not match HEAD
+ t6044: new merge testcases for when index doesn't match HEAD
"merge-octopus" strategy did not ensure that the index is clean
when merge begins.
Will merge to 'master'.
* en/merge-trivial-fix (2016-04-12) 2 commits
(merged to 'next' on 2016-04-13 at fb3ea86)
+ builtin/merge.c: fix a bug with trivial merges
+ t7605: add a testcase demonstrating a bug with trivial merges
When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.
Will merge to 'master'.
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
- fsck: detect and warn a commit with embedded NUL
- fsck_commit_buffer(): do not special case the last validation
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* jc/ll-merge-internal (2016-04-14) 2 commits
- ll-merge: use a longer conflict marker for internal merge
- ll-merge: fix typo in comment
RFC.
* jk/diff-compact-heuristic (2016-04-18) 2 commits
- xdiff: implement empty line chunk heuristic
- xdiff: add recs_match helper function
* nd/test-helpers (2016-04-15) 2 commits
- test helpers: move test-* to t/helper/ subdirectory
- Makefile: clean *.o files we create
Sources to many test helper binaries (and the generated helpers)
have been moved to t/helper/ subdirectory to reduce clutter at the
top level of the tree.
--------------------------------------------------
[Stalled]
* tb/safe-crlf-output-fix (2016-04-01) 7 commits
. convert.c: more safer crlf handling with text attribute
. correct blame for files commited with CRLF
. convert: unify the "auto" handling of CRLF
. t0027: test cases for combined attributes
. convert: allow core.autocrlf=input and core.eol=crlf
. convert.c: stream and early out
. read-cache: factor out get_sha1_from_index() helper
The "safe CRLF" facility disables line-end conversion from CRLF to
LF when checking in if the blob registered to the index already
contains CR, but some codepaths like "git blame" did not know this,
and instead assumed that only the configuration and attribute
settings determined how the data from the working tree is converted.
Will be rerolled.
($gmane/290637)
* da/user-useconfigonly (2016-04-01) 2 commits
- ident: give "please tell me" message upon useConfigOnly error
- ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
Waiting for Acks.
($gmane/290340)
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* sb/submodule-init (2016-04-16) 4 commits
- submodule: port init from shell to C
- submodule: port resolve_relative_url from shell to C
- Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
- Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init
(this branch uses sb/submodule-helper-clone-regression-fix and sb/submodule-path-misc-bugs.)
Update of "git submodule" to move pieces of logic to C continues.
* nd/shallow-deepen (2016-04-13) 26 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack.c: mark strings for translating
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sb/clone-shallow-passthru (2016-04-13) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- clone: add `--shallow-submodules` flag
- submodule clone: pass along `local` option
"git clone" learned "--shallow-submodules" option.
Needs review.
* ad/commit-have-m-option (2016-04-07) 2 commits
(merged to 'next' on 2016-04-13 at 74088c2)
+ commit: do not ignore an empty message given by -m ''
+ commit: --amend -m '' silently fails to wipe message
"git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.
Will merge to 'master'.
* jc/xstrfmt-null-with-prec-0 (2016-04-07) 1 commit
(merged to 'next' on 2016-04-13 at 2457462)
+ setup.c: do not feed NULL to "%.*s" even with precision 0
Will merge to 'master'.
* dt/pre-refs-backend (2016-04-10) 24 commits
(merged to 'next' on 2016-04-13 at 0a8f9dd)
+ refs: on symref reflog expire, lock symref not referrent
+ refs: move resolve_ref_unsafe into common code
+ show_head_ref(): check the result of resolve_ref_namespace()
+ check_aliased_update(): check that dst_name is non-NULL
+ checkout_paths(): remove unneeded flag variable
+ cmd_merge(): remove unneeded flag variable
+ fsck_head_link(): remove unneeded flag variable
+ read_raw_ref(): change flags parameter to unsigned int
+ files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
+ read_raw_ref(): manage own scratch space
+ files-backend: break out ref reading
+ resolve_ref_1(): eliminate local variable "bad_name"
+ resolve_ref_1(): reorder code
+ resolve_ref_1(): eliminate local variable
+ resolve_ref_unsafe(): ensure flags is always set
+ resolve_ref_unsafe(): use for loop to count up to MAXDEPTH
+ resolve_missing_loose_ref(): simplify semantics
+ t1430: improve test coverage of deletion of badly-named refs
+ t1430: test for-each-ref in the presence of badly-named refs
+ t1430: don't rely on symbolic-ref for creating broken symrefs
+ t1430: clean up broken refs/tags/shadow
+ t1430: test the output and error of some commands more carefully
+ refs: move for_each_*ref* functions into common code
+ refs: move head_ref{,_submodule} to the common code
Code restructuring around the "refs" area to prepare for pluggable
refs backends.
Will merge to 'master'.
* ky/imap-send (2016-04-13) 2 commits
(merged to 'next' on 2016-04-13 at 52cf493)
+ imap-send: fix CRAM-MD5 response calculation
+ imap-send: check for NOLOGIN capability only when using LOGIN command
Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.
Will merge to 'master'.
* ky/imap-send-openssl-1.1.0 (2016-04-08) 4 commits
(merged to 'next' on 2016-04-13 at 49d2643)
+ configure: remove checking for HMAC_CTX_cleanup
+ imap-send: avoid deprecated TLSv1_method()
+ imap-send: check NULL return of SSL_CTX_new()
+ imap-send: use HMAC() function provided by OpenSSL
Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.
Will merge to 'master'.
* jc/http-socks5h (2016-04-10) 1 commit
(merged to 'next' on 2016-04-13 at eb27afc)
+ http: differentiate socks5:// and socks5h://
The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.
Will merge to 'master'.
* jc/send-email-skip-backup (2016-04-12) 1 commit
- send-email: detect and offer to skip backup files
A careless invocation of "git send-email directory/" after editing
0001-change.patch with an editor often ends up sending both
0001-change.patch and its backup file, 0001-change.patch~, causing
embarrassment and a minor confusion. Detect such an input and
offer to skip the backup files when sending the patches out.
Needs review.
* jk/do-not-printf-NULL (2016-04-10) 3 commits
(merged to 'next' on 2016-04-13 at 60912e3)
+ git_config_set_multivar_in_file: handle "unset" errors
+ git_config_set_multivar_in_file: all non-zero returns are errors
+ config: lower-case first word of error strings
"git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.
Will merge to 'master'.
* jk/use-write-script-more (2016-04-12) 3 commits
(merged to 'next' on 2016-04-13 at d6718bf)
+ t3404: use write_script
+ t1020: do not overuse printf and use write_script
+ t5532: use write_script
Code clean-up.
Will merge to 'master'.
* nf/mergetool-prompt (2016-04-12) 2 commits
- SQUASH???
- difftool/mergetool: make the form of yes/no questions consistent
UI consistency improvements.
* va/i18n-misc-updates (2016-04-13) 6 commits
- i18n: branch: move comment for translators
- i18n: branch: unmark string for translation
- i18n: builtin/rm.c: remove a comma ',' from string
- i18n: unpack-trees: mark strings for translation
- i18n: builtin/branch.c: mark option for translation
- i18n: index-pack: use plural string instead of normal one
Mark several messages for translation.
* jc/drop-git-spec-in (2016-04-06) 1 commit
- Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
Comments?
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will be rerolled?
($gmane/290724)
* ew/send-email-readable-message-id (2016-04-06) 1 commit
(merged to 'next' on 2016-04-13 at 422959a)
+ send-email: more meaningful Message-ID
"git send-email" now uses a more readable timestamps when
formulating a message ID.
Will merge to 'master'.
* st/verify-tag (2016-04-18) 6 commits
- tag -v: verfy directly rather than exec-ing verify-tag
- verify-tag: move verification code to tag.c
- verify-tag: add sha1 argument to verify_tag()
- verify-tag: change variable name for readability
- t7030: test verifying multiple tags
- builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
Saw review comments on this v6.
Expecting a reroll.
* ew/send-email-drop-data-dumper (2016-04-06) 1 commit
(merged to 'next' on 2016-04-13 at 180266c)
+ send-email: do not load Data::Dumper
Code clean-up.
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-04-12) 16 commits
. branch: implement '--format' option
. branch: use ref-filter printing APIs
. branch, tag: use porcelain output
. ref-filter: allow porcelain to translate messages in the output
. ref-filter: add support for %(refname:dir) and %(refname:base)
. ref-filter: introduce refname_atom_parser()
. ref-filter: introduce symref_atom_parser()
. ref-filter: make "%(symref)" atom work with the ':short' modifier
. ref-filter: add support for %(upstream:track,nobracket)
. ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
. ref-filter: introduce format_ref_array_item()
. ref-filter: move get_head_description() from branch.c
. ref-filter: modify "%(objectname:short)" to take length
. ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
. ref-filter: include reference to 'used_atom' within 'atom_value'
. ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Rerolled but seems to lack jk/branch-shortening-funny-symrefs aka
$gmane/291295 yet.
* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
(merged to 'next' on 2016-04-13 at c6584bb)
+ submodule--helper, module_clone: catch fprintf failure
+ submodule--helper: do not borrow absolute_path() result for too long
+ submodule--helper, module_clone: always operate on absolute paths
+ submodule--helper clone: create the submodule path just once
+ submodule--helper: fix potential NULL-dereference
+ recursive submodules: test for relative paths
(this branch is used by sb/submodule-init.)
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
Will merge to 'master'.
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
(merged to 'next' on 2016-04-18 at 9daa5ce)
+ t7407: make expectation as clear as possible
+ submodule update: test recursive path reporting from subdirectory
+ submodule update: align reporting path for custom command execution
+ submodule status: correct path handling in recursive submodules
+ submodule update --init: correct path handling in recursive submodules
+ submodule foreach: correct path display in recursive submodules
(this branch is used by sb/submodule-init.)
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
Will merge to 'master'.
* xy/format-patch-base (2016-04-12) 4 commits
- format-patch: introduce format.base configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Review comments sent.
($gmane/291198)
* pb/commit-verbose-config (2016-04-12) 6 commits
. commit: add a commit.verbose config variable
. t7507-commit-verbose: improve test coverage by testing number of diffs
. parse-options.c: make OPTION_COUNTUP respect "unspecified" values
. t0040-parse-options: improve test coverage
. test-parse-options: print quiet as integer
. t0040-test-parse-options.sh: fix style issues
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
* dt/index-helper (2016-04-14) 16 commits
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- index-helper: add watchman support to reduce index refresh cost
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2016-04-06) 11 commits
(merged to 'next' on 2016-04-13 at 3db2753)
+ rerere: adjust 'forget' to multi-variant world order
+ rerere: split code to call ll_merge() further
+ rerere: move code related to "forget" together
+ rerere: gc and clear
+ rerere: do use multiple variants
+ t4200: rerere a merge with two identical conflicts
+ rerere: allow multiple variants to exist
+ rerere: delay the recording of preimage
+ rerere: handle leftover rr-cache/$ID directory and postimage files
+ rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
+ rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
Will merge to 'master'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* [PATCH] ll-merge: fix typo in comment
@ 2016-04-14 22:12 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-14 22:12 UTC (permalink / raw)
To: git
When a944af1d (merge: teach -Xours/-Xtheirs to binary ll-merge
driver, 2012-09-08) introduced FAVOR_OURS/FAVOR_THEIRS to the binary
ll-merge driver, it changed what happens to the merge result for the
outer merge, and updated the comment from:
The tentative merge result is "ours" for the final round, or
common ancestor for an internal merge. Still return "conflicted
merge" status.
to
The tentative merge result is the or common ancestor for an
internal merge.
What happened is obvious. I noticed the lack of definitive article
in front of "common" but failed to remove "or". Also I forgot to
describe what I did for the final merge, probably because I was
satisified by the description in the log message.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
ll-merge.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ll-merge.c b/ll-merge.c
index ff4a43a..fe22412 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -47,7 +47,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
assert(opts);
/*
- * The tentative merge result is the or common ancestor for an internal merge.
+ * The tentative merge result is the common ancestor for an
+ * internal merge. For the final merge, it is "ours" by
+ * default but -Xours/-Xtheirs can tweak the choice.
*/
if (opts->virtual_ancestor) {
stolen = orig;
^ permalink raw reply related [relevance 2%]
* Re: What's cooking in git.git (Apr 2016, #03; Thu, 7)
2016-04-07 19:01 2% What's cooking in git.git (Apr 2016, #03; Thu, 7) Junio C Hamano
@ 2016-04-07 21:03 0% ` Pranit Bauva
0 siblings, 0 replies; 200+ results
From: Pranit Bauva @ 2016-04-07 21:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git List
On Fri, Apr 8, 2016 at 12:31 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'. The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
>
> The 'master' branch now has the second batch of topics of this
> cycle.
>
> There are a handful of topics that are stuck; they are marked as
> "Needs review", "Needs an Ack", etc. in the following list.
>
> You can find the changes described here in the integration branches
> of the repositories listed at
>
> http://git-blame.blogspot.com/p/git-public-repositories.html
>
> --------------------------------------------------
> [Graduated to "master"]
>
> * cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
> (merged to 'next' on 2016-04-04 at 26f94c0)
> + Documentation: talk about pager in api-trace.txt
>
> Originally merged to 'next' on 2016-03-23
>
> A minor documentation update.
>
>
> * da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
> (merged to 'next' on 2016-04-04 at 34e645f)
> + mergetool: honor tempfile configuration when resolving delete conflicts
> + mergetool: support delete/delete conflicts
>
> Originally merged to 'next' on 2016-03-15
>
> "git mergetool" did not work well with conflicts that both sides
> deleted.
>
>
> * jk/credential-cache-comment-exit (2016-03-18) 1 commit
> (merged to 'next' on 2016-04-04 at 50427fe)
> + credential-cache--daemon: clarify "exit" action semantics
>
> Originally merged to 'next' on 2016-03-23
>
> A code clarification.
>
>
> * jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
> (merged to 'next' on 2016-04-04 at 4d54956)
> + send-email: ignore trailing whitespace in mailrc alias file
>
> Originally merged to 'next' on 2016-03-23
>
> "git send-email" had trouble parsing alias file in mailrc format
> when lines in it had trailing whitespaces on them.
>
>
> * jk/submodule-c-credential (2016-03-23) 7 commits
> (merged to 'next' on 2016-04-04 at 8de8e8c)
> + git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
> + git: submodule honor -c credential.* from command line
> + quote: implement sq_quotef()
> + submodule: fix segmentation fault in submodule--helper clone
> + submodule: fix submodule--helper clone usage
> + submodule: check argc count for git submodule--helper clone
> + submodule: don't pass empty string arguments to submodule--helper clone
>
> Originally merged to 'next' on 2016-03-23
>
> "git -c credential.<var>=<value> submodule" can now be used to
> propagate configuration variables related to credential helper
> down to the submodules.
>
>
> * jk/test-httpd-config-nosystem (2016-03-18) 1 commit
> (merged to 'next' on 2016-04-04 at 5fa6274)
> + t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
>
> Originally merged to 'next' on 2016-03-23
>
> The tests that involve running httpd leaked the system-wide
> configuration in /etc/gitconfig to the tested environment.
>
>
> * jv/merge-nothing-into-void (2016-03-23) 1 commit
> (merged to 'next' on 2016-04-04 at aa37405)
> + merge: fix NULL pointer dereference when merging nothing into void
>
> Originally merged to 'next' on 2016-03-23
>
> "git merge FETCH_HEAD" dereferenced NULL pointer when merging
> nothing into an unborn history (which is arguably unusual usage,
> which perhaps was the reason why nobody noticed it).
>
>
> * la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
> (merged to 'next' on 2016-04-04 at a49ec4a)
> + tag: add the option to force signing of annotated tags
>
> Originally merged to 'next' on 2016-03-24
>
> "git tag" can create an annotated tag without explicitly given an
> "-a" (or "-s") option (i.e. when a tag message is given). A new
> configuration variable, tag.forceSignAnnotated, can be used to tell
> the command to create signed tag in such a situation.
>
>
> * ls/p4-map-user (2016-03-15) 1 commit
> (merged to 'next' on 2016-04-04 at a56b011)
> + git-p4: map a P4 user to Git author name and email address
>
> Originally merged to 'next' on 2016-03-23
>
> "git p4" now allows P4 author names to be mapped to Git author
> names.
>
>
> * pb/t7502-drop-dup (2016-03-11) 1 commit
> (merged to 'next' on 2016-04-04 at 4799cad)
> + t/t7502 : drop duplicate test
> (this branch is used by pb/commit-verbose-config.)
>
> Originally merged to 'next' on 2016-03-15
>
> Code clean-up.
>
>
> * sb/clone-t57-t56 (2016-03-16) 1 commit
> (merged to 'next' on 2016-04-04 at 5c20247)
> + clone tests: rename t57* => t56*
>
> Originally merged to 'next' on 2016-03-23
>
> Rename bunch of tests on "git clone" for better organization.
>
>
> * sb/rebase-x (2016-03-18) 2 commits
> (merged to 'next' on 2016-04-04 at feda620)
> + t3404: cleanup double empty lines between tests
> + rebase: decouple --exec from --interactive
>
> Originally merged to 'next' on 2016-03-23
>
> "git rebase -x" can be used without passing "-i" option.
>
>
> * sb/submodule-parallel-update (2016-03-01) 10 commits
> (merged to 'next' on 2016-04-04 at a0aea8d)
> + clone: allow an explicit argument for parallel submodule clones
> + submodule update: expose parallelism to the user
> + submodule helper: remove double 'fatal: ' prefix
> + git submodule update: have a dedicated helper for cloning
> + run_processes_parallel: rename parameters for the callbacks
> + run_processes_parallel: treat output of children as byte array
> + submodule update: direct error message to stderr
> + fetching submodules: respect `submodule.fetchJobs` config option
> + submodule-config: drop check against NULL
> + submodule-config: keep update strategy around
> (this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
>
> Originally merged to 'next' on 2016-03-15
>
> A major part of "git submodule update" has been ported to C to take
> advantage of the recently added framework to run download tasks in
> parallel.
>
>
> * ss/commit-squash-msg (2016-03-21) 1 commit
> (merged to 'next' on 2016-04-04 at d389f19)
> + commit: do not lose SQUASH_MSG contents
>
> Originally merged to 'next' on 2016-03-23
>
> When "git merge --squash" stopped due to conflict, the concluding
> "git commit" failed to read in the SQUASH_MSG that shows the log
> messages from all the squashed commits.
>
>
> * ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
> (merged to 'next' on 2016-04-04 at 9f0207e)
> + dir: store EXC_FLAG_* values in unsigned integers
>
> Originally merged to 'next' on 2016-03-04
>
> Code clean-up.
>
>
> * ss/receive-pack-parse-options (2016-03-01) 1 commit
> (merged to 'next' on 2016-04-04 at fd6ab4c)
> + builtin/receive-pack.c: use parse_options API
>
> Originally merged to 'next' on 2016-03-04
>
> The command line argument parser for "receive-pack" has been
> rewritten to use parse-options.
>
> --------------------------------------------------
> [New Topics]
>
> * jc/drop-git-spec-in (2016-04-06) 1 commit
> - Makefile: stop pretending to support rpmbuild
>
> As nobody maintains our in-tree git.spec.in and distros use their
> own spec file, we stopped pretending that we support "make rpm".
>
>
> * jc/makefile-redirection-stderr (2016-04-05) 1 commit
> (merged to 'next' on 2016-04-06 at e3f2ded)
> + Makefile: fix misdirected redirections
>
> A minor fix in the Makefile.
>
> Will merge to 'master'.
>
>
> * js/mingw-tests-2.8 (2016-04-04) 1 commit
> (merged to 'next' on 2016-04-06 at f85a013)
> + Windows: shorten code by re-using convert_slashes()
>
> Code clean-up.
>
> Will merge to 'master'.
>
>
> * ar/diff-args-osx-precompose (2016-04-05) 1 commit
> - diff: run arguments through precompose_argv
>
> Many commands normalize command line arguments from NFD to NFC
> variant of UTF-8 on OSX, but commands in the "diff" family did
> not, causing "git diff $path" to complain that no such path is
> known to Git. They have been taught to do the normalization.
>
> Will be rerolled?
> ($gmane/290724)
>
>
> * ep/trace-doc-sample-fix (2016-04-05) 1 commit
> (merged to 'next' on 2016-04-06 at 0df7357)
> + api-trace.txt: fix typo
>
> Fix a typo in an example in the trace API documentation.
>
> Will merge to 'master'.
>
>
> * ew/send-email-readable-message-id (2016-04-06) 1 commit
> - send-email: more meaningful Message-ID
>
> "git send-email" now uses a more readable timestamps when
> formulating a message ID.
>
> Will merge to 'next'.
>
>
> * mg/complete-cherry-mark-to-log (2016-04-05) 1 commit
> (merged to 'next' on 2016-04-06 at 3002be6)
> + completion: complete --cherry-mark for git log
>
> The completion scripts (in contrib/) did not include the
> "--cherry-mark" option when completing "git log <HT>".
>
> Will merge to 'master'.
>
>
> * tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit
> (merged to 'next' on 2016-04-06 at 263bba8)
> + correct blame for files commited with CRLF
>
> When running "git blame $path" with unnormalized data in the index
> for the path, the data in the working tree was blamed, even though
> "git add" would not have changed what is already in the index, due
> to "safe crlf" that disables the line-end conversion. It has been
> corrected.
>
> Will merge to 'master'.
>
>
> * st/verify-tag (2016-04-06) 3 commits
> - verify-tag: change variable name for readability
> - t7030: test verifying multiple tags
> - builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
>
> Only the first three patches in a six-patch series.
>
>
> * ew/send-email-drop-data-dumper (2016-04-06) 1 commit
> - send-email: do not load Data::Dumper
>
> Code clean-up.
>
> Will merge to 'next'.
>
> --------------------------------------------------
> [Stalled]
>
> * da/user-useconfigonly (2016-04-01) 2 commits
> - ident: give "please tell me" message upon useConfigOnly error
> - ident: check for useConfigOnly before auto-detection of name/email
>
> The "user.useConfigOnly" configuration variable makes it an error
> if users do not explicitly set user.name and user.email. However,
> its check was not done early enough and allowed another error to
> trigger, reporting that the default value we guessed from the
> system setting was unusable. This was a suboptimal end-user
> experience as we want the users to set user.name/user.email without
> relying on the auto-detection at all.
>
> Waiting for Acks.
> ($gmane/290340)
>
>
> * sb/clone-shallow-passthru (2016-03-23) 3 commits
> - clone: add t5614 to test cloning submodules with shallowness involved
> - submodule clone: pass along `local` option
> - clone: add `--shallow-submodules` flag
>
> "git clone" learned "--shallow-submodules" option.
>
> Needs review.
>
>
> * sg/completion-updates (2016-02-28) 21 commits
> - completion: cache the path to the repository
> - completion: extract repository discovery from __gitdir()
> - completion: don't guard git executions with __gitdir()
> - completion: consolidate silencing errors from git commands
> - completion: don't use __gitdir() for git commands
> - completion: respect 'git -C <path>'
> - completion: fix completion after 'git -C <path>'
> - completion: don't offer commands when 'git --opt' needs an argument
> - rev-parse: add '--absolute-git-dir' option
> - completion: list short refs from a remote given as a URL
> - completion: don't list 'HEAD' when trying refs completion outside of a repo
> - completion: list refs from remote when remote's name matches a directory
> - completion: respect 'git --git-dir=<path>' when listing remote refs
> - completion: fix most spots not respecting 'git --git-dir=<path>'
> - completion: ensure that the repository path given on the command line exists
> - completion tests: add tests for the __git_refs() helper function
> - completion tests: check __gitdir()'s output in the error cases
> - completion tests: consolidate getting path of current working directory
> - completion tests: make the $cur variable local to the test helper functions
> - completion tests: don't add test cruft to the test repository
> - completion: improve __git_refs()'s in-code documentation
>
> Will be rerolled.
> ($gmane/287839)
>
>
> * nd/shallow-deepen (2016-02-23) 25 commits
> - fetch, upload-pack: --deepen=N extends shallow boundary by N commits
> - upload-pack: add get_reachable_list()
> - upload-pack: split check_unreachable() in two, prep for get_reachable_list()
> - t5500, t5539: tests for shallow depth excluding a ref
> - clone: define shallow clone boundary with --shallow-exclude
> - fetch: define shallow boundary with --shallow-exclude
> - upload-pack: support define shallow boundary by excluding revisions
> - refs: add expand_ref()
> - t5500, t5539: tests for shallow depth since a specific date
> - clone: define shallow clone boundary based on time with --shallow-since
> - fetch: define shallow boundary with --shallow-since
> - upload-pack: add deepen-since to cut shallow repos based on time
> - shallow.c: implement a generic shallow boundary finder based on rev-list
> - fetch-pack: use a separate flag for fetch in deepening mode
> - fetch-pack: use a common function for verbose printing
> - fetch-pack: use skip_prefix() instead of starts_with()
> - upload-pack: move rev-list code out of check_non_tip()
> - upload-pack: tighten number parsing at "deepen" lines
> - upload-pack: use skip_prefix() instead of starts_with()
> - upload-pack: move "unshallow" sending code out of deepen()
> - upload-pack: remove unused variable "backup"
> - upload-pack: move "shallow" sending code out of deepen()
> - upload-pack: move shallow deepen code out of receive_needs()
> - transport-helper.c: refactor set_helper_option()
> - remote-curl.c: convert fetch_git() to use argv_array
>
> The existing "git fetch --depth=<n>" option was hard to use
> correctly when making the history of an existing shallow clone
> deeper. A new option, "--deepen=<n>", has been added to make this
> easier to use. "git clone" also learned "--shallow-since=<date>"
> and "--shallow-exclude=<tag>" options to make it easier to specify
> "I am interested only in the recent N months worth of history" and
> "Give me only the history since that version".
>
> Needs review.
>
>
> * sb/submodule-init (2016-03-15) 2 commits
> . submodule: port init from shell to C
> . submodule: port resolve_relative_url from shell to C
>
> Update of "git submodule" to move pieces of logic to C continues.
>
> Needs review.
> ($gmane/288824)
>
>
> * az/p4-bare-no-rebase (2016-02-19) 1 commit
> - git-p4.py: Don't try to rebase on submit from bare repository
>
> "git p4 submit" attempts to do a rebase, which would fail if done
> in a bare repository. Not doing this rebase would paper over the
> failure, which is what this patch does, but it is unclear what the
> side effect of not rebasing is.
>
> Needs a better explanation.
>
>
> * ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
> - wt-status.c: set commitable bit if there is a meaningful merge.
>
> "git commit --dry-run" reported "No, no, you cannot commit." in one
> case where "git commit" would have allowed you to commit, and this
> improves it a little bit ("git commit --dry-run --short" still does
> not give you the correct answer, for example).
>
>
> * nd/icase (2016-02-15) 12 commits
> - grep.c: reuse "icase" variable
> - diffcore-pickaxe: support case insensitive match on non-ascii
> - diffcore-pickaxe: "share" regex error handling code
> - grep/pcre: support utf-8
> - gettext: add is_utf8_locale()
> - grep/pcre: prepare locale-dependent tables for icase matching
> - grep/icase: avoid kwsset when -F is specified
> - grep/icase: avoid kwsset on literal non-ascii strings
> - test-regex: expose full regcomp() to the command line
> - test-regex: isolate the bug test code
> - grep: break down an "if" stmt in preparation for next changes
> - grep: allow -F -i combination
>
> "git grep -i" has been taught to fold case in non-ascii locales.
>
> Needs review.
> ($gmane/286137)
>
>
> * dt/refs-backend-lmdb (2016-02-25) 45 commits
> . SQUASH??? Minimum compilation band-aid
> . tests: add ref-storage argument
> . refs: tests for lmdb backend
> . refs: add LMDB refs storage backend
> . refs: break out resolve_ref_unsafe_submodule
> . config: read ref storage config on startup
> . refs: register ref storage backends
> . svn: learn ref-storage argument
> . clone: allow ref storage backend to be set for clone
> . refs: check submodules' ref storage config
> . init: allow alternate ref strorage to be set for new repos
> . refs: always handle non-normal refs in files backend
> . refs: resolve symbolic refs first
> . refs: on symref reflog expire, lock symref not referrent
> . refs: don't dereference on rename
> . refs: allow log-only updates
> . refs: move duplicate check to common code
> . refs: make lock generic
> . refs: handle non-normal ref renames
> . refs: add method to rename refs
> . refs: add methods to init refs db
> . refs: add method for delete_refs
> . refs: add method for initial ref transaction commit
> . refs: add methods for reflog
> . refs: add do_for_each_per_worktree_ref
> . refs: reduce the visibility of do_for_each_ref()
> . refs: add method for do_for_each_ref
> . refs: add methods for misc ref operations
> . refs: add a backend method structure with transaction functions
> . refs: move resolve_ref_unsafe into common code
> . files-backend: break out ref reading
> . refs: move for_each_*ref* functions into common code
> . refs: move head_ref{,_submodule} to the common code
> . Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
> . clone: allow an explicit argument for parallel submodule clones
> . submodule update: expose parallelism to the user
> . git submodule update: have a dedicated helper for cloning
> . run_processes_parallel: correctly terminate callbacks with an LF
> . run_processes_parallel: rename parameters for the callbacks
> . run-command: expose default_{start_failure, task_finished}
> . run_processes_parallel: treat output of children as byte array
> . submodule update: direct error message to stderr
> . fetching submodules: respect `submodule.fetchJobs` config option
> . submodule-config: drop check against NULL
> . submodule-config: keep update strategy around
>
> A reroll exists, but it seems that will further be rerolled.
>
>
> * ec/annotate-deleted (2015-11-20) 1 commit
> - annotate: skip checking working tree if a revision is provided
>
> Usability fix for annotate-specific "<file> <rev>" syntax with deleted
> files.
>
> Waiting for review.
>
>
> * dg/subtree-rebase-test (2016-01-19) 1 commit
> - contrib/subtree: Add a test for subtree rebase that loses commits
>
> Reviewed up to v5.
> Will be rerolled.
> ($gmane/284426)
>
>
> * js/am-3-merge-recursive-direct (2015-10-12) 2 commits
> - am: make a direct call to merge_recursive
> - merge_recursive_options: introduce the "gently" flag
>
> The merge_recursive_generic() function has been made a bit safer to
> call from inside a process. "git am -3" was taught to make a direct
> call to the function when falling back to three-way merge.
>
> Being able to make a direct call would be good in general, but as a
> performance thing, the change needs to be backed up by numbers.
>
> Needs review.
>
> I haven't gone through the "gently" change with fine toothed comb;
> I can see that the change avoids calling die(), but I haven't made
> sure that the program states (e.g. what's in the in-core index) are
> adjusted sensibly when it returns to the caller instead of dying,
> or the codepaths that used to die() are free of resource leaks.
> The original code certainly did not care the program states at the
> point of dying exactly because it knew it is going to exit, but now
> they have to care, and they need to be audited.
>
>
> * dk/gc-more-wo-pack (2016-01-13) 4 commits
> - gc: clean garbage .bitmap files from pack dir
> - t5304: ensure non-garbage files are not deleted
> - t5304: test .bitmap garbage files
> - prepare_packed_git(): find more garbage
>
> Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
> .bitmap and .keep files.
>
> Waiting for a reroll.
> ($gmane/284368).
>
>
> * jc/diff-b-m (2015-02-23) 5 commits
> . WIPWIP
> . WIP: diff-b-m
> - diffcore-rename: allow easier debugging
> - diffcore-rename.c: add locate_rename_src()
> - diffcore-break: allow debugging
>
> "git diff -B -M" produced incorrect patch when the postimage of a
> completely rewritten file is similar to the preimage of a removed
> file; such a resulting file must not be expressed as a rename from
> other place.
>
> The fix in this patch is broken, unfortunately.
> Will discard.
>
> --------------------------------------------------
> [Cooking]
>
> * es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
> (merged to 'next' on 2016-04-06 at 25d79bb)
> + git-format-patch.txt: don't show -s as shorthand for multiple options
>
> "git format-patch --help" showed `-s` and `--no-patch` as if these
> are valid options to the command. We already hide `--patch` option
> from the documentation, because format-patch is about showing the
> diff, and the documentation now hides these options as well.
>
> Will merge to 'master'.
>
>
> * jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit
> (merged to 'next' on 2016-04-06 at 1a3f8be)
> + branch: fix shortening of non-remote symrefs
>
> A change back in version 2.7 to "git branch" broke display of a
> symbolic ref in a non-standard place in the refs/ hierarchy (we
> expect symbolic refs to appear in refs/remotes/*/HEAD to point at
> the primary branch the remote has, and as .git/HEAD to point at the
> branch we locally checked out).
>
> Will merge to 'next' and later down to maint-2.7.
>
>
> * jn/mergetools-examdiff (2016-04-04) 2 commits
> (merged to 'next' on 2016-04-06 at 819e858)
> + mergetools: add support for ExamDiff
> + mergetools: create mergetool_find_win32_cmd() helper function for winmerge
>
> "git mergetools" learned to drive ExamDiff.
>
> Will merge to 'master'.
>
>
> * kn/for-each-tag-branch (2016-03-30) 1 commit
> (merged to 'next' on 2016-04-06 at 4595ad3)
> + for-each-ref: fix description of '--contains' in manpage
>
> A minor documentation update.
>
> Will merge to 'master'.
>
>
> * kn/ref-filter-branch-list (2016-03-30) 16 commits
> . branch: implement '--format' option
> . branch: use ref-filter printing APIs
> . branch, tag: use porcelain output
> . ref-filter: allow porcelain to translate messages in the output
> . ref-filter: add support for %(refname:dir) and %(refname:base)
> . ref-filter: introduce refname_atom_parser()
> . ref-filter: introduce symref_atom_parser()
> . ref-filter: make "%(symref)" atom work with the ':short' modifier
> . ref-filter: add support for %(upstream:track,nobracket)
> . ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
> . ref-filter: introduce format_ref_array_item()
> . ref-filter: move get_head_description() from branch.c
> . ref-filter: modify "%(objectname:short)" to take length
> . ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
> . ref-filter: include reference to 'used_atom' within 'atom_value'
> . ref-filter: implement %(if), %(then), and %(else) atoms
>
> The code to list branches in "git branch" has been consolidated
> with the more generic ref-filter API.
>
> Will be rerolled.
>
>
> * oa/doc-diff-check (2016-03-29) 1 commit
> (merged to 'next' on 2016-04-06 at e3d6e8d)
> + Documentation: git diff --check detects conflict markers
>
> A minor documentation update.
>
> Will merge to 'master'.
>
>
> * rz/worktree-no-checkout (2016-03-29) 1 commit
> (merged to 'next' on 2016-04-06 at e725216)
> + worktree: add: introduce --checkout option
>
> "git worktree add" can be given "--no-checkout" option to only
> create an empty worktree without checking out the files.
>
> Will merge to 'master'.
>
>
> * sb/misc-cleanups (2016-04-01) 4 commits
> (merged to 'next' on 2016-04-06 at 4e63691)
> + credential-cache, send_request: close fd when done
> + bundle: don't leak an fd in case of early return
> + abbrev_sha1_in_line: don't leak memory
> + notes: don't leak memory in git_config_get_notes_strategy
>
> Assorted minor clean-ups.
>
> Will merge to 'master'.
>
>
> * sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
> - submodule--helper, module_clone: catch fprintf failure
> - submodule--helper: do not borrow absolute_path() result for too long
> - submodule--helper, module_clone: always operate on absolute paths
> - submodule--helper clone: create the submodule path just once
> - submodule--helper: fix potential NULL-dereference
> - recursive submodules: test for relative paths
>
> A partial rewrite of "git submodule" in the 2.7 timeframe changed
> the way the gitdir: pointer in the submodules point at the real
> repository location to use absolute paths by accident. This has
> been corrected.
>
> Any further comments? Otherwise will merge to 'next'.
>
>
> * sb/submodule-path-misc-bugs (2016-03-30) 6 commits
> - t7407: make expectation as clear as possible
> - submodule update: test recursive path reporting from subdirectory
> - submodule update: align reporting path for custom command execution
> - submodule status: correct path handling in recursive submodules
> - submodule update --init: correct path handling in recursive submodules
> - submodule foreach: correct path display in recursive submodules
>
> "git submodule" reports the paths of submodules the command
> recurses into, but this was incorrect when the command was not run
> from the root level of the superproject.
>
> Any further comments? Otherwise will merge to 'next'.
>
>
> * sg/diff-multiple-identical-renames (2016-03-30) 1 commit
> (merged to 'next' on 2016-04-06 at ac19e48)
> + diffcore: fix iteration order of identical files during rename detection
>
> "git diff -M" used to work better when two originally identical
> files A and B got renamed to X/A and X/B by pairing A to X/A and B
> to X/B, but this was broken in the 2.0 timeframe.
>
> Will merge to 'master'.
>
>
> * sk/send-pack-all-fix (2016-03-31) 1 commit
> (merged to 'next' on 2016-04-06 at 31e1e1b)
> + git-send-pack: fix --all option when used with directory
>
> "git send-pack --all <there>" was broken when its command line
> option parsing was written in the 2.6 timeframe.
>
> Will merge to 'master'.
>
>
> * ss/msvc (2016-03-30) 2 commits
> (merged to 'next' on 2016-04-06 at 4b53bce)
> + MSVC: use shipped headers instead of fallback definitions
> + MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
>
> Build updates for MSVC.
>
> Will merge to 'master'.
>
>
> * xy/format-patch-base (2016-03-31) 4 commits
> - format-patch: introduce format.base configuration
> - format-patch: introduce --base=auto option
> - format-patch: add '--base' option to record base tree info
> - patch-ids: make commit_patch_id() a public helper function
>
> "git format-patch" learned a new "--base" option to record what
> (public, well-known) commit the original series was built on in
> its output.
>
> Will be rerolled.
> ($gmane/290365)
>
>
> * tb/safe-crlf-output-fix (2016-04-01) 7 commits
> . convert.c: more safer crlf handling with text attribute
> . correct blame for files commited with CRLF
> . convert: unify the "auto" handling of CRLF
> . t0027: test cases for combined attributes
> . convert: allow core.autocrlf=input and core.eol=crlf
> . convert.c: stream and early out
> . read-cache: factor out get_sha1_from_index() helper
>
> The "safe CRLF" facility disables line-end conversion from CRLF to
> LF when checking in if the blob registered to the index already
> contains CR, but some codepaths like "git blame" did not know this,
> and instead assumed that only the configuration and attribute
> settings determined how the data from the working tree is converted.
>
> Will be rerolled.
> ($gmane/290637)
>
>
> * ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
> (merged to 'next' on 2016-04-06 at 2aab890)
> + submodule-config: use hashmap_iter_first()
>
> Minor code cleanup.
>
> Will merge to 'master'.
>
>
> * ky/branch-d-worktree (2016-03-29) 1 commit
> (merged to 'next' on 2016-04-06 at 00f9bff)
> + branch -d: refuse deleting a branch which is currently checked out
>
> When "git worktree" feature is in use, "git branch -d" allowed
> deletion of a branch that is checked out in another worktree
>
> Will merge to 'master'.
>
>
> * ky/branch-m-worktree (2016-04-04) 2 commits
> (merged to 'next' on 2016-04-06 at e7b285c)
> + branch -m: update all per-worktree HEADs
> + refs: add a new function set_worktree_head_symref
>
> When "git worktree" feature is in use, "git branch -m" renamed a
> branch that is checked out in another worktree without adjusting
> the HEAD symbolic ref for the worktree.
>
> Will merge to 'master'.
>
>
> * nd/apply-doc (2016-03-24) 2 commits
> (merged to 'next' on 2016-04-06 at f9bd355)
> + git-apply.txt: mention the behavior inside a subdir
> + git-apply.txt: remove a space
>
> A minor documentation update.
>
> Will merge to 'master'.
>
>
> * nd/apply-report-skip (2016-03-24) 1 commit
> (merged to 'next' on 2016-04-06 at ae2c824)
> + apply: report patch skipping in verbose mode
>
> "git apply -v" learned to report paths in the patch that were
> skipped via --include/--exclude mechanism or being outside the
> current working directory.
>
> Will merge to 'master'.
>
>
> * pb/opt-cmdmode-doc (2016-03-25) 1 commit
> (merged to 'next' on 2016-04-06 at a5f3835)
> + api-parse-options.txt: document OPT_CMDMODE()
>
> Minor API documentation update.
>
> Will merge to 'master'.
>
>
> * rt/completion-help (2016-03-24) 2 commits
> (merged to 'next' on 2016-04-06 at 8c3ee08)
> + completion: add 'revisions' and 'everyday' to 'git help'
> + completion: add option '--guides' to 'git help'
>
> Shell completion (in contrib/) updates.
>
> Will merge to 'master'.
>
>
> * rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit
> (merged to 'next' on 2016-04-06 at 7a766b7)
> + rebase-i: print an abbreviated hash when stop for editing
>
> The commit object name reported when "rebase -i" stops has been
> shortened.
>
> Will merge to 'master'.
>
>
> * jk/check-repository-format (2016-03-11) 10 commits
> (merged to 'next' on 2016-04-06 at a0dada0)
> + verify_repository_format: mark messages for translation
> + setup: drop repository_format_version global
> + setup: unify repository version callbacks
> + init: use setup.c's repo version verification
> + setup: refactor repo format reading and verification
> + config: drop git_config_early
> + check_repository_format_gently: stop using git_config_early
> + lazily load core.sharedrepository
> + wrap shared_repository global in get/set accessors
> + setup: document check_repository_format()
>
> The repository set-up sequence has been streamlined (the biggest
> change is that there is no longer git_config_early()), so that we
> do not attempt to look into refs/* when we know we do not have a
> Git repository.
>
> Will merge to 'master'.
>
>
> * mj/pull-rebase-autostash (2016-04-04) 9 commits
> (merged to 'next' on 2016-04-06 at b4e4f31)
> + t5520: test --[no-]autostash with pull.rebase=true
> + t5520: reduce commom lines of code
> + t5520: factor out common "failing autostash" code
> + t5520: factor out common "successful autostash" code
> + t5520: use better test to check stderr output
> + t5520: ensure consistent test conditions
> + t5520: use consistent capitalization in test titles
> + pull --rebase: add --[no-]autostash flag
> + git-pull.c: introduce git_pull_config()
>
> "git pull --rebase" learned "--[no-]autostash" option, so that
> the rebase.autostash configuration variable set to true can be
> overridden from the command line.
>
> Will merge to 'master'.
>
>
> * pb/commit-verbose-config (2016-03-14) 1 commit
> (merged to 'next' on 2016-04-06 at e5c744f)
> + commit: add a commit.verbose config variable
>
> "git commit" learned to pay attention to "commit.verbose"
> configuration variable and act as if "--verbose" option was
> given from the command line.
>
> Will merge to 'master'.
Could you delay this a little bit. I am currently working on this.
>
> * jc/merge-refuse-new-root (2016-03-23) 1 commit
> (merged to 'next' on 2016-04-04 at cd70fd6)
> + merge: refuse to create too cool a merge by default
>
> Originally merged to 'next' on 2016-03-23
>
> "git merge" used to allow merging two branches that have no common
> base by default, which led to a brand new history of an existing
> project created and then get pulled by an unsuspecting maintainer,
> which allowed an unnecessary parallel history merged into the
> existing project. The command has been taught not to allow this by
> default, with an escape hatch "--allow-unrelated-histories" option
> to be used in a rare event that merges histories of two projects
> that started their lives independently.
>
> Will merge to 'master'.
>
>
> * lt/pretty-expand-tabs (2016-04-04) 4 commits
> (merged to 'next' on 2016-04-06 at 186ac2a)
> + pretty: test --expand-tabs
> + pretty: allow tweaking tabwidth in --expand-tabs
> + pretty: enable --expand-tabs by default for selected pretty formats
> + pretty: expand tabs in indented logs to make things line up properly
>
> When "git log" shows the log message indented by 4-spaces, the
> remainder of a line after a HT does not align in the way the author
> originally intended. The command now expands tabs by default in
> such a case, and allows the users to override it with a new option,
> '--no-expand-tabs'.
>
> Will merge to 'master'.
>
>
> * cc/apply (2016-04-01) 4 commits
> (merged to 'next' on 2016-04-06 at 2e23c44)
> + builtin/apply: free patch when parse_chunk() fails
> + builtin/apply: handle parse_binary() failure
> + apply: remove unused call to free() in gitdiff_{old,new}name()
> + builtin/apply: get rid of useless 'name' variable
>
> Minor code clean-up.
>
> Will merge to 'master'.
>
>
> * dt/index-helper (2016-03-23) 18 commits
> - SQUASH - minimum compilation fix
> - read-cache: config for waiting for index-helper
> - index-helper: optionally automatically run
> - index-helper: autorun mode
> - index-helper: don't run if already running
> - index-helper: kill mode
> - unpack-trees: preserve index extensions
> - update-index: enable/disable watchman support
> - index-helper: use watchman to avoid refreshing index with lstat()
> - Add watchman support to reduce index refresh cost
> - read-cache: invalidate untracked cache data when reading WAMA
> - read-cache: add watchman 'WAMA' extension
> - index-helper: add --detach
> - daemonize(): set a flag before exiting the main process
> - index-helper: add --strict
> - index-helper: new daemon for caching index and related stuff
> - read-cache: allow to keep mmap'd memory after reading
> - read-cache.c: fix constness of verify_hdr()
>
> Needs review.
>
>
> * jc/bundle (2016-03-03) 6 commits
> - index-pack: --clone-bundle option
> - Merge branch 'jc/index-pack' into jc/bundle
> - bundle v3: the beginning
> - bundle: keep a copy of bundle file name in the in-core bundle header
> - bundle: plug resource leak
> - bundle doc: 'verify' is not about verifying the bundle
>
> The beginning of "split bundle", which could be one of the
> ingredients to allow "git clone" traffic off of the core server
> network to CDN.
>
>
> * ad/cygwin-wants-rename (2015-08-07) 1 commit
> - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
>
> Will hold.
> ($gmane/275680).
>
>
> * jc/rerere-multi (2016-04-06) 11 commits
> - rerere: adjust 'forget' to multi-variant world order
> - rerere: split code to call ll_merge() further
> - rerere: move code related to "forget" together
> - rerere: gc and clear
> - rerere: do use multiple variants
> - t4200: rerere a merge with two identical conflicts
> - rerere: allow multiple variants to exist
> - rerere: delay the recording of preimage
> - rerere: handle leftover rr-cache/$ID directory and postimage files
> - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
> - rerere: split conflict ID further
>
> "git rerere" can encounter two or more files with the same conflict
> signature that have to be resolved in different ways, but there was
> no way to record these separate resolutions.
>
> Will merge to 'next'.
>
>
> * jc/merge-drop-old-syntax (2015-04-29) 1 commit
> - merge: drop 'git merge <message> HEAD <commit>' syntax
>
> Stop supporting "git merge <message> HEAD <commit>" syntax that has
> been deprecated since October 2007, and issues a deprecation
> warning message since v2.5.0.
>
> It has been reported that git-gui still uses the deprecated syntax,
> which needs to be fixed before this final step can proceed.
> ($gmane/282594)
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [relevance 0%]
* What's cooking in git.git (Apr 2016, #03; Thu, 7)
@ 2016-04-07 19:01 2% Junio C Hamano
2016-04-07 21:03 0% ` Pranit Bauva
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2016-04-07 19:01 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the second batch of topics of this
cycle.
There are a handful of topics that are stuck; they are marked as
"Needs review", "Needs an Ack", etc. in the following list.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
(merged to 'next' on 2016-04-04 at 26f94c0)
+ Documentation: talk about pager in api-trace.txt
Originally merged to 'next' on 2016-03-23
A minor documentation update.
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
(merged to 'next' on 2016-04-04 at 34e645f)
+ mergetool: honor tempfile configuration when resolving delete conflicts
+ mergetool: support delete/delete conflicts
Originally merged to 'next' on 2016-03-15
"git mergetool" did not work well with conflicts that both sides
deleted.
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
(merged to 'next' on 2016-04-04 at 50427fe)
+ credential-cache--daemon: clarify "exit" action semantics
Originally merged to 'next' on 2016-03-23
A code clarification.
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
(merged to 'next' on 2016-04-04 at 4d54956)
+ send-email: ignore trailing whitespace in mailrc alias file
Originally merged to 'next' on 2016-03-23
"git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
* jk/submodule-c-credential (2016-03-23) 7 commits
(merged to 'next' on 2016-04-04 at 8de8e8c)
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
+ git: submodule honor -c credential.* from command line
+ quote: implement sq_quotef()
+ submodule: fix segmentation fault in submodule--helper clone
+ submodule: fix submodule--helper clone usage
+ submodule: check argc count for git submodule--helper clone
+ submodule: don't pass empty string arguments to submodule--helper clone
Originally merged to 'next' on 2016-03-23
"git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
(merged to 'next' on 2016-04-04 at 5fa6274)
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Originally merged to 'next' on 2016-03-23
The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
* jv/merge-nothing-into-void (2016-03-23) 1 commit
(merged to 'next' on 2016-04-04 at aa37405)
+ merge: fix NULL pointer dereference when merging nothing into void
Originally merged to 'next' on 2016-03-23
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
(merged to 'next' on 2016-04-04 at a49ec4a)
+ tag: add the option to force signing of annotated tags
Originally merged to 'next' on 2016-03-24
"git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
* ls/p4-map-user (2016-03-15) 1 commit
(merged to 'next' on 2016-04-04 at a56b011)
+ git-p4: map a P4 user to Git author name and email address
Originally merged to 'next' on 2016-03-23
"git p4" now allows P4 author names to be mapped to Git author
names.
* pb/t7502-drop-dup (2016-03-11) 1 commit
(merged to 'next' on 2016-04-04 at 4799cad)
+ t/t7502 : drop duplicate test
(this branch is used by pb/commit-verbose-config.)
Originally merged to 'next' on 2016-03-15
Code clean-up.
* sb/clone-t57-t56 (2016-03-16) 1 commit
(merged to 'next' on 2016-04-04 at 5c20247)
+ clone tests: rename t57* => t56*
Originally merged to 'next' on 2016-03-23
Rename bunch of tests on "git clone" for better organization.
* sb/rebase-x (2016-03-18) 2 commits
(merged to 'next' on 2016-04-04 at feda620)
+ t3404: cleanup double empty lines between tests
+ rebase: decouple --exec from --interactive
Originally merged to 'next' on 2016-03-23
"git rebase -x" can be used without passing "-i" option.
* sb/submodule-parallel-update (2016-03-01) 10 commits
(merged to 'next' on 2016-04-04 at a0aea8d)
+ clone: allow an explicit argument for parallel submodule clones
+ submodule update: expose parallelism to the user
+ submodule helper: remove double 'fatal: ' prefix
+ git submodule update: have a dedicated helper for cloning
+ run_processes_parallel: rename parameters for the callbacks
+ run_processes_parallel: treat output of children as byte array
+ submodule update: direct error message to stderr
+ fetching submodules: respect `submodule.fetchJobs` config option
+ submodule-config: drop check against NULL
+ submodule-config: keep update strategy around
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
Originally merged to 'next' on 2016-03-15
A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.
* ss/commit-squash-msg (2016-03-21) 1 commit
(merged to 'next' on 2016-04-04 at d389f19)
+ commit: do not lose SQUASH_MSG contents
Originally merged to 'next' on 2016-03-23
When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
(merged to 'next' on 2016-04-04 at 9f0207e)
+ dir: store EXC_FLAG_* values in unsigned integers
Originally merged to 'next' on 2016-03-04
Code clean-up.
* ss/receive-pack-parse-options (2016-03-01) 1 commit
(merged to 'next' on 2016-04-04 at fd6ab4c)
+ builtin/receive-pack.c: use parse_options API
Originally merged to 'next' on 2016-03-04
The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
--------------------------------------------------
[New Topics]
* jc/drop-git-spec-in (2016-04-06) 1 commit
- Makefile: stop pretending to support rpmbuild
As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".
* jc/makefile-redirection-stderr (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at e3f2ded)
+ Makefile: fix misdirected redirections
A minor fix in the Makefile.
Will merge to 'master'.
* js/mingw-tests-2.8 (2016-04-04) 1 commit
(merged to 'next' on 2016-04-06 at f85a013)
+ Windows: shorten code by re-using convert_slashes()
Code clean-up.
Will merge to 'master'.
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
- diff: run arguments through precompose_argv
Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git. They have been taught to do the normalization.
Will be rerolled?
($gmane/290724)
* ep/trace-doc-sample-fix (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at 0df7357)
+ api-trace.txt: fix typo
Fix a typo in an example in the trace API documentation.
Will merge to 'master'.
* ew/send-email-readable-message-id (2016-04-06) 1 commit
- send-email: more meaningful Message-ID
"git send-email" now uses a more readable timestamps when
formulating a message ID.
Will merge to 'next'.
* mg/complete-cherry-mark-to-log (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at 3002be6)
+ completion: complete --cherry-mark for git log
The completion scripts (in contrib/) did not include the
"--cherry-mark" option when completing "git log <HT>".
Will merge to 'master'.
* tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit
(merged to 'next' on 2016-04-06 at 263bba8)
+ correct blame for files commited with CRLF
When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion. It has been
corrected.
Will merge to 'master'.
* st/verify-tag (2016-04-06) 3 commits
- verify-tag: change variable name for readability
- t7030: test verifying multiple tags
- builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
Only the first three patches in a six-patch series.
* ew/send-email-drop-data-dumper (2016-04-06) 1 commit
- send-email: do not load Data::Dumper
Code clean-up.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* da/user-useconfigonly (2016-04-01) 2 commits
- ident: give "please tell me" message upon useConfigOnly error
- ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
Waiting for Acks.
($gmane/290340)
* sb/clone-shallow-passthru (2016-03-23) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- submodule clone: pass along `local` option
- clone: add `--shallow-submodules` flag
"git clone" learned "--shallow-submodules" option.
Needs review.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* nd/shallow-deepen (2016-02-23) 25 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sb/submodule-init (2016-03-15) 2 commits
. submodule: port init from shell to C
. submodule: port resolve_relative_url from shell to C
Update of "git submodule" to move pieces of logic to C continues.
Needs review.
($gmane/288824)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* dt/refs-backend-lmdb (2016-02-25) 45 commits
. SQUASH??? Minimum compilation band-aid
. tests: add ref-storage argument
. refs: tests for lmdb backend
. refs: add LMDB refs storage backend
. refs: break out resolve_ref_unsafe_submodule
. config: read ref storage config on startup
. refs: register ref storage backends
. svn: learn ref-storage argument
. clone: allow ref storage backend to be set for clone
. refs: check submodules' ref storage config
. init: allow alternate ref strorage to be set for new repos
. refs: always handle non-normal refs in files backend
. refs: resolve symbolic refs first
. refs: on symref reflog expire, lock symref not referrent
. refs: don't dereference on rename
. refs: allow log-only updates
. refs: move duplicate check to common code
. refs: make lock generic
. refs: handle non-normal ref renames
. refs: add method to rename refs
. refs: add methods to init refs db
. refs: add method for delete_refs
. refs: add method for initial ref transaction commit
. refs: add methods for reflog
. refs: add do_for_each_per_worktree_ref
. refs: reduce the visibility of do_for_each_ref()
. refs: add method for do_for_each_ref
. refs: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move resolve_ref_unsafe into common code
. files-backend: break out ref reading
. refs: move for_each_*ref* functions into common code
. refs: move head_ref{,_submodule} to the common code
. Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
. clone: allow an explicit argument for parallel submodule clones
. submodule update: expose parallelism to the user
. git submodule update: have a dedicated helper for cloning
. run_processes_parallel: correctly terminate callbacks with an LF
. run_processes_parallel: rename parameters for the callbacks
. run-command: expose default_{start_failure, task_finished}
. run_processes_parallel: treat output of children as byte array
. submodule update: direct error message to stderr
. fetching submodules: respect `submodule.fetchJobs` config option
. submodule-config: drop check against NULL
. submodule-config: keep update strategy around
A reroll exists, but it seems that will further be rerolled.
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
(merged to 'next' on 2016-04-06 at 25d79bb)
+ git-format-patch.txt: don't show -s as shorthand for multiple options
"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
Will merge to 'master'.
* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit
(merged to 'next' on 2016-04-06 at 1a3f8be)
+ branch: fix shortening of non-remote symrefs
A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
Will merge to 'next' and later down to maint-2.7.
* jn/mergetools-examdiff (2016-04-04) 2 commits
(merged to 'next' on 2016-04-06 at 819e858)
+ mergetools: add support for ExamDiff
+ mergetools: create mergetool_find_win32_cmd() helper function for winmerge
"git mergetools" learned to drive ExamDiff.
Will merge to 'master'.
* kn/for-each-tag-branch (2016-03-30) 1 commit
(merged to 'next' on 2016-04-06 at 4595ad3)
+ for-each-ref: fix description of '--contains' in manpage
A minor documentation update.
Will merge to 'master'.
* kn/ref-filter-branch-list (2016-03-30) 16 commits
. branch: implement '--format' option
. branch: use ref-filter printing APIs
. branch, tag: use porcelain output
. ref-filter: allow porcelain to translate messages in the output
. ref-filter: add support for %(refname:dir) and %(refname:base)
. ref-filter: introduce refname_atom_parser()
. ref-filter: introduce symref_atom_parser()
. ref-filter: make "%(symref)" atom work with the ':short' modifier
. ref-filter: add support for %(upstream:track,nobracket)
. ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
. ref-filter: introduce format_ref_array_item()
. ref-filter: move get_head_description() from branch.c
. ref-filter: modify "%(objectname:short)" to take length
. ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
. ref-filter: include reference to 'used_atom' within 'atom_value'
. ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Will be rerolled.
* oa/doc-diff-check (2016-03-29) 1 commit
(merged to 'next' on 2016-04-06 at e3d6e8d)
+ Documentation: git diff --check detects conflict markers
A minor documentation update.
Will merge to 'master'.
* rz/worktree-no-checkout (2016-03-29) 1 commit
(merged to 'next' on 2016-04-06 at e725216)
+ worktree: add: introduce --checkout option
"git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
Will merge to 'master'.
* sb/misc-cleanups (2016-04-01) 4 commits
(merged to 'next' on 2016-04-06 at 4e63691)
+ credential-cache, send_request: close fd when done
+ bundle: don't leak an fd in case of early return
+ abbrev_sha1_in_line: don't leak memory
+ notes: don't leak memory in git_config_get_notes_strategy
Assorted minor clean-ups.
Will merge to 'master'.
* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
- submodule--helper, module_clone: catch fprintf failure
- submodule--helper: do not borrow absolute_path() result for too long
- submodule--helper, module_clone: always operate on absolute paths
- submodule--helper clone: create the submodule path just once
- submodule--helper: fix potential NULL-dereference
- recursive submodules: test for relative paths
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
Any further comments? Otherwise will merge to 'next'.
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
- t7407: make expectation as clear as possible
- submodule update: test recursive path reporting from subdirectory
- submodule update: align reporting path for custom command execution
- submodule status: correct path handling in recursive submodules
- submodule update --init: correct path handling in recursive submodules
- submodule foreach: correct path display in recursive submodules
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
Any further comments? Otherwise will merge to 'next'.
* sg/diff-multiple-identical-renames (2016-03-30) 1 commit
(merged to 'next' on 2016-04-06 at ac19e48)
+ diffcore: fix iteration order of identical files during rename detection
"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
Will merge to 'master'.
* sk/send-pack-all-fix (2016-03-31) 1 commit
(merged to 'next' on 2016-04-06 at 31e1e1b)
+ git-send-pack: fix --all option when used with directory
"git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
Will merge to 'master'.
* ss/msvc (2016-03-30) 2 commits
(merged to 'next' on 2016-04-06 at 4b53bce)
+ MSVC: use shipped headers instead of fallback definitions
+ MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
Build updates for MSVC.
Will merge to 'master'.
* xy/format-patch-base (2016-03-31) 4 commits
- format-patch: introduce format.base configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will be rerolled.
($gmane/290365)
* tb/safe-crlf-output-fix (2016-04-01) 7 commits
. convert.c: more safer crlf handling with text attribute
. correct blame for files commited with CRLF
. convert: unify the "auto" handling of CRLF
. t0027: test cases for combined attributes
. convert: allow core.autocrlf=input and core.eol=crlf
. convert.c: stream and early out
. read-cache: factor out get_sha1_from_index() helper
The "safe CRLF" facility disables line-end conversion from CRLF to
LF when checking in if the blob registered to the index already
contains CR, but some codepaths like "git blame" did not know this,
and instead assumed that only the configuration and attribute
settings determined how the data from the working tree is converted.
Will be rerolled.
($gmane/290637)
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
(merged to 'next' on 2016-04-06 at 2aab890)
+ submodule-config: use hashmap_iter_first()
Minor code cleanup.
Will merge to 'master'.
* ky/branch-d-worktree (2016-03-29) 1 commit
(merged to 'next' on 2016-04-06 at 00f9bff)
+ branch -d: refuse deleting a branch which is currently checked out
When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree
Will merge to 'master'.
* ky/branch-m-worktree (2016-04-04) 2 commits
(merged to 'next' on 2016-04-06 at e7b285c)
+ branch -m: update all per-worktree HEADs
+ refs: add a new function set_worktree_head_symref
When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
Will merge to 'master'.
* nd/apply-doc (2016-03-24) 2 commits
(merged to 'next' on 2016-04-06 at f9bd355)
+ git-apply.txt: mention the behavior inside a subdir
+ git-apply.txt: remove a space
A minor documentation update.
Will merge to 'master'.
* nd/apply-report-skip (2016-03-24) 1 commit
(merged to 'next' on 2016-04-06 at ae2c824)
+ apply: report patch skipping in verbose mode
"git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
Will merge to 'master'.
* pb/opt-cmdmode-doc (2016-03-25) 1 commit
(merged to 'next' on 2016-04-06 at a5f3835)
+ api-parse-options.txt: document OPT_CMDMODE()
Minor API documentation update.
Will merge to 'master'.
* rt/completion-help (2016-03-24) 2 commits
(merged to 'next' on 2016-04-06 at 8c3ee08)
+ completion: add 'revisions' and 'everyday' to 'git help'
+ completion: add option '--guides' to 'git help'
Shell completion (in contrib/) updates.
Will merge to 'master'.
* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit
(merged to 'next' on 2016-04-06 at 7a766b7)
+ rebase-i: print an abbreviated hash when stop for editing
The commit object name reported when "rebase -i" stops has been
shortened.
Will merge to 'master'.
* jk/check-repository-format (2016-03-11) 10 commits
(merged to 'next' on 2016-04-06 at a0dada0)
+ verify_repository_format: mark messages for translation
+ setup: drop repository_format_version global
+ setup: unify repository version callbacks
+ init: use setup.c's repo version verification
+ setup: refactor repo format reading and verification
+ config: drop git_config_early
+ check_repository_format_gently: stop using git_config_early
+ lazily load core.sharedrepository
+ wrap shared_repository global in get/set accessors
+ setup: document check_repository_format()
The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
Will merge to 'master'.
* mj/pull-rebase-autostash (2016-04-04) 9 commits
(merged to 'next' on 2016-04-06 at b4e4f31)
+ t5520: test --[no-]autostash with pull.rebase=true
+ t5520: reduce commom lines of code
+ t5520: factor out common "failing autostash" code
+ t5520: factor out common "successful autostash" code
+ t5520: use better test to check stderr output
+ t5520: ensure consistent test conditions
+ t5520: use consistent capitalization in test titles
+ pull --rebase: add --[no-]autostash flag
+ git-pull.c: introduce git_pull_config()
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
Will merge to 'master'.
* pb/commit-verbose-config (2016-03-14) 1 commit
(merged to 'next' on 2016-04-06 at e5c744f)
+ commit: add a commit.verbose config variable
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Will merge to 'master'.
* jc/merge-refuse-new-root (2016-03-23) 1 commit
(merged to 'next' on 2016-04-04 at cd70fd6)
+ merge: refuse to create too cool a merge by default
Originally merged to 'next' on 2016-03-23
"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
Will merge to 'master'.
* lt/pretty-expand-tabs (2016-04-04) 4 commits
(merged to 'next' on 2016-04-06 at 186ac2a)
+ pretty: test --expand-tabs
+ pretty: allow tweaking tabwidth in --expand-tabs
+ pretty: enable --expand-tabs by default for selected pretty formats
+ pretty: expand tabs in indented logs to make things line up properly
When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended. The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
'--no-expand-tabs'.
Will merge to 'master'.
* cc/apply (2016-04-01) 4 commits
(merged to 'next' on 2016-04-06 at 2e23c44)
+ builtin/apply: free patch when parse_chunk() fails
+ builtin/apply: handle parse_binary() failure
+ apply: remove unused call to free() in gitdiff_{old,new}name()
+ builtin/apply: get rid of useless 'name' variable
Minor code clean-up.
Will merge to 'master'.
* dt/index-helper (2016-03-23) 18 commits
- SQUASH - minimum compilation fix
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- Add watchman support to reduce index refresh cost
- read-cache: invalidate untracked cache data when reading WAMA
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
Needs review.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2016-04-06) 11 commits
- rerere: adjust 'forget' to multi-variant world order
- rerere: split code to call ll_merge() further
- rerere: move code related to "forget" together
- rerere: gc and clear
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
Will merge to 'next'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
It has been reported that git-gui still uses the deprecated syntax,
which needs to be fixed before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Apr 2016, #02; Mon, 4)
@ 2016-04-04 21:26 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-04 21:26 UTC (permalink / raw)
To: git; +Cc: David A. Greene, Doug Kelly, Marios Titas, SZEDER Gábor
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The tip of 'next' has been rewound, the first maintenance release
v2.8.1 that most everybody can safely ignore has been tagged, and
the first batch of topics that have been cooking in 'next' during
the pre-2.8 freeze period are now in 'master'.
There are a handful of topics that are stuck; they are marked as
"Needs review", "Needs an Ack", "Waiting for reroll" etc. in the
following list.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
- git-format-patch.txt: don't show -s as shorthand for multiple options
"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command. We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.
Will merge to next.
* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit
- branch: fix shortening of non-remote symrefs
A change back in version 2.7 to "git branch" broke display of a
symbolic refs in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
Will merge to next.
and later down to maint-2.7.
--------------------------------------------------
[Graduated to "master"]
* es/test-gpg-tags (2016-03-06) 4 commits
(merged to 'next' on 2016-03-15 at 617119f)
+ t6302: skip only signed tags rather than all tests when GPG is missing
+ t6302: also test annotated in addition to signed tags
+ t6302: normalize names and descriptions of signed tags
+ lib-gpg: drop unnecessary "missing GPG" warning
A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
(merged to 'next' on 2016-03-06 at 5628860)
+ fetch-pack: update the documentation for "<refs>..." arguments
(merged to 'next' on 2016-03-04 at 49199e0)
+ fetch-pack: fix object_id of exact sha1
Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
* jc/index-pack (2016-03-03) 2 commits
(merged to 'next' on 2016-03-15 at 42efaa7)
+ index-pack: add a helper function to derive .idx/.keep filename
+ Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
Code clean-up.
* jc/maint-index-pack-keep (2016-03-03) 1 commit
(merged to 'next' on 2016-03-04 at bc1d37a)
+ index-pack: correct --keep[=<msg>]
(this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
* jk/add-i-highlight (2016-02-28) 1 commit
(merged to 'next' on 2016-03-04 at 4ac3aa1)
+ add--interactive: allow custom diff highlighting programs
A new "interactive.diffFilter" configuration can be used to
customize the diff shown in "git add -i" session.
* jk/config-get-urlmatch (2016-02-28) 3 commits
(merged to 'next' on 2016-03-04 at feeb192)
+ Documentation/git-config: fix --get-all description
+ Documentation/git-config: use bulleted list for exit codes
+ config: fail if --get-urlmatch finds no value
"git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
* jk/credential-clear-config (2016-02-26) 1 commit
(merged to 'next' on 2016-03-04 at f7b26b7)
+ credential: let empty credential specs reset helper list
The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
(merged to 'next' on 2016-03-15 at e70d4bd)
+ strbuf_getwholeline: NUL-terminate getdelim buffer on error
strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
(merged to 'next' on 2016-03-04 at a0300d5)
+ rev-parse: let some options run outside repository
+ t1515: add tests for rev-parse out-of-repo helpers
The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
* jk/startup-info (2016-03-07) 6 commits
(merged to 'next' on 2016-03-15 at eb95e5f)
+ use setup_git_directory() in test-* programs
+ grep: turn off gitlink detection for --no-index
+ mailmap: do not resolve blobs in a non-repository
+ remote: don't resolve HEAD in non-repository
+ setup: set startup_info->have_repository more reliably
+ setup: make startup_info available everywhere
The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
* mm/diff-renames-default (2016-02-25) 5 commits
(merged to 'next' on 2016-02-25 at 947c399)
+ diff: activate diff.renames by default
+ log: introduce init_log_defaults()
+ t: add tests for diff.renames (true/false/unset)
+ t4001-diff-rename: wrap file creations in a test
+ Documentation/diff-config: fix description of diff.renames
The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
* mm/lockfile-error-message (2016-03-01) 2 commits
(merged to 'next' on 2016-03-04 at 04ed7e6)
+ lockfile: improve error message when lockfile exists
+ lockfile: mark strings for translation
* mm/readme-markdown (2016-04-01) 2 commits
- git.spec: use README.md, not README
(merged to 'next' on 2016-03-01 at 81f3858)
+ README.md: don't take 'commandname' literally
The top-level README file has been updated to be more appropriate
for the sign on the front door to welcome new acquaintances to Git
by toning down inside jokes and making it into MarkDown.
* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
(merged to 'next' on 2016-02-26 at f0a54e5)
+ upload-pack: use argv_array for pack_objects
The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
(merged to 'next' on 2016-03-15 at f72755e)
+ xdiff/xprepare: fix a memory leak
+ xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
A small memory leak in an error codepath has been plugged in xdiff
code.
--------------------------------------------------
[Stalled]
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* jn/mergetools-examdiff (2016-04-04) 2 commits
- mergetools: add support for ExamDiff
- mergetools: create mergetool_find_win32_cmd() helper function for winmerge
"git mergetools" learned to drive ExamDiff.
Will merge to 'next'.
* kn/for-each-tag-branch (2016-03-30) 1 commit
- for-each-ref: fix description of '--contains' in manpage
Docfix.
Will merge to 'next'.
* kn/ref-filter-branch-list (2016-03-30) 16 commits
. branch: implement '--format' option
. branch: use ref-filter printing APIs
. branch, tag: use porcelain output
. ref-filter: allow porcelain to translate messages in the output
. ref-filter: add support for %(refname:dir) and %(refname:base)
. ref-filter: introduce refname_atom_parser()
. ref-filter: introduce symref_atom_parser()
. ref-filter: make "%(symref)" atom work with the ':short' modifier
. ref-filter: add support for %(upstream:track,nobracket)
. ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
. ref-filter: introduce format_ref_array_item()
. ref-filter: move get_head_description() from branch.c
. ref-filter: modify "%(objectname:short)" to take length
. ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
. ref-filter: include reference to 'used_atom' within 'atom_value'
. ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Will be rerolled.
* oa/doc-diff-check (2016-03-29) 1 commit
- Documentation: git diff --check detects conflict markers
Docfix.
Will merge to 'next'.
* rz/worktree-no-checkout (2016-03-29) 1 commit
- worktree: add: introduce --checkout option
"git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
Will merge to 'next'.
* sb/misc-cleanups (2016-04-01) 4 commits
- credential-cache, send_request: close fd when done
- bundle: don't leak an fd in case of early return
- abbrev_sha1_in_line: don't leak memory
- notes: don't leak memory in git_config_get_notes_strategy
Assorted minor clean-ups.
Will merge to 'next'.
* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
- submodule--helper, module_clone: catch fprintf failure
- submodule--helper: do not borrow absolute_path() result for too long
- submodule--helper, module_clone: always operate on absolute paths
- submodule--helper clone: create the submodule path just once
- submodule--helper: fix potential NULL-dereference
- recursive submodules: test for relative paths
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
Any further comments? Otherwise will merge to 'next'.
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
- t7407: make expectation as clear as possible
- submodule update: test recursive path reporting from subdirectory
- submodule update: align reporting path for custom command execution
- submodule status: correct path handling in recursive submodules
- submodule update --init: correct path handling in recursive submodules
- submodule foreach: correct path display in recursive submodules
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
Any further comments? Otherwise will merge to 'next'.
* sg/diff-multiple-identical-renames (2016-03-30) 1 commit
- diffcore: fix iteration order of identical files during rename detection
"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in 2.0 timeframe.
Will merge to 'next'.
* sk/send-pack-all-fix (2016-03-31) 1 commit
- git-send-pack: fix --all option when used with directory
"git send-pack --all <there>" was broken when its command line
option parsing was written in 2.6 timeframe.
Will merge to 'next'.
* ss/msvc (2016-03-30) 2 commits
- MSVC: use shipped headers instead of fallback definitions
- MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
Will merge to 'next'.
* xy/format-patch-base (2016-03-31) 4 commits
- format-patch: introduce format.base configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will be rerolled.
($gmane/290365)
* da/user-useconfigonly (2016-04-01) 2 commits
- ident: give "please tell me" message upon useConfigOnly error
- ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
Waiting for Acks.
($gmane/290340)
* tb/safe-crlf-output-fix (2016-04-01) 7 commits
. convert.c: more safer crlf handling with text attribute
. correct blame for files commited with CRLF
. convert: unify the "auto" handling of CRLF
. t0027: test cases for combined attributes
. convert: allow core.autocrlf=input and core.eol=crlf
. convert.c: stream and early out
. read-cache: factor out get_sha1_from_index() helper
The "safe CRLF" facility disables line-end conversion from CRLF to
LF when checking in if the blob registered to the index already
contains CR, but some codepaths like "git blame" did not know this,
and instead assumed that only the configuration and attribute
settings determined how the data from the working tree is converted.
Will be rerolled.
($gmane/290637)
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
- submodule-config: use hashmap_iter_first()
Minor code cleanup.
Will merge to 'next'.
* ky/branch-d-worktree (2016-03-29) 1 commit
- branch -d: refuse deleting a branch which is currently checked out
When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree
Will merge to 'next'.
* ky/branch-m-worktree (2016-04-04) 2 commits
- branch -m: update all per-worktree HEADs
- refs: add a new function set_worktree_head_symref
When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
Will merge to 'next'.
* nd/apply-doc (2016-03-24) 2 commits
- git-apply.txt: mention the behavior inside a subdir
- git-apply.txt: remove a space
Will merge to 'next'.
* nd/apply-report-skip (2016-03-24) 1 commit
- apply: report patch skipping in verbose mode
"git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
Will merge to 'next'.
* pb/opt-cmdmode-doc (2016-03-25) 1 commit
- api-parse-options.txt: document OPT_CMDMODE()
Minor API documentation update.
Will merge to 'next'.
* rt/completion-help (2016-03-24) 2 commits
- completion: add 'revisions' and 'everyday' to 'git help'
- completion: add option '--guides' to 'git help'
Shell completion (in contrib/) updates.
Will merge to 'next'.
* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit
- rebase-i: print an abbreviated hash when stop for editing
The commit object name reported when "rebase -i" stops has been
shortened.
Will merge to 'next'.
* jk/check-repository-format (2016-03-11) 10 commits
- verify_repository_format: mark messages for translation
- setup: drop repository_format_version global
- setup: unify repository version callbacks
- init: use setup.c's repo version verification
- setup: refactor repo format reading and verification
- config: drop git_config_early
- check_repository_format_gently: stop using git_config_early
- lazily load core.sharedrepository
- wrap shared_repository global in get/set accessors
- setup: document check_repository_format()
The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
Will merge to 'next'.
* mj/pull-rebase-autostash (2016-04-04) 9 commits
- t5520: test --[no-]autostash with pull.rebase=true
- t5520: reduce commom lines of code
- t5520: factor out common "failing autostash" code
- t5520: factor out common "successful autostash" code
- t5520: use better test to check stderr output
- t5520: ensure consistent test conditions
- t5520: use consistent capitalization in test titles
- pull --rebase: add --[no-]autostash flag
- git-pull.c: introduce git_pull_config()
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
Will merge to 'next'.
* pb/commit-verbose-config (2016-03-14) 1 commit
- commit: add a commit.verbose config variable
(this branch uses pb/t7502-drop-dup.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Will merge to 'next'.
* pb/t7502-drop-dup (2016-03-11) 1 commit
(merged to 'next' on 2016-04-04 at 4799cad)
+ t/t7502 : drop duplicate test
(this branch is used by pb/commit-verbose-config.)
Originally merged to 'next' on 2016-03-15
Code clean-up.
Will merge to 'master' after 2.8 final.
* ss/commit-squash-msg (2016-03-21) 1 commit
(merged to 'next' on 2016-04-04 at d389f19)
+ commit: do not lose SQUASH_MSG contents
Originally merged to 'next' on 2016-03-23
When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
Will merge to 'master' after 2.8 final.
* ls/p4-map-user (2016-03-15) 1 commit
(merged to 'next' on 2016-04-04 at a56b011)
+ git-p4: map a P4 user to Git author name and email address
Originally merged to 'next' on 2016-03-23
"git p4" now allows P4 author names to be mapped to Git author
names.
Will merge to 'master' after 2.8 final.
* jc/merge-refuse-new-root (2016-03-23) 1 commit
(merged to 'next' on 2016-04-04 at cd70fd6)
+ merge: refuse to create too cool a merge by default
Originally merged to 'next' on 2016-03-23
"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
Will merge to 'master' after 2.8 final.
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
(merged to 'next' on 2016-04-04 at 50427fe)
+ credential-cache--daemon: clarify "exit" action semantics
Originally merged to 'next' on 2016-03-23
A code clarification.
Will merge to 'master' after 2.8 final.
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
(merged to 'next' on 2016-04-04 at 4d54956)
+ send-email: ignore trailing whitespace in mailrc alias file
Originally merged to 'next' on 2016-03-23
"git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.
Will merge to 'master' after 2.8 final.
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
(merged to 'next' on 2016-04-04 at 5fa6274)
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Originally merged to 'next' on 2016-03-23
The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.
Will merge to 'master' after 2.8 final.
* lt/pretty-expand-tabs (2016-03-30) 3 commits
- pretty: allow tweaking tabwidth in --expand-tabs
- pretty: enable --expand-tabs by default for selected pretty formats
- pretty: expand tabs in indented logs to make things line up properly
Needs tests.
* sb/clone-shallow-passthru (2016-03-23) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- submodule clone: pass along `local` option
- clone: add `--shallow-submodules` flag
(this branch uses sb/submodule-parallel-update; is tangled with sb/submodule-init.)
"git clone" learned "--shallow-submodules" option.
Needs review.
* sb/clone-t57-t56 (2016-03-16) 1 commit
(merged to 'next' on 2016-04-04 at 5c20247)
+ clone tests: rename t57* => t56*
Originally merged to 'next' on 2016-03-23
Rename bunch of tests on "git clone" for better organization.
Will merge to 'master' after 2.8 final.
* sb/rebase-x (2016-03-18) 2 commits
(merged to 'next' on 2016-04-04 at feda620)
+ t3404: cleanup double empty lines between tests
+ rebase: decouple --exec from --interactive
Originally merged to 'next' on 2016-03-23
"git rebase -x" can be used without passing "-i" option.
Will merge to 'master' after 2.8 final.
* cc/apply (2016-04-01) 4 commits
- builtin/apply: free patch when parse_chunk() fails
- builtin/apply: handle parse_binary() failure
- apply: remove unused call to free() in gitdiff_{old,new}name()
- builtin/apply: get rid of useless 'name' variable
Minor code clean-up.
Will merge to 'next'.
* dt/index-helper (2016-03-23) 18 commits
- SQUASH - minimum compilation fix
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- Add watchman support to reduce index refresh cost
- read-cache: invalidate untracked cache data when reading WAMA
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
* jv/merge-nothing-into-void (2016-03-23) 1 commit
(merged to 'next' on 2016-04-04 at aa37405)
+ merge: fix NULL pointer dereference when merging nothing into void
Originally merged to 'next' on 2016-03-23
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
Will merge to 'master' after 2.8 final.
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
(merged to 'next' on 2016-04-04 at a49ec4a)
+ tag: add the option to force signing of annotated tags
Originally merged to 'next' on 2016-03-24
"git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
Will merge to 'master' after 2.8 final.
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
(merged to 'next' on 2016-04-04 at 26f94c0)
+ Documentation: talk about pager in api-trace.txt
Originally merged to 'next' on 2016-03-23
A minor documentation update.
Will merge to 'master' after 2.8 final.
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
(merged to 'next' on 2016-04-04 at 34e645f)
+ mergetool: honor tempfile configuration when resolving delete conflicts
+ mergetool: support delete/delete conflicts
Originally merged to 'next' on 2016-03-15
"git mergetool" did not work well with conflicts that both sides
deleted.
Will merge to 'master' after 2.8 final.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
(merged to 'next' on 2016-04-04 at 9f0207e)
+ dir: store EXC_FLAG_* values in unsigned integers
Originally merged to 'next' on 2016-03-04
Code clean-up.
Will merge to 'master' after 2.8 final.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ss/receive-pack-parse-options (2016-03-01) 1 commit
(merged to 'next' on 2016-04-04 at fd6ab4c)
+ builtin/receive-pack.c: use parse_options API
Originally merged to 'next' on 2016-03-04
The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
Will merge to 'master' after 2.8 final.
* jk/submodule-c-credential (2016-03-23) 7 commits
(merged to 'next' on 2016-04-04 at 8de8e8c)
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
+ git: submodule honor -c credential.* from command line
+ quote: implement sq_quotef()
+ submodule: fix segmentation fault in submodule--helper clone
+ submodule: fix submodule--helper clone usage
+ submodule: check argc count for git submodule--helper clone
+ submodule: don't pass empty string arguments to submodule--helper clone
Originally merged to 'next' on 2016-03-23
"git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
Will merge to 'master' after 2.8 final.
* nd/shallow-deepen (2016-02-23) 25 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* sb/submodule-init (2016-03-15) 2 commits
. submodule: port init from shell to C
. submodule: port resolve_relative_url from shell to C
(this branch uses sb/submodule-parallel-update; is tangled with sb/clone-shallow-passthru.)
Update of "git submodule" to move pieces of logic to C continues.
Needs review.
($gmane/288824)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* sb/submodule-parallel-update (2016-03-01) 10 commits
(merged to 'next' on 2016-04-04 at a0aea8d)
+ clone: allow an explicit argument for parallel submodule clones
+ submodule update: expose parallelism to the user
+ submodule helper: remove double 'fatal: ' prefix
+ git submodule update: have a dedicated helper for cloning
+ run_processes_parallel: rename parameters for the callbacks
+ run_processes_parallel: treat output of children as byte array
+ submodule update: direct error message to stderr
+ fetching submodules: respect `submodule.fetchJobs` config option
+ submodule-config: drop check against NULL
+ submodule-config: keep update strategy around
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
Originally merged to 'next' on 2016-03-15
A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.
Will merge to 'master' after 2.8 final.
* dt/refs-backend-lmdb (2016-02-25) 45 commits
. SQUASH??? Minimum compilation band-aid
. tests: add ref-storage argument
. refs: tests for lmdb backend
. refs: add LMDB refs storage backend
. refs: break out resolve_ref_unsafe_submodule
. config: read ref storage config on startup
. refs: register ref storage backends
. svn: learn ref-storage argument
. clone: allow ref storage backend to be set for clone
. refs: check submodules' ref storage config
. init: allow alternate ref strorage to be set for new repos
. refs: always handle non-normal refs in files backend
. refs: resolve symbolic refs first
. refs: on symref reflog expire, lock symref not referrent
. refs: don't dereference on rename
. refs: allow log-only updates
. refs: move duplicate check to common code
. refs: make lock generic
. refs: handle non-normal ref renames
. refs: add method to rename refs
. refs: add methods to init refs db
. refs: add method for delete_refs
. refs: add method for initial ref transaction commit
. refs: add methods for reflog
. refs: add do_for_each_per_worktree_ref
. refs: reduce the visibility of do_for_each_ref()
. refs: add method for do_for_each_ref
. refs: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move resolve_ref_unsafe into common code
. files-backend: break out ref reading
. refs: move for_each_*ref* functions into common code
. refs: move head_ref{,_submodule} to the common code
. Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
. clone: allow an explicit argument for parallel submodule clones
. submodule update: expose parallelism to the user
. git submodule update: have a dedicated helper for cloning
. run_processes_parallel: correctly terminate callbacks with an LF
. run_processes_parallel: rename parameters for the callbacks
. run-command: expose default_{start_failure, task_finished}
. run_processes_parallel: treat output of children as byte array
. submodule update: direct error message to stderr
. fetching submodules: respect `submodule.fetchJobs` config option
. submodule-config: drop check against NULL
. submodule-config: keep update strategy around
A reroll exists, but it seems that will further be rerolled.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2016-03-28) 11 commits
- rerere: adjust 'forget' to multi-variant world order
- rerere: split code to call ll_merge() further
- rerere: move code related to "forget" together
- rerere: gc and clear
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
Need to send out the final round of review as this should be now complete.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Apr 2016, #01; Fri, 1)
@ 2016-04-01 22:47 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-04-01 22:47 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
There are quite a few topics that have been cooking in 'next' during
the pre-2.8 freeze period that are ready to be merged to 'master';
the first batch will be merged early next week, and then the tip of
'next' will be rebuilt on top sometime mid next week. Let's start
looking at new shiny toys after all that happens.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* jn/mergetools-examdiff (2016-03-28) 2 commits
- mergetools: add support for ExamDiff
- mergetools: create mergetool_find_win32_cmd() helper function for winmerge
"git mergetools" learned to drive ExamDiff.
Waiting for an Ack by the area expert.
* kn/for-each-tag-branch (2016-03-30) 1 commit
- for-each-ref: fix description of '--contains' in manpage
Docfix.
Will merge to 'next'.
* kn/ref-filter-branch-list (2016-03-30) 16 commits
. branch: implement '--format' option
. branch: use ref-filter printing APIs
. branch, tag: use porcelain output
. ref-filter: allow porcelain to translate messages in the output
. ref-filter: add support for %(refname:dir) and %(refname:base)
. ref-filter: introduce refname_atom_parser()
. ref-filter: introduce symref_atom_parser()
. ref-filter: make "%(symref)" atom work with the ':short' modifier
. ref-filter: add support for %(upstream:track,nobracket)
. ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
. ref-filter: introduce format_ref_array_item()
. ref-filter: move get_head_description() from branch.c
. ref-filter: modify "%(objectname:short)" to take length
. ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
. ref-filter: include reference to 'used_atom' within 'atom_value'
. ref-filter: implement %(if), %(then), and %(else) atoms
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.
Will be rerolled.
* oa/doc-diff-check (2016-03-29) 1 commit
- Documentation: git diff --check detects conflict markers
Docfix.
Will merge to 'next'.
* rz/worktree-no-checkout (2016-03-29) 1 commit
- worktree: add: introduce --checkout option
"git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.
Will merge to 'next'.
* sb/misc-cleanups (2016-04-01) 4 commits
- credential-cache, send_request: close fd when done
- bundle: don't leak an fd in case of early return
- abbrev_sha1_in_line: don't leak memory
- notes: don't leak memory in git_config_get_notes_strategy
Assorted minor clean-ups.
Will merge to 'next'.
* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
- submodule--helper, module_clone: catch fprintf failure
- submodule--helper: do not borrow absolute_path() result for too long
- submodule--helper, module_clone: always operate on absolute paths
- submodule--helper clone: create the submodule path just once
- submodule--helper: fix potential NULL-dereference
- recursive submodules: test for relative paths
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
Any further comments? Otherwise will merge to 'next'.
* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
- t7407: make expectation as clear as possible
- submodule update: test recursive path reporting from subdirectory
- submodule update: align reporting path for custom command execution
- submodule status: correct path handling in recursive submodules
- submodule update --init: correct path handling in recursive submodules
- submodule foreach: correct path display in recursive submodules
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.
Any further comments? Otherwise will merge to 'next'.
* sg/diff-multiple-identical-renames (2016-03-30) 1 commit
- diffcore: fix iteration order of identical files during rename detection
"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in 2.0 timeframe.
Will merge to 'next'.
* sk/send-pack-all-fix (2016-03-31) 1 commit
- git-send-pack: fix --all option when used with directory
"git send-pack --all <there>" was broken when its command line
option parsing was written in 2.6 timeframe.
Will merge to 'next'.
* ss/msvc (2016-03-30) 2 commits
- MSVC: use shipped headers instead of fallback definitions
- MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
Will merge to 'next'.
* xy/format-patch-base (2016-03-31) 4 commits
- format-patch: introduce format.base configuration
- format-patch: introduce --base=auto option
- format-patch: add '--base' option to record base tree info
- patch-ids: make commit_patch_id() a public helper function
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
Will be rerolled.
($gmane/290365)
* da/user-useconfigonly (2016-04-01) 2 commits
- ident: give "please tell me" message upon useConfigOnly error
- ident: check for useConfigOnly before auto-detection of name/email
The "user.useConfigOnly" configuration variable makes it an error
if users do not explicitly set user.name and user.email. However,
its check was not done early enough and allowed another error to
trigger, reporting that the default value we guessed from the
system setting was unusable. This was a suboptimal end-user
experience as we want the users to set user.name/user.email without
relying on the auto-detection at all.
Waiting for Acks.
($gmane/290340)
* tb/safe-crlf-output-fix (2016-04-01) 7 commits
- convert.c: more safer crlf handling with text attribute
- correct blame for files commited with CRLF
- convert: unify the "auto" handling of CRLF
- t0027: test cases for combined attributes
- convert: allow core.autocrlf=input and core.eol=crlf
- convert.c: stream and early out
- read-cache: factor out get_sha1_from_index() helper
The "safe CRLF" facility disables line-end conversion from CRLF to
LF when checking in if the blob registered to the index already
contains CR, but some codepaths like "git blame" did not know this,
and instead assumed that only the configuration and attribute
settings determined how the data from the working tree is converted.
Comments sent.
($gmane/290548)
--------------------------------------------------
[Stalled]
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
- submodule-config: use hashmap_iter_first()
Minor code cleanup.
Will merge to 'next'.
* ky/branch-d-worktree (2016-03-29) 1 commit
- branch -d: refuse deleting a branch which is currently checked out
When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree
Will merge to 'next'.
* ky/branch-m-worktree (2016-03-28) 2 commits
- branch -m: update all per-worktree HEADs
- refs: add a new function set_worktree_head_symref
When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
Needs review by "refs" area experts.
* nd/apply-doc (2016-03-24) 2 commits
- git-apply.txt: mention the behavior inside a subdir
- git-apply.txt: remove a space
Will merge to 'next'.
* nd/apply-report-skip (2016-03-24) 1 commit
- apply: report patch skipping in verbose mode
"git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
Will merge to 'next'.
* pb/opt-cmdmode-doc (2016-03-25) 1 commit
- api-parse-options.txt: document OPT_CMDMODE()
Minor API documentation update.
* rt/completion-help (2016-03-24) 2 commits
- completion: add 'revisions' and 'everyday' to 'git help'
- completion: add option '--guides' to 'git help'
Shell completion (in contrib/) updates.
Will merge to 'next'.
* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit
- rebase-i: print an abbreviated hash when stop for editing
The commit object name reported when "rebase -i" stops has been
shortened.
Will merge to 'next'.
* jk/check-repository-format (2016-03-11) 10 commits
- verify_repository_format: mark messages for translation
- setup: drop repository_format_version global
- setup: unify repository version callbacks
- init: use setup.c's repo version verification
- setup: refactor repo format reading and verification
- config: drop git_config_early
- check_repository_format_gently: stop using git_config_early
- lazily load core.sharedrepository
- wrap shared_repository global in get/set accessors
- setup: document check_repository_format()
The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
Will merge to 'next'.
* mj/pull-rebase-autostash (2016-03-29) 7 commits
- t5520: test --[no-]autostash with pull.rebase=true
- t5520: modify tests to reduce common code
- t5520: use test_i18ngrep instead of test_cmp
- t5520: explicitly unset rebase.autostash
- t5520: use consistent capitalization in test titles
(merged to 'next' on 2016-03-23 at ebf1afa)
+ pull --rebase: add --[no-]autostash flag
+ git-pull.c: introduce git_pull_config()
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
Will merge to 'next'.
* pb/commit-verbose-config (2016-03-14) 1 commit
- commit: add a commit.verbose config variable
(this branch uses pb/t7502-drop-dup.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was
given from the command line.
Will merge to 'next'.
* pb/t7502-drop-dup (2016-03-11) 1 commit
(merged to 'next' on 2016-03-15 at 037c877)
+ t/t7502 : drop duplicate test
(this branch is used by pb/commit-verbose-config.)
Code clean-up.
Will merge to 'master' after 2.8 final.
* ss/commit-squash-msg (2016-03-21) 1 commit
(merged to 'next' on 2016-03-23 at 0b72631)
+ commit: do not lose SQUASH_MSG contents
When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
Will merge to 'master' after 2.8 final.
* ls/p4-map-user (2016-03-15) 1 commit
(merged to 'next' on 2016-03-23 at 9e0a4f5)
+ git-p4: map a P4 user to Git author name and email address
Will merge to 'master' after 2.8 final.
* jc/merge-refuse-new-root (2016-03-23) 1 commit
(merged to 'next' on 2016-03-23 at d7da4cf)
+ merge: refuse to create too cool a merge by default
"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
Will merge to 'master' after 2.8 final.
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at d2b8cc7)
+ credential-cache--daemon: clarify "exit" action semantics
Will merge to 'master' after 2.8 final.
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at 74f1f44)
+ send-email: ignore trailing whitespace in mailrc alias file
Will merge to 'master' after 2.8 final.
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at 245263b)
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Will merge to 'master' after 2.8 final.
* lt/pretty-expand-tabs (2016-03-30) 3 commits
- pretty: allow tweaking tabwidth in --expand-tabs
- pretty: enable --expand-tabs by default for selected pretty formats
- pretty: expand tabs in indented logs to make things line up properly
Needs tests.
* sb/clone-shallow-passthru (2016-03-23) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- submodule clone: pass along `local` option
- clone: add `--shallow-submodules` flag
(this branch uses sb/submodule-parallel-update; is tangled with sb/submodule-init.)
"git clone" learned "--shallow-submodules" option.
Needs review.
* sb/clone-t57-t56 (2016-03-16) 1 commit
(merged to 'next' on 2016-03-23 at 5df850d)
+ clone tests: rename t57* => t56*
Rename bunch of tests on "git clone" for better organization.
Will merge to 'master' after 2.8 final.
* sb/rebase-x (2016-03-18) 2 commits
(merged to 'next' on 2016-03-23 at ef8861b)
+ t3404: cleanup double empty lines between tests
+ rebase: decouple --exec from --interactive
"git rebase -x" can be used without passing "-i" option.
Will merge to 'master' after 2.8 final.
* cc/apply (2016-04-01) 4 commits
- builtin/apply: free patch when parse_chunk() fails
- builtin/apply: handle parse_binary() failure
(merged to 'next' on 2016-03-24 at 70623f2)
+ apply: remove unused call to free() in gitdiff_{old,new}name()
+ builtin/apply: get rid of useless 'name' variable
Code clean-up.
Will merge to 'next'.
* dt/index-helper (2016-03-23) 18 commits
- SQUASH - minimum compilation fix
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- Add watchman support to reduce index refresh cost
- read-cache: invalidate untracked cache data when reading WAMA
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
* jv/merge-nothing-into-void (2016-03-23) 1 commit
(merged to 'next' on 2016-03-23 at 40b905d)
+ merge: fix NULL pointer dereference when merging nothing into void
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
Will merge to 'master' after 2.8 final.
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
(merged to 'next' on 2016-03-24 at 424da3f)
+ tag: add the option to force signing of annotated tags
"git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
Will merge to 'master' after 2.8 final.
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
(merged to 'next' on 2016-03-23 at 086b9f2)
+ Documentation: talk about pager in api-trace.txt
Will merge to 'master' after 2.8 final.
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
(merged to 'next' on 2016-03-15 at 281a81a)
+ mergetool: honor tempfile configuration when resolving delete conflicts
+ mergetool: support delete/delete conflicts
"git mergetool" did not work well with conflicts that both sides
deleted.
Will merge to 'master' after 2.8 final.
* es/test-gpg-tags (2016-03-06) 4 commits
(merged to 'next' on 2016-03-15 at 617119f)
+ t6302: skip only signed tags rather than all tests when GPG is missing
+ t6302: also test annotated in addition to signed tags
+ t6302: normalize names and descriptions of signed tags
+ lib-gpg: drop unnecessary "missing GPG" warning
A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
Will merge to 'master' after 2.8 final.
* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
(merged to 'next' on 2016-03-15 at e70d4bd)
+ strbuf_getwholeline: NUL-terminate getdelim buffer on error
strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
Will merge to 'master' after 2.8 final.
* jk/startup-info (2016-03-07) 6 commits
(merged to 'next' on 2016-03-15 at eb95e5f)
+ use setup_git_directory() in test-* programs
+ grep: turn off gitlink detection for --no-index
+ mailmap: do not resolve blobs in a non-repository
+ remote: don't resolve HEAD in non-repository
+ setup: set startup_info->have_repository more reliably
+ setup: make startup_info available everywhere
The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
Will merge to 'master' after 2.8 final.
* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
(merged to 'next' on 2016-03-15 at f72755e)
+ xdiff/xprepare: fix a memory leak
+ xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
A small memory leak in an error codepath has been plugged in xdiff
code.
Will merge to 'master' after 2.8 final.
* jc/index-pack (2016-03-03) 2 commits
(merged to 'next' on 2016-03-15 at 42efaa7)
+ index-pack: add a helper function to derive .idx/.keep filename
+ Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
Code clean-up.
Will merge to 'master' after 2.8 final.
* jc/maint-index-pack-keep (2016-03-03) 1 commit
(merged to 'next' on 2016-03-04 at bc1d37a)
+ index-pack: correct --keep[=<msg>]
(this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
Will merge to 'master' after 2.8 final.
* mm/readme-markdown (2016-04-01) 2 commits
- git.spec: use README.md, not README
(merged to 'next' on 2016-03-01 at 81f3858)
+ README.md: don't take 'commandname' literally
The top-level README file has been updated to be more appropriate
for the sign on the front door to welcome new acquaintances to Git
by toning down inside jokes and making it into MarkDown.
Will merge to 'next'.
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
(merged to 'next' on 2016-03-06 at 5628860)
+ fetch-pack: update the documentation for "<refs>..." arguments
(merged to 'next' on 2016-03-04 at 49199e0)
+ fetch-pack: fix object_id of exact sha1
Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
Will merge to 'master' after 2.8 final.
* jk/add-i-highlight (2016-02-28) 1 commit
(merged to 'next' on 2016-03-04 at 4ac3aa1)
+ add--interactive: allow custom diff highlighting programs
Will merge to 'master' after 2.8 final.
* jk/config-get-urlmatch (2016-02-28) 3 commits
(merged to 'next' on 2016-03-04 at feeb192)
+ Documentation/git-config: fix --get-all description
+ Documentation/git-config: use bulleted list for exit codes
+ config: fail if --get-urlmatch finds no value
"git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
Will merge to 'master' after 2.8 final.
* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
(merged to 'next' on 2016-03-04 at a0300d5)
+ rev-parse: let some options run outside repository
+ t1515: add tests for rev-parse out-of-repo helpers
The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
Will merge to 'master' after 2.8 final.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* mm/lockfile-error-message (2016-03-01) 2 commits
(merged to 'next' on 2016-03-04 at 04ed7e6)
+ lockfile: improve error message when lockfile exists
+ lockfile: mark strings for translation
Will merge to 'master' after 2.8 final.
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
(merged to 'next' on 2016-03-04 at 5ea48c7)
+ dir: store EXC_FLAG_* values in unsigned integers
Will merge to 'master' after 2.8 final.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
(this branch uses jc/index-pack and jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ss/receive-pack-parse-options (2016-03-01) 1 commit
(merged to 'next' on 2016-03-04 at c577ea7)
+ builtin/receive-pack.c: use parse_options API
The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
Will merge to 'master' after 2.8 final.
* jk/credential-clear-config (2016-02-26) 1 commit
(merged to 'next' on 2016-03-04 at f7b26b7)
+ credential: let empty credential specs reset helper list
The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
Will merge to 'master' after 2.8 final.
* jk/submodule-c-credential (2016-03-23) 7 commits
(merged to 'next' on 2016-03-23 at 952367a)
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
(merged to 'next' on 2016-03-15 at 81df5b1)
+ git: submodule honor -c credential.* from command line
+ quote: implement sq_quotef()
+ submodule: fix segmentation fault in submodule--helper clone
+ submodule: fix submodule--helper clone usage
+ submodule: check argc count for git submodule--helper clone
+ submodule: don't pass empty string arguments to submodule--helper clone
"git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
Will merge to 'master' after 2.8 final.
* nd/shallow-deepen (2016-02-23) 25 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* mm/diff-renames-default (2016-02-25) 5 commits
(merged to 'next' on 2016-02-25 at 947c399)
+ diff: activate diff.renames by default
+ log: introduce init_log_defaults()
+ t: add tests for diff.renames (true/false/unset)
+ t4001-diff-rename: wrap file creations in a test
+ Documentation/diff-config: fix description of diff.renames
The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
Will merge to 'master' after 2.8 final.
* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
(merged to 'next' on 2016-02-26 at f0a54e5)
+ upload-pack: use argv_array for pack_objects
The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
Will merge to 'master' after 2.8 final.
* sb/submodule-init (2016-03-15) 2 commits
. submodule: port init from shell to C
. submodule: port resolve_relative_url from shell to C
(this branch uses sb/submodule-parallel-update; is tangled with sb/clone-shallow-passthru.)
Update of "git submodule" to move pieces of logic to C continues.
Needs review.
($gmane/288824)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* sb/submodule-parallel-update (2016-03-01) 10 commits
(merged to 'next' on 2016-03-15 at a8bf6c5)
+ clone: allow an explicit argument for parallel submodule clones
+ submodule update: expose parallelism to the user
+ submodule helper: remove double 'fatal: ' prefix
+ git submodule update: have a dedicated helper for cloning
+ run_processes_parallel: rename parameters for the callbacks
+ run_processes_parallel: treat output of children as byte array
+ submodule update: direct error message to stderr
+ fetching submodules: respect `submodule.fetchJobs` config option
+ submodule-config: drop check against NULL
+ submodule-config: keep update strategy around
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.
Will merge to 'master' after 2.8 final.
* dt/refs-backend-lmdb (2016-02-25) 45 commits
. SQUASH??? Minimum compilation band-aid
. tests: add ref-storage argument
. refs: tests for lmdb backend
. refs: add LMDB refs storage backend
. refs: break out resolve_ref_unsafe_submodule
. config: read ref storage config on startup
. refs: register ref storage backends
. svn: learn ref-storage argument
. clone: allow ref storage backend to be set for clone
. refs: check submodules' ref storage config
. init: allow alternate ref strorage to be set for new repos
. refs: always handle non-normal refs in files backend
. refs: resolve symbolic refs first
. refs: on symref reflog expire, lock symref not referrent
. refs: don't dereference on rename
. refs: allow log-only updates
. refs: move duplicate check to common code
. refs: make lock generic
. refs: handle non-normal ref renames
. refs: add method to rename refs
. refs: add methods to init refs db
. refs: add method for delete_refs
. refs: add method for initial ref transaction commit
. refs: add methods for reflog
. refs: add do_for_each_per_worktree_ref
. refs: reduce the visibility of do_for_each_ref()
. refs: add method for do_for_each_ref
. refs: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move resolve_ref_unsafe into common code
. files-backend: break out ref reading
. refs: move for_each_*ref* functions into common code
. refs: move head_ref{,_submodule} to the common code
. Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
. clone: allow an explicit argument for parallel submodule clones
. submodule update: expose parallelism to the user
. git submodule update: have a dedicated helper for cloning
. run_processes_parallel: correctly terminate callbacks with an LF
. run_processes_parallel: rename parameters for the callbacks
. run-command: expose default_{start_failure, task_finished}
. run_processes_parallel: treat output of children as byte array
. submodule update: direct error message to stderr
. fetching submodules: respect `submodule.fetchJobs` config option
. submodule-config: drop check against NULL
. submodule-config: keep update strategy around
A reroll exists, but it seems that will further be rerolled.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2016-03-28) 11 commits
- rerere: adjust 'forget' to multi-variant world order
- rerere: split code to call ll_merge() further
- rerere: move code related to "forget" together
- rerere: gc and clear
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
Need to send out the final round of review as this should be now complete.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2016, #05; Fri, 25)
@ 2016-03-25 22:03 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-03-25 22:03 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
We'll have 2.8 final early next week, hopefully.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
- submodule-config: use hashmap_iter_first()
Minor code cleanup.
Will merge to 'next'.
* ky/branch-d-worktree (2016-03-25) 1 commit
- branch -d: refuse deleting a branch which is currently checked out
When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree
Will merge to 'next'.
* ky/branch-m-worktree (2016-03-25) 4 commits
- branch -m: update all per-worktree HEADs
- refs: add create_symref_common_dir as a variation of create_symref
- refs: add REF_COMMON_DIR flag
- refs: add new flag RESOLVE_REF_COMMON_DIR to resolve_ref_unsafe
When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.
Needs review.
* nd/apply-doc (2016-03-24) 2 commits
- git-apply.txt: mention the behavior inside a subdir
- git-apply.txt: remove a space
Will merge to 'next'.
* nd/apply-report-skip (2016-03-24) 1 commit
- apply: report patch skipping in verbose mode
"git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.
Will merge to 'next'.
* pb/opt-cmdmode-doc (2016-03-25) 1 commit
- api-parse-options.txt: document OPT_CMDMODE()
Minor API documentation update.
* rt/completion-help (2016-03-24) 2 commits
- completion: add 'revisions' and 'everyday' to 'git help'
- completion: add option '--guides' to 'git help'
Shell completion (in contrib/) updates.
* rt/rebase-i-shorten-stop-report (2016-03-24) 1 commit
- rebase-i: print abbreviated hash when stop for editing
The commit object name reported when "rebase -i" stops has been
shortened.
Needs a better explanation.
* sb/submodule-helper-prefix (2016-03-25) 5 commits
- submodule--helper clone: lose the extra prefix option
- submodule sync: test syncing one submodule
- submodule update: add test for recursive from non root dir
- submodule--helper list: lose the extra prefix option
- submodule: prepare recursive path from non root directory
--------------------------------------------------
[Graduated to "master"]
* js/mingw-tests-2.8 (2016-03-23) 4 commits
(merged to 'next' on 2016-03-23 at aeec80e)
+ mingw: skip some tests in t9115 due to file name issues
+ t1300: fix the new --show-origin tests on Windows
+ t1300-repo-config: make it resilient to being run via 'sh -x'
+ config --show-origin: report paths with forward slashes
Last-minute tweaks to test to pass on Windows.
* ls/p4-doc-markup (2016-03-23) 2 commits
(merged to 'next' on 2016-03-23 at 94a6275)
+ Documentation: fix git-p4 AsciiDoc formatting
+ Documentation: use ASCII quotation marks in git-p4
Trivially OK doc cleanup.
* sb/submodule-module-list-pathspec-fix (2016-03-22) 1 commit
(merged to 'next' on 2016-03-23 at 67fe17c)
+ submodule: fix regression for deinit without submodules
A fix to a small regression in module_list helper that was
rewritten in C in 2.7.x timeframe.
--------------------------------------------------
[Stalled]
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* jk/check-repository-format (2016-03-11) 10 commits
- verify_repository_format: mark messages for translation
- setup: drop repository_format_version global
- setup: unify repository version callbacks
- init: use setup.c's repo version verification
- setup: refactor repo format reading and verification
- config: drop git_config_early
- check_repository_format_gently: stop using git_config_early
- lazily load core.sharedrepository
- wrap shared_repository global in get/set accessors
- setup: document check_repository_format()
The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* mj/pull-rebase-autostash (2016-03-21) 2 commits
(merged to 'next' on 2016-03-23 at ebf1afa)
+ pull --rebase: add --[no-]autostash flag
+ git-pull.c: introduce git_pull_config()
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
Will merge to 'master' after 2.8 final.
* pb/commit-verbose-config (2016-03-14) 1 commit
- commit: add a commit.verbose config variable
(this branch uses pb/t7502-drop-dup.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was given
from the command line.
* pb/t7502-drop-dup (2016-03-11) 1 commit
(merged to 'next' on 2016-03-15 at 037c877)
+ t/t7502 : drop duplicate test
(this branch is used by pb/commit-verbose-config.)
Code clean-up.
Will merge to 'master' after 2.8 final.
* ss/commit-squash-msg (2016-03-21) 1 commit
(merged to 'next' on 2016-03-23 at 0b72631)
+ commit: do not lose SQUASH_MSG contents
When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
Will merge to 'master' after 2.8 final.
* ls/p4-map-user (2016-03-15) 1 commit
(merged to 'next' on 2016-03-23 at 9e0a4f5)
+ git-p4: map a P4 user to Git author name and email address
Will merge to 'master' after 2.8 final.
* jc/merge-refuse-new-root (2016-03-23) 1 commit
(merged to 'next' on 2016-03-23 at d7da4cf)
+ merge: refuse to create too cool a merge by default
"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
Will merge to 'master' after 2.8 final.
* jc/rerere-multi-wip (2016-03-21) 1 commit
. WIP forget
(this branch uses jc/rerere-multi.)
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at d2b8cc7)
+ credential-cache--daemon: clarify "exit" action semantics
Will merge to 'master' after 2.8 final.
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at 74f1f44)
+ send-email: ignore trailing whitespace in mailrc alias file
Will merge to 'master' after 2.8 final.
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at 245263b)
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Will merge to 'master' after 2.8 final.
* lt/pretty-expand-tabs (2016-03-23) 5 commits
- pretty-print: teach "--no-expand-tabs" option to "git log"
- pretty-print: limit expand-tabs to selected --pretty formats
- pretty-print: further abstract out pp_handle_indent()
- pretty-print: simplify the interaction between pp_handle_indent() and its caller
- pretty-print: de-tabify indented logs to make things line up properly
May need a UI rework.
Needs reordering.
* sb/clone-shallow-passthru (2016-03-23) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- submodule clone: pass along `local` option
- clone: add `--shallow-submodules` flag
(this branch uses sb/submodule-parallel-update; is tangled with sb/submodule-init.)
"git clone" learned "--shallow-submodules" option.
Needs review.
* sb/clone-t57-t56 (2016-03-16) 1 commit
(merged to 'next' on 2016-03-23 at 5df850d)
+ clone tests: rename t57* => t56*
Rename bunch of tests on "git clone" for better organization.
Will merge to 'master' after 2.8 final.
* sb/rebase-x (2016-03-18) 2 commits
(merged to 'next' on 2016-03-23 at ef8861b)
+ t3404: cleanup double empty lines between tests
+ rebase: decouple --exec from --interactive
"git rebase -x" can be used without passing "-i" option.
Will merge to 'master' after 2.8 final.
* cc/apply (2016-03-22) 2 commits
(merged to 'next' on 2016-03-24 at 70623f2)
+ apply: remove unused call to free() in gitdiff_{old,new}name()
+ builtin/apply: get rid of useless 'name' variable
Code clean-up.
Will merge to 'master' after 2.8 final.
* dt/index-helper (2016-03-23) 18 commits
- SQUASH - minimum compilation fix
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- Add watchman support to reduce index refresh cost
- read-cache: invalidate untracked cache data when reading WAMA
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
* jv/merge-nothing-into-void (2016-03-23) 1 commit
(merged to 'next' on 2016-03-23 at 40b905d)
+ merge: fix NULL pointer dereference when merging nothing into void
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
Will merge to 'master' after 2.8 final.
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
(merged to 'next' on 2016-03-24 at 424da3f)
+ tag: add the option to force signing of annotated tags
"git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
Will merge to 'master' after 2.8 final.
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
(merged to 'next' on 2016-03-23 at 086b9f2)
+ Documentation: talk about pager in api-trace.txt
Will merge to 'master' after 2.8 final.
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
(merged to 'next' on 2016-03-15 at 281a81a)
+ mergetool: honor tempfile configuration when resolving delete conflicts
+ mergetool: support delete/delete conflicts
"git mergetool" did not work well with conflicts that both sides
deleted.
Will merge to 'master' after 2.8 final.
* es/test-gpg-tags (2016-03-06) 4 commits
(merged to 'next' on 2016-03-15 at 617119f)
+ t6302: skip only signed tags rather than all tests when GPG is missing
+ t6302: also test annotated in addition to signed tags
+ t6302: normalize names and descriptions of signed tags
+ lib-gpg: drop unnecessary "missing GPG" warning
A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
Will merge to 'master' after 2.8 final.
* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
(merged to 'next' on 2016-03-15 at e70d4bd)
+ strbuf_getwholeline: NUL-terminate getdelim buffer on error
strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
Will merge to 'master' after 2.8 final.
* jk/startup-info (2016-03-07) 6 commits
(merged to 'next' on 2016-03-15 at eb95e5f)
+ use setup_git_directory() in test-* programs
+ grep: turn off gitlink detection for --no-index
+ mailmap: do not resolve blobs in a non-repository
+ remote: don't resolve HEAD in non-repository
+ setup: set startup_info->have_repository more reliably
+ setup: make startup_info available everywhere
The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
Will merge to 'master' after 2.8 final.
* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
(merged to 'next' on 2016-03-15 at f72755e)
+ xdiff/xprepare: fix a memory leak
+ xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
A small memory leak in an error codepath has been plugged in xdiff
code.
Will merge to 'master' after 2.8 final.
* jc/index-pack (2016-03-03) 2 commits
(merged to 'next' on 2016-03-15 at 42efaa7)
+ index-pack: add a helper function to derive .idx/.keep filename
+ Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
Code clean-up.
Will merge to 'master' after 2.8 final.
* jc/maint-index-pack-keep (2016-03-03) 1 commit
(merged to 'next' on 2016-03-04 at bc1d37a)
+ index-pack: correct --keep[=<msg>]
(this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
Will merge to 'master' after 2.8 final.
* mm/readme-markdown (2016-02-27) 1 commit
(merged to 'next' on 2016-03-01 at 81f3858)
+ README.md: don't take 'commandname' literally
The top-level README file has been updated to be more appropriate
for the sign on the front door to welcome new acquaintances to Git
by toning down inside jokes and making it into MarkDown.
Will merge to 'master' after 2.8 final.
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
(merged to 'next' on 2016-03-06 at 5628860)
+ fetch-pack: update the documentation for "<refs>..." arguments
(merged to 'next' on 2016-03-04 at 49199e0)
+ fetch-pack: fix object_id of exact sha1
Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
Will merge to 'master' after 2.8 final.
* jk/add-i-highlight (2016-02-28) 1 commit
(merged to 'next' on 2016-03-04 at 4ac3aa1)
+ add--interactive: allow custom diff highlighting programs
Will merge to 'master' after 2.8 final.
* jk/config-get-urlmatch (2016-02-28) 3 commits
(merged to 'next' on 2016-03-04 at feeb192)
+ Documentation/git-config: fix --get-all description
+ Documentation/git-config: use bulleted list for exit codes
+ config: fail if --get-urlmatch finds no value
"git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
Will merge to 'master' after 2.8 final.
* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
(merged to 'next' on 2016-03-04 at a0300d5)
+ rev-parse: let some options run outside repository
+ t1515: add tests for rev-parse out-of-repo helpers
The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
Will merge to 'master' after 2.8 final.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* mm/lockfile-error-message (2016-03-01) 2 commits
(merged to 'next' on 2016-03-04 at 04ed7e6)
+ lockfile: improve error message when lockfile exists
+ lockfile: mark strings for translation
Will merge to 'master' after 2.8 final.
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
(merged to 'next' on 2016-03-04 at 5ea48c7)
+ dir: store EXC_FLAG_* values in unsigned integers
Will merge to 'master' after 2.8 final.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
(this branch uses jc/index-pack and jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ss/receive-pack-parse-options (2016-03-01) 1 commit
(merged to 'next' on 2016-03-04 at c577ea7)
+ builtin/receive-pack.c: use parse_options API
The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
Will merge to 'master' after 2.8 final.
* jk/credential-clear-config (2016-02-26) 1 commit
(merged to 'next' on 2016-03-04 at f7b26b7)
+ credential: let empty credential specs reset helper list
The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
Will merge to 'master' after 2.8 final.
* jk/submodule-c-credential (2016-03-23) 7 commits
(merged to 'next' on 2016-03-23 at 952367a)
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
(merged to 'next' on 2016-03-15 at 81df5b1)
+ git: submodule honor -c credential.* from command line
+ quote: implement sq_quotef()
+ submodule: fix segmentation fault in submodule--helper clone
+ submodule: fix submodule--helper clone usage
+ submodule: check argc count for git submodule--helper clone
+ submodule: don't pass empty string arguments to submodule--helper clone
"git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
Will merge to 'master' after 2.8 final.
* nd/shallow-deepen (2016-02-23) 25 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* mm/diff-renames-default (2016-02-25) 5 commits
(merged to 'next' on 2016-02-25 at 947c399)
+ diff: activate diff.renames by default
+ log: introduce init_log_defaults()
+ t: add tests for diff.renames (true/false/unset)
+ t4001-diff-rename: wrap file creations in a test
+ Documentation/diff-config: fix description of diff.renames
The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
Will merge to 'master' after 2.8 final.
* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
(merged to 'next' on 2016-02-26 at f0a54e5)
+ upload-pack: use argv_array for pack_objects
The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
Will merge to 'master' after 2.8 final.
* sb/submodule-init (2016-03-15) 2 commits
- submodule: port init from shell to C
- submodule: port resolve_relative_url from shell to C
(this branch uses sb/submodule-parallel-update; is tangled with sb/clone-shallow-passthru.)
Update of "git submodule" to move pieces of logic to C continues.
Needs review.
($gmane/288824)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* sb/submodule-parallel-update (2016-03-01) 10 commits
(merged to 'next' on 2016-03-15 at a8bf6c5)
+ clone: allow an explicit argument for parallel submodule clones
+ submodule update: expose parallelism to the user
+ submodule helper: remove double 'fatal: ' prefix
+ git submodule update: have a dedicated helper for cloning
+ run_processes_parallel: rename parameters for the callbacks
+ run_processes_parallel: treat output of children as byte array
+ submodule update: direct error message to stderr
+ fetching submodules: respect `submodule.fetchJobs` config option
+ submodule-config: drop check against NULL
+ submodule-config: keep update strategy around
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.
Will merge to 'master' after 2.8 final.
* dt/refs-backend-lmdb (2016-02-25) 45 commits
. SQUASH??? Minimum compilation band-aid
. tests: add ref-storage argument
. refs: tests for lmdb backend
. refs: add LMDB refs storage backend
. refs: break out resolve_ref_unsafe_submodule
. config: read ref storage config on startup
. refs: register ref storage backends
. svn: learn ref-storage argument
. clone: allow ref storage backend to be set for clone
. refs: check submodules' ref storage config
. init: allow alternate ref strorage to be set for new repos
. refs: always handle non-normal refs in files backend
. refs: resolve symbolic refs first
. refs: on symref reflog expire, lock symref not referrent
. refs: don't dereference on rename
. refs: allow log-only updates
. refs: move duplicate check to common code
. refs: make lock generic
. refs: handle non-normal ref renames
. refs: add method to rename refs
. refs: add methods to init refs db
. refs: add method for delete_refs
. refs: add method for initial ref transaction commit
. refs: add methods for reflog
. refs: add do_for_each_per_worktree_ref
. refs: reduce the visibility of do_for_each_ref()
. refs: add method for do_for_each_ref
. refs: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move resolve_ref_unsafe into common code
. files-backend: break out ref reading
. refs: move for_each_*ref* functions into common code
. refs: move head_ref{,_submodule} to the common code
. Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
. clone: allow an explicit argument for parallel submodule clones
. submodule update: expose parallelism to the user
. git submodule update: have a dedicated helper for cloning
. run_processes_parallel: correctly terminate callbacks with an LF
. run_processes_parallel: rename parameters for the callbacks
. run-command: expose default_{start_failure, task_finished}
. run_processes_parallel: treat output of children as byte array
. submodule update: direct error message to stderr
. fetching submodules: respect `submodule.fetchJobs` config option
. submodule-config: drop check against NULL
. submodule-config: keep update strategy around
A reroll exists, but it seems that will further be rerolled.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2016-03-15) 10 commits
- rerere: split code to call ll_merge() further
- rerere: move code related to "forget" together
- rerere: gc and clear
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
(this branch is used by jc/rerere-multi-wip.)
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
May need further work on forget.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2016, #04; Wed, 23)
@ 2016-03-23 21:12 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2016-03-23 21:12 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Three more minor fix-up topics are to be merged by 2.8 final, but we
are almost there.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* jk/check-repository-format (2016-03-11) 10 commits
- verify_repository_format: mark messages for translation
- setup: drop repository_format_version global
- setup: unify repository version callbacks
- init: use setup.c's repo version verification
- setup: refactor repo format reading and verification
- config: drop git_config_early
- check_repository_format_gently: stop using git_config_early
- lazily load core.sharedrepository
- wrap shared_repository global in get/set accessors
- setup: document check_repository_format()
The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.
* mj/pull-rebase-autostash (2016-03-21) 2 commits
(merged to 'next' on 2016-03-23 at ebf1afa)
+ pull --rebase: add --[no-]autostash flag
+ git-pull.c: introduce git_pull_config()
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
Will merge to 'master' after 2.8 final.
* pb/commit-verbose-config (2016-03-14) 1 commit
- commit: add a commit.verbose config variable
(this branch uses pb/t7502-drop-dup.)
"git commit" learned to pay attention to "commit.verbose"
configuration variable and act as if "--verbose" option was given
from the command line.
* pb/t7502-drop-dup (2016-03-11) 1 commit
(merged to 'next' on 2016-03-15 at 037c877)
+ t/t7502 : drop duplicate test
(this branch is used by pb/commit-verbose-config.)
Code clean-up.
Will merge to 'master' after 2.8 final.
* ss/commit-squash-msg (2016-03-21) 1 commit
(merged to 'next' on 2016-03-23 at 0b72631)
+ commit: do not lose SQUASH_MSG contents
When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.
Will merge to 'master' after 2.8 final.
* ls/p4-map-user (2016-03-15) 1 commit
(merged to 'next' on 2016-03-23 at 9e0a4f5)
+ git-p4: map a P4 user to Git author name and email address
Will merge to 'master' after 2.8 final.
* jc/merge-refuse-new-root (2016-03-23) 1 commit
(merged to 'next' on 2016-03-23 at d7da4cf)
+ merge: refuse to create too cool a merge by default
"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.
Will merge to 'master' after 2.8 final.
* jc/rerere-multi-wip (2016-03-21) 1 commit
. WIP forget
(this branch uses jc/rerere-multi.)
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at d2b8cc7)
+ credential-cache--daemon: clarify "exit" action semantics
Will merge to 'master' after 2.8 final.
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at 74f1f44)
+ send-email: ignore trailing whitespace in mailrc alias file
Will merge to 'master' after 2.8 final.
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
(merged to 'next' on 2016-03-23 at 245263b)
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
Will merge to 'master' after 2.8 final.
* lt/pretty-expand-tabs (2016-03-17) 4 commits
- pretty-print: add --pretty=noexpand
- pretty-print: further abstract out pp_handle_indent()
- pretty-print: simplify the interaction between pp_handle_indent() and its caller
- pretty-print: de-tabify indented logs to make things line up properly
Needs a UI rework.
* sb/clone-shallow-passthru (2016-03-23) 3 commits
- clone: add t5614 to test cloning submodules with shallowness involved
- submodule clone: pass along `local` option
- clone: add `--shallow-submodules` flag
(this branch uses sb/submodule-parallel-update; is tangled with sb/submodule-init.)
"git clone" learned "--shallow-submodules" option.
Needs review.
* sb/clone-t57-t56 (2016-03-16) 1 commit
(merged to 'next' on 2016-03-23 at 5df850d)
+ clone tests: rename t57* => t56*
Rename bunch of tests on "git clone" for better organization.
Will merge to 'master' after 2.8 final.
* sb/rebase-x (2016-03-18) 2 commits
(merged to 'next' on 2016-03-23 at ef8861b)
+ t3404: cleanup double empty lines between tests
+ rebase: decouple --exec from --interactive
"git rebase -x" can be used without passing "-i" option.
Will merge to 'master' after 2.8 final.
* cc/apply (2016-03-22) 2 commits
- apply: remove unused call to free() in gitdiff_{old,new}name()
- builtin/apply: get rid of useless 'name' variable
Code clean-up.
Will merge to 'next'.
* dt/index-helper (2016-03-23) 18 commits
- SQUASH - minimum compilation fix
- read-cache: config for waiting for index-helper
- index-helper: optionally automatically run
- index-helper: autorun mode
- index-helper: don't run if already running
- index-helper: kill mode
- unpack-trees: preserve index extensions
- update-index: enable/disable watchman support
- index-helper: use watchman to avoid refreshing index with lstat()
- Add watchman support to reduce index refresh cost
- read-cache: invalidate untracked cache data when reading WAMA
- read-cache: add watchman 'WAMA' extension
- index-helper: add --detach
- daemonize(): set a flag before exiting the main process
- index-helper: add --strict
- index-helper: new daemon for caching index and related stuff
- read-cache: allow to keep mmap'd memory after reading
- read-cache.c: fix constness of verify_hdr()
* js/mingw-tests-2.8 (2016-03-23) 4 commits
(merged to 'next' on 2016-03-23 at aeec80e)
+ mingw: skip some tests in t9115 due to file name issues
+ t1300: fix the new --show-origin tests on Windows
+ t1300-repo-config: make it resilient to being run via 'sh -x'
+ config --show-origin: report paths with forward slashes
Will merge to 'master' by 2.8-final.
* jv/merge-nothing-into-void (2016-03-23) 1 commit
(merged to 'next' on 2016-03-23 at 40b905d)
+ merge: fix NULL pointer dereference when merging nothing into void
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
Will merge to 'master' after 2.8 final.
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
- tag: add the option to force signing of annotated tags
"git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given). A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.
Will merge to 'next'.
* ls/p4-doc-markup (2016-03-23) 2 commits
(merged to 'next' on 2016-03-23 at 94a6275)
+ Documentation: fix git-p4 AsciiDoc formatting
+ Documentation: use ASCII quotation marks in git-p4
Will merge to 'master' by 2.8-final.
* sb/submodule-module-list-pathspec-fix (2016-03-22) 1 commit
(merged to 'next' on 2016-03-23 at 67fe17c)
+ submodule: fix regression for deinit without submodules
Will merge to 'master' by 2.8-final.
--------------------------------------------------
[Graduated to "master"]
* cn/deprecate-ssh-git-url (2016-03-09) 1 commit
(merged to 'next' on 2016-03-15 at c52f11c)
+ Disown ssh+git and git+ssh
The two alternative ways to spell "ssh://" transport have been
deprecated for a long time. The last mention of them has finally
removed from the documentation.
* jc/exclusion-doc (2016-03-08) 1 commit
(merged to 'next' on 2016-03-10 at 19173ff)
+ gitignore: document that unignoring a directory unignores everything in it
* jc/sane-grep (2016-03-10) 2 commits
(merged to 'next' on 2016-03-15 at 98d08a4)
+ rebase-i: clarify "is this commit relevant?" test
+ sane_grep: pass "-a" if grep accepts it
Recent versions of GNU grep is pickier than before to decide if a
file is "binary" and refuse to give line-oriented hits when we
expect it to, unless explicitly told with "-a" option. As our
scripted Porcelains use sane_grep wrapper for line-oriented data,
even when the line may contain non-ASCII payload we took from
end-user data, use "grep -a" to implement sane_grep wrapper when
using an implementation of "grep" that takes the "-a" option.
* js/close-packs-before-gc (2016-03-04) 1 commit
(merged to 'next' on 2016-03-04 at fe6f6ed)
+ t5510: do not leave changed cwd
A small future-proofing of a test added recently.
* jx/http-no-proxy (2016-02-29) 1 commit
(merged to 'next' on 2016-03-10 at 989305b)
+ http: honor no_http env variable to bypass proxy
A small regression fix to keep no_proxy environment variable
working.
* sb/rebase-summary (2016-03-02) 1 commit
(merged to 'next' on 2016-03-04 at d40714d)
+ Documentation: reword rebase summary
--------------------------------------------------
[Stalled]
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
(merged to 'next' on 2016-03-23 at 086b9f2)
+ Documentation: talk about pager in api-trace.txt
Will merge to 'master' after 2.8 final.
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
(merged to 'next' on 2016-03-15 at 281a81a)
+ mergetool: honor tempfile configuration when resolving delete conflicts
+ mergetool: support delete/delete conflicts
"git mergetool" did not work well with conflicts that both sides
deleted.
Will merge to 'master' after 2.8 final.
* es/test-gpg-tags (2016-03-06) 4 commits
(merged to 'next' on 2016-03-15 at 617119f)
+ t6302: skip only signed tags rather than all tests when GPG is missing
+ t6302: also test annotated in addition to signed tags
+ t6302: normalize names and descriptions of signed tags
+ lib-gpg: drop unnecessary "missing GPG" warning
A test for tags has been restructured so that more parts of it can
easily be run on a platform without a working GnuPG.
Will merge to 'master' after 2.8 final.
* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
(merged to 'next' on 2016-03-15 at e70d4bd)
+ strbuf_getwholeline: NUL-terminate getdelim buffer on error
strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.
Will merge to 'master' after 2.8 final.
* jk/startup-info (2016-03-07) 6 commits
(merged to 'next' on 2016-03-15 at eb95e5f)
+ use setup_git_directory() in test-* programs
+ grep: turn off gitlink detection for --no-index
+ mailmap: do not resolve blobs in a non-repository
+ remote: don't resolve HEAD in non-repository
+ setup: set startup_info->have_repository more reliably
+ setup: make startup_info available everywhere
The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.
Will merge to 'master' after 2.8 final.
* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
(merged to 'next' on 2016-03-15 at f72755e)
+ xdiff/xprepare: fix a memory leak
+ xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
A small memory leak in an error codepath has been plugged in xdiff
code.
Will merge to 'master' after 2.8 final.
* jc/index-pack (2016-03-03) 2 commits
(merged to 'next' on 2016-03-15 at 42efaa7)
+ index-pack: add a helper function to derive .idx/.keep filename
+ Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
Code clean-up.
Will merge to 'master' after 2.8 final.
* jc/maint-index-pack-keep (2016-03-03) 1 commit
(merged to 'next' on 2016-03-04 at bc1d37a)
+ index-pack: correct --keep[=<msg>]
(this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
Will merge to 'master' after 2.8 final.
* mm/readme-markdown (2016-02-27) 1 commit
(merged to 'next' on 2016-03-01 at 81f3858)
+ README.md: don't take 'commandname' literally
The top-level README file has been updated to be more appropriate
for the sign on the front door to welcome new acquaintances to Git
by toning down inside jokes and making it into MarkDown.
Will merge to 'master' after 2.8 final.
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
(merged to 'next' on 2016-03-06 at 5628860)
+ fetch-pack: update the documentation for "<refs>..." arguments
(merged to 'next' on 2016-03-04 at 49199e0)
+ fetch-pack: fix object_id of exact sha1
Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.
Will merge to 'master' after 2.8 final.
* jk/add-i-highlight (2016-02-28) 1 commit
(merged to 'next' on 2016-03-04 at 4ac3aa1)
+ add--interactive: allow custom diff highlighting programs
Will merge to 'master' after 2.8 final.
* jk/config-get-urlmatch (2016-02-28) 3 commits
(merged to 'next' on 2016-03-04 at feeb192)
+ Documentation/git-config: fix --get-all description
+ Documentation/git-config: use bulleted list for exit codes
+ config: fail if --get-urlmatch finds no value
"git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.
Will merge to 'master' after 2.8 final.
* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
(merged to 'next' on 2016-03-04 at a0300d5)
+ rev-parse: let some options run outside repository
+ t1515: add tests for rev-parse out-of-repo helpers
The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.
Will merge to 'master' after 2.8 final.
* sg/completion-updates (2016-02-28) 21 commits
- completion: cache the path to the repository
- completion: extract repository discovery from __gitdir()
- completion: don't guard git executions with __gitdir()
- completion: consolidate silencing errors from git commands
- completion: don't use __gitdir() for git commands
- completion: respect 'git -C <path>'
- completion: fix completion after 'git -C <path>'
- completion: don't offer commands when 'git --opt' needs an argument
- rev-parse: add '--absolute-git-dir' option
- completion: list short refs from a remote given as a URL
- completion: don't list 'HEAD' when trying refs completion outside of a repo
- completion: list refs from remote when remote's name matches a directory
- completion: respect 'git --git-dir=<path>' when listing remote refs
- completion: fix most spots not respecting 'git --git-dir=<path>'
- completion: ensure that the repository path given on the command line exists
- completion tests: add tests for the __git_refs() helper function
- completion tests: check __gitdir()'s output in the error cases
- completion tests: consolidate getting path of current working directory
- completion tests: make the $cur variable local to the test helper functions
- completion tests: don't add test cruft to the test repository
- completion: improve __git_refs()'s in-code documentation
Will be rerolled.
($gmane/287839)
* mm/lockfile-error-message (2016-03-01) 2 commits
(merged to 'next' on 2016-03-04 at 04ed7e6)
+ lockfile: improve error message when lockfile exists
+ lockfile: mark strings for translation
Will merge to 'master' after 2.8 final.
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
(merged to 'next' on 2016-03-04 at 5ea48c7)
+ dir: store EXC_FLAG_* values in unsigned integers
Will merge to 'master' after 2.8 final.
* jc/bundle (2016-03-03) 6 commits
- index-pack: --clone-bundle option
- Merge branch 'jc/index-pack' into jc/bundle
- bundle v3: the beginning
- bundle: keep a copy of bundle file name in the in-core bundle header
- bundle: plug resource leak
- bundle doc: 'verify' is not about verifying the bundle
(this branch uses jc/index-pack and jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
The beginning of "split bundle", which could be one of the
ingredients to allow "git clone" traffic off of the core server
network to CDN.
* ss/receive-pack-parse-options (2016-03-01) 1 commit
(merged to 'next' on 2016-03-04 at c577ea7)
+ builtin/receive-pack.c: use parse_options API
The command line argument parser for "receive-pack" has been
rewritten to use parse-options.
Will merge to 'master' after 2.8 final.
* jk/credential-clear-config (2016-02-26) 1 commit
(merged to 'next' on 2016-03-04 at f7b26b7)
+ credential: let empty credential specs reset helper list
The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
Will merge to 'master' after 2.8 final.
* jk/submodule-c-credential (2016-03-23) 7 commits
(merged to 'next' on 2016-03-23 at 952367a)
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
(merged to 'next' on 2016-03-15 at 81df5b1)
+ git: submodule honor -c credential.* from command line
+ quote: implement sq_quotef()
+ submodule: fix segmentation fault in submodule--helper clone
+ submodule: fix submodule--helper clone usage
+ submodule: check argc count for git submodule--helper clone
+ submodule: don't pass empty string arguments to submodule--helper clone
"git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.
Will merge to 'master' after 2.8 final.
* nd/shallow-deepen (2016-02-23) 25 commits
- fetch, upload-pack: --deepen=N extends shallow boundary by N commits
- upload-pack: add get_reachable_list()
- upload-pack: split check_unreachable() in two, prep for get_reachable_list()
- t5500, t5539: tests for shallow depth excluding a ref
- clone: define shallow clone boundary with --shallow-exclude
- fetch: define shallow boundary with --shallow-exclude
- upload-pack: support define shallow boundary by excluding revisions
- refs: add expand_ref()
- t5500, t5539: tests for shallow depth since a specific date
- clone: define shallow clone boundary based on time with --shallow-since
- fetch: define shallow boundary with --shallow-since
- upload-pack: add deepen-since to cut shallow repos based on time
- shallow.c: implement a generic shallow boundary finder based on rev-list
- fetch-pack: use a separate flag for fetch in deepening mode
- fetch-pack: use a common function for verbose printing
- fetch-pack: use skip_prefix() instead of starts_with()
- upload-pack: move rev-list code out of check_non_tip()
- upload-pack: tighten number parsing at "deepen" lines
- upload-pack: use skip_prefix() instead of starts_with()
- upload-pack: move "unshallow" sending code out of deepen()
- upload-pack: remove unused variable "backup"
- upload-pack: move "shallow" sending code out of deepen()
- upload-pack: move shallow deepen code out of receive_needs()
- transport-helper.c: refactor set_helper_option()
- remote-curl.c: convert fetch_git() to use argv_array
The existing "git fetch --depth=<n>" option was hard to use
correctly when making the history of an existing shallow clone
deeper. A new option, "--deepen=<n>", has been added to make this
easier to use. "git clone" also learned "--shallow-since=<date>"
and "--shallow-exclude=<tag>" options to make it easier to specify
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
Needs review.
* mm/diff-renames-default (2016-02-25) 5 commits
(merged to 'next' on 2016-02-25 at 947c399)
+ diff: activate diff.renames by default
+ log: introduce init_log_defaults()
+ t: add tests for diff.renames (true/false/unset)
+ t4001-diff-rename: wrap file creations in a test
+ Documentation/diff-config: fix description of diff.renames
The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
Will merge to 'master' after 2.8 final.
* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
(merged to 'next' on 2016-02-26 at f0a54e5)
+ upload-pack: use argv_array for pack_objects
The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.
Will merge to 'master' after 2.8 final.
* sb/submodule-init (2016-03-15) 2 commits
- submodule: port init from shell to C
- submodule: port resolve_relative_url from shell to C
(this branch uses sb/submodule-parallel-update; is tangled with sb/clone-shallow-passthru.)
Update of "git submodule" to move pieces of logic to C continues.
Needs review.
($gmane/288824)
* az/p4-bare-no-rebase (2016-02-19) 1 commit
- git-p4.py: Don't try to rebase on submit from bare repository
"git p4 submit" attempts to do a rebase, which would fail if done
in a bare repository. Not doing this rebase would paper over the
failure, which is what this patch does, but it is unclear what the
side effect of not rebasing is.
Needs a better explanation.
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
- wt-status.c: set commitable bit if there is a meaningful merge.
"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).
* nd/icase (2016-02-15) 12 commits
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- diffcore-pickaxe: "share" regex error handling code
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
- test-regex: isolate the bug test code
- grep: break down an "if" stmt in preparation for next changes
- grep: allow -F -i combination
"git grep -i" has been taught to fold case in non-ascii locales.
Needs review.
($gmane/286137)
* sb/submodule-parallel-update (2016-03-01) 10 commits
(merged to 'next' on 2016-03-15 at a8bf6c5)
+ clone: allow an explicit argument for parallel submodule clones
+ submodule update: expose parallelism to the user
+ submodule helper: remove double 'fatal: ' prefix
+ git submodule update: have a dedicated helper for cloning
+ run_processes_parallel: rename parameters for the callbacks
+ run_processes_parallel: treat output of children as byte array
+ submodule update: direct error message to stderr
+ fetching submodules: respect `submodule.fetchJobs` config option
+ submodule-config: drop check against NULL
+ submodule-config: keep update strategy around
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.
Will merge to 'master' after 2.8 final.
* dt/refs-backend-lmdb (2016-02-25) 45 commits
. SQUASH??? Minimum compilation band-aid
. tests: add ref-storage argument
. refs: tests for lmdb backend
. refs: add LMDB refs storage backend
. refs: break out resolve_ref_unsafe_submodule
. config: read ref storage config on startup
. refs: register ref storage backends
. svn: learn ref-storage argument
. clone: allow ref storage backend to be set for clone
. refs: check submodules' ref storage config
. init: allow alternate ref strorage to be set for new repos
. refs: always handle non-normal refs in files backend
. refs: resolve symbolic refs first
. refs: on symref reflog expire, lock symref not referrent
. refs: don't dereference on rename
. refs: allow log-only updates
. refs: move duplicate check to common code
. refs: make lock generic
. refs: handle non-normal ref renames
. refs: add method to rename refs
. refs: add methods to init refs db
. refs: add method for delete_refs
. refs: add method for initial ref transaction commit
. refs: add methods for reflog
. refs: add do_for_each_per_worktree_ref
. refs: reduce the visibility of do_for_each_ref()
. refs: add method for do_for_each_ref
. refs: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move resolve_ref_unsafe into common code
. files-backend: break out ref reading
. refs: move for_each_*ref* functions into common code
. refs: move head_ref{,_submodule} to the common code
. Merge branch 'sb/submodule-parallel-update' into dt/refs-backend-lmdb
. clone: allow an explicit argument for parallel submodule clones
. submodule update: expose parallelism to the user
. git submodule update: have a dedicated helper for cloning
. run_processes_parallel: correctly terminate callbacks with an LF
. run_processes_parallel: rename parameters for the callbacks
. run-command: expose default_{start_failure, task_finished}
. run_processes_parallel: treat output of children as byte array
. submodule update: direct error message to stderr
. fetching submodules: respect `submodule.fetchJobs` config option
. submodule-config: drop check against NULL
. submodule-config: keep update strategy around
A reroll exists, but it seems that will further be rerolled.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2016-03-15) 10 commits
- rerere: split code to call ll_merge() further
- rerere: move code related to "forget" together
- rerere: gc and clear
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
(this branch is used by jc/rerere-multi-wip.)
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
May need further work on forget.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
($gmane/282594)
^ permalink raw reply [relevance 3%]
* Re: merge: fix NULL pointer dereference when merging nothing into void
2016-03-21 19:01 2% ` merge: fix NULL pointer dereference when merging nothing into void Junio C Hamano
@ 2016-03-21 19:36 2% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2016-03-21 19:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jose Ivan B. Vilarouca Filho, Git List
On Mon, Mar 21, 2016 at 3:01 PM, Junio C Hamano <gitster@pobox.com> wrote:
> When we are on an unborn branch and merging only one foreign parent,
> we allow "git merge" to fast-forward to that foreign parent commit.
>
> This codepath incorrectly attempted to dereference the list of
> parents that the merge is going to record even when the list is
> empty. It must refuse to operate instead when there is no parent.
>
> All other codepaths make sure the list is not empty before they
> dereference it, and are safe.
>
> Reported by Jose Ivan B. Vilarouca Filho
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> @@ -725,4 +725,14 @@ test_expect_success 'merge detects mod-256 conflicts (resolve)' '
> +test_expect_success 'merge nothing into void' '
> + git init void &&
> + (
> + cd void &&
> + git remote add up .. &&
> + git fetch up &&
> + test_must_fail git merge FETCH_HEAD
Ah, nice. I either didn't know or had forgotten that test_must_fail is
smart enough to detect unexpected failures (such as segfault), so my
advice to Jose about capturing stderr[1] was misdirected. Thanks.
[1]: http://article.gmane.org/gmane.comp.version-control.git/289405
> + )
> +'
> +
> test_done
^ permalink raw reply [relevance 2%]
* merge: fix NULL pointer dereference when merging nothing into void
@ 2016-03-21 19:01 2% ` Junio C Hamano
2016-03-21 19:36 2% ` Eric Sunshine
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2016-03-21 19:01 UTC (permalink / raw)
To: Jose Ivan B. Vilarouca Filho; +Cc: sunshine, git
When we are on an unborn branch and merging only one foreign parent,
we allow "git merge" to fast-forward to that foreign parent commit.
This codepath incorrectly attempted to dereference the list of
parents that the merge is going to record even when the list is
empty. It must refuse to operate instead when there is no parent.
All other codepaths make sure the list is not empty before they
dereference it, and are safe.
Reported by Jose Ivan B. Vilarouca Filho
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* So here is what I came up with as a suggestion. The original
check to see if remote_head is empty is simply bogus (an empty
list would to have a single element whose item is NULL), so I
rewrote it to clarify what is going on in this codepath.
builtin/merge.c | 10 +++++-----
t/t7600-merge.sh | 10 ++++++++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 101ffef..bf2f261 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1257,12 +1257,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
builtin_merge_options);
if (!head_commit) {
- struct commit *remote_head;
/*
* If the merged head is a valid one there is no reason
* to forbid "git merge" into a branch yet to be born.
* We do the same for "git pull".
*/
+ unsigned char *remote_head_sha1;
if (squash)
die(_("Squash commit into empty head not supported yet"));
if (fast_forward == FF_NO)
@@ -1270,13 +1270,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
"an empty head"));
remoteheads = collect_parents(head_commit, &head_subsumed,
argc, argv, NULL);
- remote_head = remoteheads->item;
- if (!remote_head)
+ if (!remoteheads)
die(_("%s - not something we can merge"), argv[0]);
if (remoteheads->next)
die(_("Can merge only exactly one commit into empty head"));
- read_empty(remote_head->object.oid.hash, 0);
- update_ref("initial pull", "HEAD", remote_head->object.oid.hash,
+ remote_head_sha1 = remoteheads->item->object.oid.hash;
+ read_empty(remote_head_sha1, 0);
+ update_ref("initial pull", "HEAD", remote_head_sha1,
NULL, 0, UPDATE_REFS_DIE_ON_ERR);
goto done;
}
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 302e238..9d7952f 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -725,4 +725,14 @@ test_expect_success 'merge detects mod-256 conflicts (resolve)' '
test_must_fail git merge -s resolve master
'
+test_expect_success 'merge nothing into void' '
+ git init void &&
+ (
+ cd void &&
+ git remote add up .. &&
+ git fetch up &&
+ test_must_fail git merge FETCH_HEAD
+ )
+'
+
test_done
^ permalink raw reply related [relevance 2%]
* Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)
2015-12-02 22:31 3% ` Jeff King
2015-12-02 23:31 0% ` Junio C Hamano
@ 2015-12-03 1:09 0% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2015-12-03 1:09 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote:
>
>> I think I managed to get my working area (together with a handful of
>> new entries in the rerere database and a few merge-fix/ entries) in
>> sync with what you pushed out well enough that my automated
>> procedure would recreate the status of various branches you pushed
>> out exactly.
>>
>> I haven't caught up with the changes in the component branches,
>> though, so it may take a few days until I start picking up new
>> topics from the list traffic.
>
> My whole workspace is at https://github.com/peff/git, if fetching that
> directly is easier. I just noticed that my refspecs were not configured
> to push up refs/merge-fix. I've just fixed that and pushed again.
>
> I'll leave it that way for a few more days, but then will probably take
> it back to my usual contributor setup (i.e., just my topics and personal
> integration branches).
>
> Let me know if there's anything else I can do to help with the handoff.
I've rebuilt 'pu' (and 'jch') with the component topics myself,
following the exact order of merges you had between master..pu, in
order to make sure that I fully made my working area in sync with
your merge resolutions, meaning that there shouldn't be any
differences between trees of the tips of integration branches.
The result has been pushed out to various places. The push to
https://github.com/git/git/ resulted in a single 'pu' update (the
trees did not change, the merge history was rebuilt as stated in the
previous paragraph). Other repositories, i.e.
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
git://git.sourceforge.jp/gitroot/git-core/git.git/
git://git-core.git.sourceforge.net/gitroot/git-core/git-core/
received various updates to match your last integration results.
So it is OK for you to set your workspace back to your usual
contributor settings. I can continue from here on.
Note that I haven't made any new merges, picked up any new topics or
replaced an old patch on an existing topic with a new one (yet).
Hopefully I can get to that tomorrow.
Thanks.
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)
2015-12-02 22:11 2% ` Junio C Hamano
2015-12-02 22:31 3% ` Jeff King
@ 2015-12-03 0:29 0% ` David Turner
1 sibling, 0 replies; 200+ results
From: David Turner @ 2015-12-03 0:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jeff King, git
On Wed, 2015-12-02 at 14:11 -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > What's cooking in git.git (Dec 2015, #01; Tue, 1)
> > --------------------------------------------------
> >
> > Here are the topics that have been cooking. Commits prefixed with
> > '-' are only in 'pu' (proposed updates) while commits prefixed with
> > '+' are in 'next'.
> >
> > This should by my final whats-cooking before handing things back to
> > Junio. Thanks all for review help and for your patience during the past
> > few weeks.
>
> I think I managed to get my working area (together with a handful of
> new entries in the rerere database and a few merge-fix/ entries) in
> sync with what you pushed out well enough that my automated
> procedure would recreate the status of various branches you pushed
> out exactly.
>
> I haven't caught up with the changes in the component branches,
> though, so it may take a few days until I start picking up new
> topics from the list traffic.
>
> > * bc/object-id (2015-11-20) 12 commits
> > - remote: convert functions to struct object_id
> > - Remove get_object_hash.
> > - Convert struct object to object_id
> > - Add several uses of get_object_hash.
> > - object: introduce get_object_hash macro.
> > - ref_newer: convert to use struct object_id
> > - push_refs_with_export: convert to struct object_id
> > - get_remote_heads: convert to struct object_id
> > - parse_fetch: convert to use struct object_id
> > - add_sought_entry_mem: convert to struct object_id
> > - Convert struct ref to use object_id.
> > - sha1_file: introduce has_object_file helper.
> >
> > More transition from "unsigned char[40]" to "struct object_id".
> >
> > This needed a few merge fixups, but is mostly disentangled from other
> > topics.
> >
> > Will merge to 'next'.
>
> Aside from niggles on titles of a handful of changes in this topic,
> I have a bit of concern with this one and dt/refs-backend-pre-vtable
> topic (marked as "Will merge to 'master' two cycles from now.",
> which I am reading as "two cycles" means 2 x (8-10 week release
> cycle), not "two integration cycles by the maintainer, aka two
> issues of What's cooking report", which is typically less than a
> week).
>
> The merge resolution in 'pu' discards what this topic did to refs.c
> because much of the original goes away from there, but does it mean
> (remember, I haven't caught up with the contents of the topics yet)
> that the merge reverts part of what this topic did, and in an ideal
> world, if the other one were more mature when this topic got
> started, more use of "unsigned char[40]" would have been migrated to
> "struct object_id" in new files the other one introduced? Or
> perhaps we would want to go the other way around, i.e. as this topic
> conceptually is fairly straight-forward, merge this to 'next' and
> then down to 'master' (which would not take two release cycles) and
> then redo the other topic on top?
>
> > * mr/ff-refs (2015-11-28) 6 commits
> > - builtin/ff-refs.c: mark some file-local variables static
> > - ff-refs: Add tests
> > - ff-refs: Add documentation
> > - ff-refs: add --dry-run and --skip-worktree options
> > - ff-refs: update each updatable ref
> > - ff-refs: builtin cmd to check and fast forward local refs to their upstream
> >
> > Specialized command to fast-forward refs to match their upstream.
> >
> > I remain skeptical that this is necessary or sufficient. Comments
> > welcome.
> >
> > Will hold.
>
> This is another one that needs some evil-merge interaction with
> bc/object-id, but I have a feeling that this is not such a good
> addition to our workflow elements, so I am not worried too much
> about it. I'm inclined to eject this topic (and will welcome if
> people come up with an alternative, perhaps based on the "let fetch
> do so instead" approach discussed there).
>
> > * ps/rebase-keep-empty (2015-11-24) 2 commits
> > - rebase: fix preserving commits with --keep-empty
> > - rebase: test broken behavior with --keep-empty
> >
> > Keep duplicate commits via rebase --keep-empty.
> >
> > I'm not sure if I agree with this interpretation of the "rebase
> > --keep-empty" documentation, but I haven't thought too hard about it.
> > Comments welcome.
>
> "--keep-empty" has always been about keeping an originally empty
> commit, not a commit that becomes empty because of rebasing
> (i.e. what has already been applied to the updated base). The
> documentation, if it leads to any other interpretation, needs to be
> fixed.
>
> Besides, if "--keep-empty" were to mean "keep redundant ones that
> are already in the updated base", the patch must do a lot more,
> e.g. stop filtering with git-cherry patch equivalence.
>
> I'm inclined to eject this topic.
>
>
> > * ls/test-must-fail-sigpipe (2015-11-28) 2 commits
> > (merged to 'next' on 2015-12-01 at d374686)
> > + add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
> > + implement test_might_fail using a refactored test_must_fail
> >
> > Fix some racy client/server tests by treating SIGPIPE the same as a
> > normal non-zero exit.
> >
> > Will merge to 'master' two cycles from now.
>
> Hmm, perhaps I misread what you meant by "two cycles", as this is
> only the test suite and I cannot imagine we would want to be
> ultra-safe to cook that for two release cycles, and you did mean two
> issues of "What's cooking" report?
>
> If so, I'll have to rethink the comment on bc/object-id I made
> earlier...
>
> > * dt/refs-backend-pre-vtable (2015-11-20) 10 commits
> > (merged to 'next' on 2015-11-24 at 8fd7293)
> > + refs: break out ref conflict checks
> > + files_log_ref_write: new function
> > + initdb: make safe_create_dir public
> > + refs: split filesystem-based refs code into a new file
> > + refs/refs-internal.h: new header file
> > + refname_is_safe(): improve docstring
> > + pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
> > + copy_msg(): rename to copy_reflog_msg()
> > + verify_refname_available(): new function
> > + verify_refname_available(): rename function
> >
> > Code preparation for pluggable ref backends.
> >
> > Will merge to 'master' two cycles from now.
>
> ... that is, I'd very much prefer bc/object-id redone on top of an
> updated codebase that already has dt/refs-backend-pre-vtable in it.
>From a selfish perspective, I, would prefer for object-ids to not happen
quite yet for the refs code. I have already prepared (but not yet sent)
a new version of the refs backend vtable (and lmdb) code on top of
refs-backend-pre-vtable, and it'll be a hassle to reroll it on top of
new object-id stuff.
I guess I'll go ahead and send mine now, and we can later make a
decision about how to deal with the object-id stuff.
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)
2015-12-02 22:31 3% ` Jeff King
@ 2015-12-02 23:31 0% ` Junio C Hamano
2015-12-03 1:09 0% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2015-12-02 23:31 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote:
>
>> I think I managed to get my working area (together with a handful of
>> new entries in the rerere database and a few merge-fix/ entries) in
>> sync with what you pushed out well enough that my automated
>> procedure would recreate the status of various branches you pushed
>> out exactly.
>>
>> I haven't caught up with the changes in the component branches,
>> though, so it may take a few days until I start picking up new
>> topics from the list traffic.
>
> My whole workspace is at https://github.com/peff/git, if fetching that
> directly is easier. I just noticed that my refspecs were not configured
> to push up refs/merge-fix. I've just fixed that and pushed again.
>
> I'll leave it that way for a few more days, but then will probably take
> it back to my usual contributor setup (i.e., just my topics and personal
> integration branches).
Thanks. I haven't re-fetched from you, but I think I am good.
> My "two cycles from now" meant "two integration cycles". I seemed to do
> only about two per week. You can take those all with a grain of salt. It
> was meant only as a note to myself that the topic seemed risky enough to
> allow extra cooking time in next.
>
> Since your "Meta/cook -w" output shows dates of merges, I imagine you
> are in the habit of simply looking at those dates and saying "eh, this
> has been in next for 2 weeks and nobody has complained; that's enough
> cooking time".
Yup ;-)
> (which is why it doesn't need more fixup to compile). We did not drop
> any actual function conversions (which might have been wrong but still
> compiled, if both the function signature and its callers all moved).
OK, good to know.
I just finished my first pass of going through "cook -w" output and
had trouble judging jk/send-email-ssl-errors topic, which is marked
as "waiting for re-roll", but I cannot seem to find any discussion
on it, just the original patch $gmane/281655. Are there concerns?
^ permalink raw reply [relevance 0%]
* Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)
2015-12-02 22:11 2% ` Junio C Hamano
@ 2015-12-02 22:31 3% ` Jeff King
2015-12-02 23:31 0% ` Junio C Hamano
2015-12-03 1:09 0% ` Junio C Hamano
2015-12-03 0:29 0% ` David Turner
1 sibling, 2 replies; 200+ results
From: Jeff King @ 2015-12-02 22:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote:
> I think I managed to get my working area (together with a handful of
> new entries in the rerere database and a few merge-fix/ entries) in
> sync with what you pushed out well enough that my automated
> procedure would recreate the status of various branches you pushed
> out exactly.
>
> I haven't caught up with the changes in the component branches,
> though, so it may take a few days until I start picking up new
> topics from the list traffic.
My whole workspace is at https://github.com/peff/git, if fetching that
directly is easier. I just noticed that my refspecs were not configured
to push up refs/merge-fix. I've just fixed that and pushed again.
I'll leave it that way for a few more days, but then will probably take
it back to my usual contributor setup (i.e., just my topics and personal
integration branches).
Let me know if there's anything else I can do to help with the handoff.
> > * bc/object-id (2015-11-20) 12 commits
> [...]
>
> Aside from niggles on titles of a handful of changes in this topic,
> I have a bit of concern with this one and dt/refs-backend-pre-vtable
> topic (marked as "Will merge to 'master' two cycles from now.",
> which I am reading as "two cycles" means 2 x (8-10 week release
> cycle), not "two integration cycles by the maintainer, aka two
> issues of What's cooking report", which is typically less than a
> week).
My "two cycles from now" meant "two integration cycles". I seemed to do
only about two per week. You can take those all with a grain of salt. It
was meant only as a note to myself that the topic seemed risky enough to
allow extra cooking time in next.
Since your "Meta/cook -w" output shows dates of merges, I imagine you
are in the habit of simply looking at those dates and saying "eh, this
has been in next for 2 weeks and nobody has complained; that's enough
cooking time".
> The merge resolution in 'pu' discards what this topic did to refs.c
> because much of the original goes away from there, but does it mean
> (remember, I haven't caught up with the contents of the topics yet)
> that the merge reverts part of what this topic did, and in an ideal
> world, if the other one were more mature when this topic got
> started, more use of "unsigned char[40]" would have been migrated to
> "struct object_id" in new files the other one introduced? Or
> perhaps we would want to go the other way around, i.e. as this topic
> conceptually is fairly straight-forward, merge this to 'next' and
> then down to 'master' (which would not take two release cycles) and
> then redo the other topic on top?
I took the resolution proposed by brian, which was that the refs.c code
went away. There was some evil-merge required to make the new
refs/files-backend.c compile (in my refs/merge-fix/bc/object-id) for
code that moved. I was surprised there wasn't more, but I think it's
right. We dropped the _users_ of some sha1/object_id transition code
(which is why it doesn't need more fixup to compile). We did not drop
any actual function conversions (which might have been wrong but still
compiled, if both the function signature and its callers all moved).
As it's all part of an incremental conversion anyway, my feeling was
that it was OK to move forward as long as it wasn't disturbing topics in
flight (assuming we're agreed on the overall direction, which I think is
the case).
> > * mr/ff-refs (2015-11-28) 6 commits
> [...]
>
> This is another one that needs some evil-merge interaction with
> bc/object-id, but I have a feeling that this is not such a good
> addition to our workflow elements, so I am not worried too much
> about it. I'm inclined to eject this topic (and will welcome if
> people come up with an alternative, perhaps based on the "let fetch
> do so instead" approach discussed there).
Right. There's another merge-fix for this.
I explicitly put this after bc/object-id (requiring another merge-fix,
rather than rolling it into the bc/object-id merge fix), because I
expected bc/object-id to graduate, and this one to languish in pu or get
re-rolled.
I agree that ejecting is fine here.
> > * ps/rebase-keep-empty (2015-11-24) 2 commits
> > - rebase: fix preserving commits with --keep-empty
> > - rebase: test broken behavior with --keep-empty
> >
> > Keep duplicate commits via rebase --keep-empty.
> >
> > I'm not sure if I agree with this interpretation of the "rebase
> > --keep-empty" documentation, but I haven't thought too hard about it.
> > Comments welcome.
>
> "--keep-empty" has always been about keeping an originally empty
> commit, not a commit that becomes empty because of rebasing
> (i.e. what has already been applied to the updated base). The
> documentation, if it leads to any other interpretation, needs to be
> fixed.
>
> Besides, if "--keep-empty" were to mean "keep redundant ones that
> are already in the updated base", the patch must do a lot more,
> e.g. stop filtering with git-cherry patch equivalence.
>
> I'm inclined to eject this topic.
That was my thinking too (and I notice it didn't get any review from
anybody else).
> > * ls/test-must-fail-sigpipe (2015-11-28) 2 commits
> > (merged to 'next' on 2015-12-01 at d374686)
> > + add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
> > + implement test_might_fail using a refactored test_must_fail
> >
> > Fix some racy client/server tests by treating SIGPIPE the same as a
> > normal non-zero exit.
> >
> > Will merge to 'master' two cycles from now.
>
> Hmm, perhaps I misread what you meant by "two cycles", as this is
> only the test suite and I cannot imagine we would want to be
> ultra-safe to cook that for two release cycles, and you did mean two
> issues of "What's cooking" report?
Yes, the latter. Even though it is "only" the test suite, it gave us
enough trouble that I did not want to go to next and then immediately to
master in the next cycle (i.e., I wanted to give people time enough to
complain if it breaks their "make test" in next).
> > * dt/refs-backend-pre-vtable (2015-11-20) 10 commits
> > (merged to 'next' on 2015-11-24 at 8fd7293)
> > + refs: break out ref conflict checks
> > + files_log_ref_write: new function
> > + initdb: make safe_create_dir public
> > + refs: split filesystem-based refs code into a new file
> > + refs/refs-internal.h: new header file
> > + refname_is_safe(): improve docstring
> > + pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
> > + copy_msg(): rename to copy_reflog_msg()
> > + verify_refname_available(): new function
> > + verify_refname_available(): rename function
> >
> > Code preparation for pluggable ref backends.
> >
> > Will merge to 'master' two cycles from now.
>
> ... that is, I'd very much prefer bc/object-id redone on top of an
> updated codebase that already has dt/refs-backend-pre-vtable in it.
I think that is OK to do, though I'm not sure the end result will be
all that different.
-Peff
^ permalink raw reply [relevance 3%]
* Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)
@ 2015-12-02 22:11 2% ` Junio C Hamano
2015-12-02 22:31 3% ` Jeff King
2015-12-03 0:29 0% ` David Turner
0 siblings, 2 replies; 200+ results
From: Junio C Hamano @ 2015-12-02 22:11 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> What's cooking in git.git (Dec 2015, #01; Tue, 1)
> --------------------------------------------------
>
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
>
> This should by my final whats-cooking before handing things back to
> Junio. Thanks all for review help and for your patience during the past
> few weeks.
I think I managed to get my working area (together with a handful of
new entries in the rerere database and a few merge-fix/ entries) in
sync with what you pushed out well enough that my automated
procedure would recreate the status of various branches you pushed
out exactly.
I haven't caught up with the changes in the component branches,
though, so it may take a few days until I start picking up new
topics from the list traffic.
> * bc/object-id (2015-11-20) 12 commits
> - remote: convert functions to struct object_id
> - Remove get_object_hash.
> - Convert struct object to object_id
> - Add several uses of get_object_hash.
> - object: introduce get_object_hash macro.
> - ref_newer: convert to use struct object_id
> - push_refs_with_export: convert to struct object_id
> - get_remote_heads: convert to struct object_id
> - parse_fetch: convert to use struct object_id
> - add_sought_entry_mem: convert to struct object_id
> - Convert struct ref to use object_id.
> - sha1_file: introduce has_object_file helper.
>
> More transition from "unsigned char[40]" to "struct object_id".
>
> This needed a few merge fixups, but is mostly disentangled from other
> topics.
>
> Will merge to 'next'.
Aside from niggles on titles of a handful of changes in this topic,
I have a bit of concern with this one and dt/refs-backend-pre-vtable
topic (marked as "Will merge to 'master' two cycles from now.",
which I am reading as "two cycles" means 2 x (8-10 week release
cycle), not "two integration cycles by the maintainer, aka two
issues of What's cooking report", which is typically less than a
week).
The merge resolution in 'pu' discards what this topic did to refs.c
because much of the original goes away from there, but does it mean
(remember, I haven't caught up with the contents of the topics yet)
that the merge reverts part of what this topic did, and in an ideal
world, if the other one were more mature when this topic got
started, more use of "unsigned char[40]" would have been migrated to
"struct object_id" in new files the other one introduced? Or
perhaps we would want to go the other way around, i.e. as this topic
conceptually is fairly straight-forward, merge this to 'next' and
then down to 'master' (which would not take two release cycles) and
then redo the other topic on top?
> * mr/ff-refs (2015-11-28) 6 commits
> - builtin/ff-refs.c: mark some file-local variables static
> - ff-refs: Add tests
> - ff-refs: Add documentation
> - ff-refs: add --dry-run and --skip-worktree options
> - ff-refs: update each updatable ref
> - ff-refs: builtin cmd to check and fast forward local refs to their upstream
>
> Specialized command to fast-forward refs to match their upstream.
>
> I remain skeptical that this is necessary or sufficient. Comments
> welcome.
>
> Will hold.
This is another one that needs some evil-merge interaction with
bc/object-id, but I have a feeling that this is not such a good
addition to our workflow elements, so I am not worried too much
about it. I'm inclined to eject this topic (and will welcome if
people come up with an alternative, perhaps based on the "let fetch
do so instead" approach discussed there).
> * ps/rebase-keep-empty (2015-11-24) 2 commits
> - rebase: fix preserving commits with --keep-empty
> - rebase: test broken behavior with --keep-empty
>
> Keep duplicate commits via rebase --keep-empty.
>
> I'm not sure if I agree with this interpretation of the "rebase
> --keep-empty" documentation, but I haven't thought too hard about it.
> Comments welcome.
"--keep-empty" has always been about keeping an originally empty
commit, not a commit that becomes empty because of rebasing
(i.e. what has already been applied to the updated base). The
documentation, if it leads to any other interpretation, needs to be
fixed.
Besides, if "--keep-empty" were to mean "keep redundant ones that
are already in the updated base", the patch must do a lot more,
e.g. stop filtering with git-cherry patch equivalence.
I'm inclined to eject this topic.
> * ls/test-must-fail-sigpipe (2015-11-28) 2 commits
> (merged to 'next' on 2015-12-01 at d374686)
> + add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
> + implement test_might_fail using a refactored test_must_fail
>
> Fix some racy client/server tests by treating SIGPIPE the same as a
> normal non-zero exit.
>
> Will merge to 'master' two cycles from now.
Hmm, perhaps I misread what you meant by "two cycles", as this is
only the test suite and I cannot imagine we would want to be
ultra-safe to cook that for two release cycles, and you did mean two
issues of "What's cooking" report?
If so, I'll have to rethink the comment on bc/object-id I made
earlier...
> * dt/refs-backend-pre-vtable (2015-11-20) 10 commits
> (merged to 'next' on 2015-11-24 at 8fd7293)
> + refs: break out ref conflict checks
> + files_log_ref_write: new function
> + initdb: make safe_create_dir public
> + refs: split filesystem-based refs code into a new file
> + refs/refs-internal.h: new header file
> + refname_is_safe(): improve docstring
> + pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
> + copy_msg(): rename to copy_reflog_msg()
> + verify_refname_available(): new function
> + verify_refname_available(): rename function
>
> Code preparation for pluggable ref backends.
>
> Will merge to 'master' two cycles from now.
... that is, I'd very much prefer bc/object-id redone on top of an
updated codebase that already has dt/refs-backend-pre-vtable in it.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
@ 2015-12-01 23:10 2% ` Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2015-12-01 23:10 UTC (permalink / raw)
To: brian m. carlson, git
On Sat, Nov 28, 2015 at 05:09:32PM +0000, brian m. carlson wrote:
> > I got a bunch of conflicts trying to merge it into 'next' and 'pu' and
> > punted on it. I think the tricky bits are coming from
> > dt/refs-backend-pre-vtable, where there was a lot of code movement.
>
> I think as for merging into the latest pu, the thing you want to do in
> refs.c is simply take what pu has. You'll have to fix up one additional
> struct object call site. The same thing goes for builtin/merge.c and
> builtin/branch.c, where the code I changed has since been eliminated.
>
> I also noticed that merge-recursive.c and builtin/ff-refs.c needed some
> minor fixups as well, but a quick compile will show you where those are.
> I've included a diff for those two below.
Thanks, this gave me an opportunity to play with Junio's merge-fix
scripts. :) The result will be in the "pu" I push out shortly.
-Peff
^ permalink raw reply [relevance 2%]
* Re: [PATCH v6 25/25] refs: break out ref conflict checks
@ 2015-11-06 23:24 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-11-06 23:24 UTC (permalink / raw)
To: Michael Haggerty; +Cc: David Turner, git, Jeff King
Junio C Hamano <gitster@pobox.com> writes:
> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
>> Junio, if there are no more comments, would you mind
>>
>> s/verify_no_descendants/find_descendant_ref/
>>
>> in the log message of this commit? And then, if you are also OK with the
>> new subdirectory introduced in this patch series, David and I seem to be
>> in agreement that it is ready to go. It would be great if this patch
>> series could be merged in a timely manner, as it will conflict with
>> nearly any other changes that people might want to undertake in the refs
>> code.
>
> Thanks for working well together. Let me see what I can do today...
What I'll push out later today merges this to the tip of 'pu'.
The resolution is the same for 'jch' or 'next' (I checked).
I have to say that the merge of this topioc is not pretty. A topic
that is already in flight has changed ref_is_hidden() in refs.c; you
move this block of code first to refs/refs-backend.c and then to
refs/refs.c, and the recursive merge ends up saying "The trunk side
changed this block of code in refs/refs-backend.c while the side
branch removed that block".
The resolution has to become an evil merge that brings in a new file
refs/refs.c from the tip of your topic to the trunk while replaying
that change in the lost block to that new file. Because an
in-flight topic like this one needs to be merged over and over until
it gets merged to 'master' I'd prepare an evil merge-fix to be
squashed into the result of an auto-merge to help this process for
the interim maintainer, but this topic is placing more burden than
it otherwise would to the entire process.
Incidentally, that was why I originally asked you if you want to be
an interim maintainer for this cycle. Whoever is doing a large code
movement with a large patch series must be the one who would know
the best how its interaction with other topics is best managed.
I wonder if refs.c -> refs/refs.c rename is a good idea. I do agree
that refs/ subdirectory that collects the backend implementation
details is a very sensible thing to do, but if the public and
generic API were left in refs.c, this particular conflict might have
been less severe and easier to handle. Whatever.
For those who are listening in from sideline, in case when they need
to deal with a similar situation "the code our side changed gets
moved to elsewhere by a side branch", here is what I did:
* let "git merge --conflict=diff3" attempt and fail.
* a conflicted file will have something like this:
<<<< ours
... the code with changes made by our side (trunk) ...
|||| base
... the code before our side (trunk) made the above changes ...
====
>>>> theirs
* create two new files, OURS and BASE. Save the part in that
conflicted file between <<<< and |||| to OURS, and between ||||
and ==== to BASE.
* look at "diff -u BASE OURS", find in the (failed) automerge
result where the original went (a sample of it is at the end of
this message), and apply that change manually.
The above is only to resolve this conflict *once*.
Automating future merges of this branch into a slightly updated
codebase needs help from rerere and also merge-fix/ machinery (this
is not in core-git proper, but the tool is in the 'todo' branch and
its use is described in howto/maintain-git.txt).
Essentially the procedure were:
* "git checkout pu^0"
* let "git merge --conflict=diff3" attempt and fail.
* accept removal of the conflicted block in refs/files-backend.c in
the editor, do "git rerere" to record it. commit the result.
* apply the above diff between BASE and OURS, commit the result.
* git update-ref refs/merge-fix/dt/refs-backend-pre-vtable HEAD
With this, the Reintegrate script (on 'todo', checked out in "Meta/"
subdirectory) will be able to reproduce the evil merge, e.g.
$ git checkout pu
$ echo dt/refs-backend-pre-vtable | Meta/Reintegrate
would first let "git rerere" replay the removal of conflicted block
in refs/files-backend.c and then amend the result by squashing the
change in merge-fix/dt/refs-backend-pre-vtable.
--- V_BASE 2015-11-06 14:51:10.150197900 -0800
+++ V_OURS 2015-11-06 14:51:05.638059250 -0800
@@ -117,7 +117,7 @@
return 0;
}
-int ref_is_hidden(const char *refname)
+int ref_is_hidden(const char *refname, const char *refname_full)
{
int i;
@@ -125,6 +125,7 @@
return 0;
for (i = hide_refs->nr - 1; i >= 0; i--) {
const char *match = hide_refs->items[i].string;
+ const char *subject;
int neg = 0;
int len;
@@ -133,10 +134,18 @@
match++;
}
- if (!starts_with(refname, match))
+ if (*match == '^') {
+ subject = refname_full;
+ match++;
+ } else {
+ subject = refname;
+ }
+
+ /* refname can be NULL when namespaces are used. */
+ if (!subject || !starts_with(subject, match))
continue;
len = strlen(match);
- if (!refname[len] || refname[len] == '/')
+ if (!subject[len] || subject[len] == '/')
return !neg;
}
return 0;
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2015, #01; Thu, 5)
@ 2015-11-05 23:13 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-11-05 23:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Git 2.6.3 has been tagged, with accumulated fixes and minor updates
that are already in 'master'. We have about 5 weeks left til -rc0
so hopefully a handful of topics that are not yet in 'next' but have
already been reviewed and polished may be able to be merged to
'next', cook in there for a while and be in 2.7.0 release. I'll be
offline for a few weeks starting this weekend, but I am confident
that our capable interim maintainer can shepherd these topics
forward with the help from our contributors ;-).
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* da/difftool (2015-10-29) 1 commit
(merged to 'next' on 2015-11-01 at 4e5ab33)
+ difftool: ignore symbolic links in use_wt_file
The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them. Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.
* jc/mailinfo-lib (2015-11-01) 1 commit
(merged to 'next' on 2015-11-01 at 3ecaa28)
+ mailinfo: fix passing wrong address to git_mailinfo_config
Hotfix for a topic already in 'master'.
* jk/initialization-fix-to-add-submodule-odb (2015-10-28) 1 commit
(merged to 'next' on 2015-11-01 at da94b97)
+ add_submodule_odb: initialize alt_odb list earlier
We peek objects from submodule's object store by linking it to the
list of alternate object databases, but the code to do so forgot to
correctly initialize the list.
* js/git-gdb (2015-10-30) 1 commit
(merged to 'next' on 2015-11-01 at 3d232d5)
+ test: facilitate debugging Git executables in tests with gdb
Allow easier debugging of a single "git" invocation in our test
scripts.
* kn/for-each-branch (2015-10-30) 1 commit
(merged to 'next' on 2015-11-01 at 4249dc9)
+ ref-filter: fallback on alphabetical comparison
Using the timestamp based criteria in "git branch --sort" did not
tiebreak branches that point at commits with the same timestamp (or
the same commit), making the resulting output unstable.
* mk/blame-first-parent (2015-10-30) 3 commits
(merged to 'next' on 2015-11-01 at 3f87150)
+ blame: allow blame --reverse --first-parent when it makes sense
+ blame: extract find_single_final
+ blame: test to describe use of blame --reverse --first-parent
"git blame" learnt to take "--first-parent" and "--reverse" at the
same time when it makes sense.
* rs/daemon-plug-child-leak (2015-11-02) 2 commits
(merged to 'next' on 2015-11-02 at 64afbb9)
+ daemon: plug memory leak
+ run-command: factor out child_process_clear()
(this branch is used by sb/submodule-parallel-update.)
"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.
* rs/show-branch-argv-array (2015-11-01) 1 commit
(merged to 'next' on 2015-11-01 at fac4fa6)
+ show-branch: use argv_array for default arguments
Code simplification.
* rs/wt-status-detached-branch-fix (2015-11-01) 5 commits
(merged to 'next' on 2015-11-01 at cb23615)
+ wt-status: use skip_prefix() to get rid of magic string length constants
+ wt-status: don't skip a magical number of characters blindly
+ wt-status: avoid building bogus branch name with detached HEAD
+ wt-status: exit early using goto in wt_shortstatus_print_tracking()
+ t7060: add test for status --branch on a detached HEAD
"git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.
--------------------------------------------------
[New Topics]
* ad/sha1-update-chunked (2015-11-05) 2 commits
- sha1: allow limiting the size of the data passed to SHA1_Update()
- sha1: provide another level of indirection for the SHA-1 functions
Apple's common crypto implementation of SHA1_Update() does not take
more than 4GB at a time, and we now have a compile-time workaround
for it.
I think this is more or less ready. I am skeptical about the file
location reorg ([PATCH 3/3] $gmane/280912) and did not queue it.
* dt/http-range (2015-11-02) 2 commits
(merged to 'next' on 2015-11-03 at 7c3cc60)
+ http: use off_t to store partial file size
+ http.c: use CURLOPT_RANGE for range requests
A Range: request can be responded with a full response and when
asked properly libcurl knows how to strip the result down to the
requested range. However, we were hand-crafting a range request
and it did not kick in.
Will merge to 'master'.
* vl/grep-configurable-threads (2015-11-01) 1 commit
- grep: add --threads=<num> option and grep.threads configuration
"git grep" can now be configured (or told from the command line)
how many threads to use when searching in the working tree files.
Expecting a reroll.
($gmane/280854)
* kf/http-proxy-auth-methods (2015-11-04) 3 commits
- SQUASH???
- http: use credential API to handle proxy authentication
- http: allow selection of proxy authentication method
New http.proxyAuthMethod configuration variable can be used to
specify what authentication method to use, as a way to work around
proxies that do not give error response expected by libcurl when
CURLAUTH_ANY is used. Also, the codepath for proxy authentication
has been taught to use credential API to store the authentication
material in user's keyrings.
Still being worked on.
($gmane/280925).
* lf/ref-is-hidden-namespace (2015-11-05) 4 commits
- t5509: add basic tests for hideRefs
- hideRefs: add support for matching full refs
- upload-pack: strip refs before calling ref_is_hidden()
- config.txt: document the semantics of hideRefs with namespaces
Extend transfer.hideRefs to work better with use of namespaces.
Will merge to 'next'.
* dg/git-svn-empty-dirs (2015-11-05) 1 commit
- git-svn: improve rebase/mkdirs performance
* fp/subtree-todo-update (2015-11-05) 1 commit
- contrib/subtree: remove "push" command from the "todo" file
--------------------------------------------------
[Stalled]
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* dk/gc-idx-wo-pack (2015-11-04) 3 commits
- gc: remove garbage .idx files from pack dir
- t5304: test cleaning pack garbage
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.
We may want to do the same for .bitmap (and notice but not prune
.keep) without corresponding .pack, but that can be a separate
topic.
Will merge to 'next'.
* sb/submodule-parallel-update (2015-11-05) 10 commits
- clone: allow an explicit argument for parallel submodule clones
- submodule update: expose parallelism to the user
- git submodule update: have a dedicated helper for cloning
- fetching submodules: respect `submodule.jobs` config option
- submodule config: update parse_config()
- submodule config: remove name_and_item_from_var
- submodule config: keep update strategy around
- run_processes_parallel: add output to tracing messages
- Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update
- Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
(this branch uses sb/submodule-parallel-fetch; is tangled with rs/daemon-leak-fix.)
Builds on top of the "fetch --recurse-submodules" work to introduce
parallel downloading into multiple submodules for "submodule update".
Waiting for sb/submodule-parallel-fetch to stabilize.
It would be the cleanest to rebuild sb/submodule-parallel-fetch on
top of 2.7.0 once it ships and then build this directly on top;
that way, we do not have to have merges in this topic that
distracting (besides, some part of the other topic can be updated
in-place instead of this follow-up topic tweaking them as past
mistakes and inflexibilities).
* jc/strbuf-gets (2015-10-28) 17 commits
- test-sha1-array: read command stream with strbuf_gets()
- grep: read -f file with strbuf_gets()
- send-pack: read list of refs with strbuf_gets()
- column: read lines with strbuf_gets()
- cat-file: read batch stream with strbuf_gets()
- transport-helper: read helper response with strbuf_gets()
- clone/sha1_file: read info/alternates with strbuf_gets()
- remote.c: read $GIT_DIR/remotes/* with strbuf_gets()
- ident.c: read /etc/mailname with strbuf_gets()
- rev-parse: read parseopt spec with strbuf_gets()
- revision: read --stdin with strbuf_gets()
- hash-object: read --stdin-paths with strbuf_gets()
- mktree: read textual tree representation with strbuf_gets()
- update-index: read list of paths with strbuf_gets() under --stdin
- update-index: read --index-info with strbuf_gets()
- check-attr, check-ignore, checkout-index: read paths with strbuf_gets()
- strbuf: add strbuf_gets()
Teach codepaths that communicate with users by reading text files
to be more lenient to editors that write CRLF-terminated lines.
Note that this is only about communication with Git, like feeding
list of object names from the standard input instead of from the
command line, and does not involve files in the working tree.
Waiting for reviews.
* eg/p4-submit-catch-failure (2015-10-30) 1 commit
- git-p4: clean up after p4 submit failure
Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.
Needs an update to test.
($gmane/280539)
* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
- (NEEDSWORK $gmane/280507) ident.c: add support for IPv6
A build without NO_IPv6 used to use gethostbyname() when guessing
user's hostname, instead of getaddrinfo() that is used in other
codepaths in such a build.
Waiting for a reroll.
($gmane/280507)
* ea/checkout-progress (2015-11-01) 1 commit
(merged to 'next' on 2015-11-03 at 08a8d1f)
+ checkout: add --progress option
"git checkout" did not follow the usual "--[no-]progress"
convention and implemented only "--quiet" that is essentially
a superset of "--no-progress". Extend the command to support the
usual "--[no-]progress".
Will merge to 'master'.
* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit
- test: accept death by SIGPIPE as a valid failure mode
In some tests we expect a git command that transfers objects to
result in failure, but it is normal for the failure to come from
SIGPIPE when the other end of the connection detects an (expected)
error and hangs up. However, test_expect_failure helper function
was not prepared to see a death by sigpipe as a normal failure
exit.
It probably is more sensible to limit the test that allows depth by
SIGPIPE as Lars Schneider suggests, so it is likely that this will
be replaced while I am away ;-)
* pt/http-socks-proxy (2015-10-26) 1 commit
- remote-http(s): support SOCKS proxies
Add support for talking http/https over socks proxy.
Needs a sign-off from the original author.
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
(merged to 'next' on 2015-10-23 at 8a697f0)
+ notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
As the patch was done on top of the 'drop old-syntax from merge',
this has to wait until that other topic can graduate, unfortunately.
It can be redone in a way that does not depend on that topic after
this cycle, though.
Will keep in 'next'.
* jc/mailinfo (2015-10-21) 1 commit
- mailinfo: ignore in-body header that we do not care about
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
(merged to 'next' on 2015-10-23 at dc631e5)
+ am: make a direct call to merge_recursive
+ merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, we would want to see it backed up by numbers.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
Will keep in 'next'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-11-05) 16 commits
- strbuf: update documentation for strbuf_read_once()
- run-command: remove set_nonblocking()
(merged to 'next' on 2015-10-23 at 8f04bbd)
+ run-command: fix missing output from late callbacks
+ test-run-command: increase test coverage
+ test-run-command: test for gracefully aborting
+ run-command: initialize the shutdown flag
+ run-command: clear leftover state from child_process structure
+ run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
(this branch is used by sb/submodule-parallel-update; is tangled with rs/daemon-leak-fix.)
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Still being worked on, but it seems that we are seeing light at the
end of the tunnel.
($gmane/280937)
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
Will keep in 'next'.
--------------------------------------------------
[Discarded]
* km/cache-entry-refcnt (2015-10-14) 1 commit
. merge: fix cache_entry use-after-free
Made unnecessary with dt/name-hash-dir-entry-fix topic.
* rs/daemon-leak-fix (2015-10-31) 3 commits
(merged to 'next' on 2015-11-01 at 9b6c8f9)
+ daemon: plug memory leak
+ run-command: export child_process_clear()
+ run-command: name the cleanup function child_process_clear()
(this branch uses sb/submodule-parallel-fetch; is tangled with sb/submodule-parallel-update.)
"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.
This was tangled with another topic that was not quite ready.
Discard and replace it with an equivalent rs/daemon-plug-child-leak
that is independent.
* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
. refs: break out ref conflict checks
. refs: make files_log_ref_write functions public
. initdb: move safe_create_dir into common code
. refs.c: move should_autocreate_reflog to common code
. refs.c: move peel_object to the common code
. refs.c: move copy_msg to the common code
. refs.c: move refname_is_safe to the common code
. refs: move transaction functions into common code
. refs.c: move head_ref_namespaced to the common code
. refs.c: move ref iterators to the common code
. refs.c: move prettify_refname to the common code
. refs.c: move is_branch to the common code
. refs.c: move check_refname_format to the common code
. refs.c: move resolve_refdup to common
. refs.c: move read_ref, read_ref_full and ref_exists to the common code
. refs.c: move warn_if_dangling_symref* to the common code
. refs.c: move dwim and friend functions to the common refs code
. refs.c: move the hidden refs functions to the common code
. refs.c: move read_ref_at to the common refs file
. refs.c: move delete_pseudoref and delete_ref to the common code
. refs.c: move update_ref to refs.c
. refs.c: add a new refs.c file to hold all common refs code
. refs-be-files.c: rename refs to refs-be-files
. refs: make repack_without_refs and is_branch public
. refs.c: create a public version of verify_refname_available
. Merge branch 'jk/war-on-sprintf' into HEAD
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
It seems Michael's "I'd do it like this if I were doing it"
$gmane/280754 would be the way forward?
Ejected while the topic is in flux, as this and its later reroll
both want to move things around while other topics want to update
the files involved.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2015, #07; Fri, 30)
@ 2015-10-30 22:07 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-30 22:07 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
At tinyurl.com/gitCal, I drew a 14-week schedule for this cycle. I
plan to be offline during weeks #7-#9 myself; hopefully we'll have
capable interim maintainers to take care of the list traffic in the
meantime as in past years.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ar/clone-dissociate (2015-10-22) 1 commit
(merged to 'next' on 2015-10-23 at 6bf746f)
+ clone: allow "--dissociate" without reference
"git clone --dissociate" used to require that "--reference" was
used at the same time, but you can create a new repository that
borrows objects from another without using "--reference", namely
with "clone --local" from a repository that borrows objects from
other repositories.
* dt/name-hash-dir-entry-fix (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at 15eb519)
+ name-hash: don't reuse cache_entry in dir_entry
The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component). This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.
* gr/rebase-i-drop-warn (2015-10-28) 2 commits
(merged to 'next' on 2015-10-29 at 4bfda25)
+ rebase-i: work around Windows CRLF line endings
+ t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.
* jc/add-u-A-default-to-top (2015-10-24) 1 commit
(merged to 'next' on 2015-10-29 at 15aea9c)
+ add: simplify -u/-A without pathspec
"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.
* jc/am-mailinfo-direct (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at ca15014)
+ am: make direct call to mailinfo
(this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
* jc/em-dash-in-doc (2015-10-22) 1 commit
(merged to 'next' on 2015-10-23 at 31a08ce)
+ Documentation: AsciiDoc spells em-dash as double-dashes, not triple
AsciiDoc markup fixes.
* jc/everyday-markup (2015-10-22) 1 commit
(merged to 'next' on 2015-10-22 at 0a2702d)
+ Documentation/everyday: match undefline with the text
AsciiDoc markup fixes.
* jc/mailinfo-lib (2015-10-21) 34 commits
(merged to 'next' on 2015-10-22 at 405bd66)
+ mailinfo: remove calls to exit() and die() deep in the callchain
+ mailinfo: handle charset conversion errors in the caller
+ mailinfo: libify
+ mailinfo: keep the parsed log message in a strbuf
+ mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
+ mailinfo: move content/content_top to struct mailinfo
+ mailinfo: move [ps]_hdr_data to struct mailinfo
+ mailinfo: move cmitmsg and patchfile to struct mailinfo
+ mailinfo: move charset to struct mailinfo
+ mailinfo: move transfer_encoding to struct mailinfo
+ mailinfo: move check for metainfo_charset to convert_to_utf8()
+ mailinfo: move metainfo_charset to struct mailinfo
+ mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
+ mailinfo: move add_message_id and message_id to struct mailinfo
+ mailinfo: move patch_lines to struct mailinfo
+ mailinfo: move filter/header stage to struct mailinfo
+ mailinfo: move global "FILE *fin, *fout" to struct mailinfo
+ mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
+ mailinfo: introduce "struct mailinfo" to hold globals
+ mailinfo: move global "line" into mailinfo() function
+ mailinfo: do not let find_boundary() touch global "line" directly
+ mailinfo: do not let handle_boundary() touch global "line" directly
+ mailinfo: do not let handle_body() touch global "line" directly
+ mailinfo: get rid of function-local static states
+ mailinfo: move definition of MAX_HDR_PARSED closer to its use
+ mailinfo: move cleanup_space() before its users
+ mailinfo: move check_header() after the helpers it uses
+ mailinfo: move read_one_header_line() closer to its callers
+ mailinfo: move handle_boundary() lower
+ mailinfo: plug strbuf leak during continuation line handling
+ mailinfo: explicitly close file handle to the patch output
+ mailinfo: fix an off-by-one error in the boundary stack
+ mailinfo: fold decode_header_bq() into decode_header()
+ mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
* jk/delete-modechange-conflict (2015-10-26) 3 commits
(merged to 'next' on 2015-10-29 at 59ce69d)
+ merge: detect delete/modechange conflict
+ t6031: generalize for recursive and resolve strategies
+ t6031: move triple-rename test to t3030
Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.
* jk/merge-file-exit-code (2015-10-29) 1 commit
(merged to 'next' on 2015-10-29 at 6ae613f)
+ merge-file: clamp exit code to maximum 127
"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.
* jk/war-on-sprintf (2015-10-23) 2 commits
(merged to 'next' on 2015-10-23 at 3a94851)
+ compat/mingw.c: remove printf format warning
+ read_branches_file: plug a FILE* leak
* js/imap-send-curl-compilation-fix (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at 9c4f3eb)
+ imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
"git imap-send" did not compile well with older version of cURL library.
* js/misc-fixes (2015-10-26) 3 commits
(merged to 'next' on 2015-10-29 at 8990f29)
+ Correct fscanf formatting string for I64u values
+ Silence GCC's "cast of pointer to integer of a different size" warning
+ Squelch warning about an integer overflow
Various compilation fixes and squelching of warnings.
* mk/blame-error-message (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at 82a1b18)
+ blame: fix option name in error message
The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".
* rp/link-curl-before-ssl (2015-10-21) 3 commits
(merged to 'next' on 2015-10-22 at dad4fc6)
+ configure.ac: detect ssl need with libcurl
+ Makefile: make curl-config path configurable
+ Makefile: link libcurl before zlib
The linkage order of libraries was wrong in places around libcurl.
* rs/pop-commit (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at f24d8ed)
+ use pop_commit() for consuming the first entry of a struct commit_list
Code simplification.
* tk/sigchain-unnecessary-post-tempfile (2015-10-22) 4 commits
(merged to 'next' on 2015-10-22 at b049f0a)
+ shallow: remove unused #include "sigchain.h"
+ read-cache: remove unused #include "sigchain.h"
+ diff: remove unused #include "sigchain.h"
+ credential-cache--daemon: remove unused #include "sigchain.h"
Remove no-longer used #include.
* xf/user-manual-ff (2015-10-26) 1 commit
(merged to 'next' on 2015-10-29 at 488c4f8)
+ user-manual: fix the description of fast-forward
* xf/user-manual-markup (2015-10-22) 3 commits
(merged to 'next' on 2015-10-22 at cd33c83)
+ Documentation: match undefline with the text in old release notes
+ Documentation: match underline with the text
+ Documentation: fix header markup
AsciiDoc markup fixes.
--------------------------------------------------
[New Topics]
* sb/submodule-parallel-update (2015-10-29) 9 commits
- clone: allow an explicit argument for parallel submodule clones
- submodule update: expose parallelism to the user
- git submodule update: have a dedicated helper for cloning
- fetching submodules: respect `submodule.jobs` config option
- submodule config: update parse_config()
- submodule config: remove name_and_item_from_var
- submodule config: keep update strategy around
- run_processes_parallel: add output to tracing messages
- Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
(this branch uses sb/submodule-parallel-fetch.)
Builds on top of the "fetch --recurse-submodules" work to introduce
parallel downloading into multiple submodules for "submodule update".
Waiting for reviews.
* jc/strbuf-gets (2015-10-28) 17 commits
- test-sha1-array: read command stream with strbuf_gets()
- grep: read -f file with strbuf_gets()
- send-pack: read list of refs with strbuf_gets()
- column: read lines with strbuf_gets()
- cat-file: read batch stream with strbuf_gets()
- transport-helper: read helper response with strbuf_gets()
- clone/sha1_file: read info/alternates with strbuf_gets()
- remote.c: read $GIT_DIR/remotes/* with strbuf_gets()
- ident.c: read /etc/mailname with strbuf_gets()
- rev-parse: read parseopt spec with strbuf_gets()
- revision: read --stdin with strbuf_gets()
- hash-object: read --stdin-paths with strbuf_gets()
- mktree: read textual tree representation with strbuf_gets()
- update-index: read list of paths with strbuf_gets() under --stdin
- update-index: read --index-info with strbuf_gets()
- check-attr, check-ignore, checkout-index: read paths with strbuf_gets()
- strbuf: add strbuf_gets()
Teach codepaths that communicate with users by reading text files
to be more lenient to editors that write CRLF-terminated lines.
Note that this is only about communication with Git, like feeding
list of object names from the standard input instead of from the
command line, and does not involve files in the working tree.
Waiting for reviews.
* eg/p4-submit-catch-failure (2015-10-30) 1 commit
- git-p4: clean up after p4 submit failure
Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.
Needs an update to test.
* jk/initialization-fix-to-add-submodule-odb (2015-10-28) 1 commit
- add_submodule_odb: initialize alt_odb list earlier
We peek objects from submodule's object store by linking it to the
list of alternate object databases, but the code to do so forgot to
correctly initialize the list.
Will merge to 'next'.
* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
- (NEEDSWORK $gmane/280507) ident.c: add support for IPv6
A build without NO_IPv6 used to use gethostbyname() when guessing
user's hostname, instead of getaddrinfo() that is used in other
codepaths in such a build.
Waiting for a reroll.
($gmane/280507)
* js/git-gdb (2015-10-30) 1 commit
- test: facilitate debugging Git executables in tests with gdb
Allow easier debugging of a single "git" invocation in our test
scripts.
Will merge to 'next'.
* kn/for-each-branch (2015-10-30) 1 commit
- ref-filter: fallback on alphabetical comparison
Using the timestamp based criteria in "git branch --sort" did not
tiebreak branches that point at commits with the same timestamp (or
the same commit), making the resulting output unstable.
Will merge to 'next' and then quickly to 'master'.
* ea/checkout-progress (2015-10-30) 2 commits
- SQUASH???
- checkout: add --progress option
"git checkout" did not follow the usual "--[no-]progress"
convention and implemented only "--quiet" that is essentially
"--no-progress".
Waiting for a reroll.
* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit
- test: accept death by SIGPIPE as a valid failure mode
Waiting for reviews.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* pt/http-socks-proxy (2015-10-26) 1 commit
- remote-http(s): support SOCKS proxies
Add support for talking http/https over socks proxy.
Will merge to 'next'.
* da/difftool (2015-10-29) 1 commit
- difftool: ignore symbolic links in use_wt_file
The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them. Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.
Waiting for response.
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
(merged to 'next' on 2015-10-23 at 8a697f0)
+ notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
Will cook in 'next'.
* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
- refs: break out ref conflict checks
- refs: make files_log_ref_write functions public
- initdb: move safe_create_dir into common code
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.c: move refname_is_safe to the common code
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_pseudoref and delete_ref to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
Reroll exists, but haven't picked up yet.
* jc/mailinfo (2015-10-21) 1 commit
- mailinfo: ignore in-body header that we do not care about
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
(merged to 'next' on 2015-10-23 at dc631e5)
+ am: make a direct call to merge_recursive
+ merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Will keep in 'next' during the 2.7 cycle.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-21) 14 commits
(merged to 'next' on 2015-10-23 at 8f04bbd)
+ run-command: fix missing output from late callbacks
+ test-run-command: increase test coverage
+ test-run-command: test for gracefully aborting
+ run-command: initialize the shutdown flag
+ run-command: clear leftover state from child_process structure
+ run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
(this branch is used by sb/submodule-parallel-update.)
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will cook in 'next'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* km/cache-entry-refcnt (2015-10-14) 1 commit
. merge: fix cache_entry use-after-free
Made unnecessary with dt/name-hash-dir-entry-fix topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2015, #06; Mon, 26)
@ 2015-10-26 23:20 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-26 23:20 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
At tinyurl.com/gitCal, I drew a 14-week schedule for this cycle. I
plan to be offline during weeks #7-#9 myself; hopefully we'll have
capable interim maintainers to take care of the list traffic in the
meantime as in past years.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* dk/p4-import-ctypes (2015-10-20) 1 commit
(merged to 'next' on 2015-10-22 at 5760144)
+ git-p4: import the ctypes module
"git-p4" tried to use from ctypes module without first importing
it.
* dt/t7063-fix-flaky-test (2015-10-19) 1 commit
(merged to 'next' on 2015-10-20 at 156af72)
+ t7063: fix flaky untracked-cache test
* es/worktree-add (2015-10-18) 1 commit
(merged to 'next' on 2015-10-20 at ccadb70)
+ worktree: usage: denote <branch> as optional with 'add'
* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
(merged to 'next' on 2015-10-15 at 7dde994)
+ am -3: do not let failed merge from completing the error codepath
(this branch is used by js/am-3-merge-recursive-direct.)
"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).
* jc/usage-stdin (2015-10-16) 1 commit
(merged to 'next' on 2015-10-20 at 937d4aa)
+ usage: do not insist that standard input must come from a file
The synopsis text and the usage string of subcommands that read
list of things from the standard input are often shown as if they
only take input from a file on a filesystem, which was misleading.
* jk/repository-extension (2015-06-24) 2 commits
(merged to 'next' on 2015-10-22 at 116c8ce)
+ introduce "preciousObjects" repository extension
+ introduce "extensions" form of core.repositoryformatversion
Prepare for Git on-disk repository representation to undergo
backward incompatible changes by introducing a new repository
format version "1", with an extension mechanism.
* kn/for-each-tag (2015-10-18) 1 commit
(merged to 'next' on 2015-10-20 at 7afd374)
+ tag.c: use the correct algorithm for the '--contains' option
Recent update to "git tag --contains" caused a performance
regression.
* mr/worktree-list (2015-10-08) 5 commits
(merged to 'next' on 2015-10-20 at 7cb272d)
+ worktree: add 'list' command
+ worktree: add details to the worktree struct
+ worktree: add a function to get worktree details
+ worktree: refactor find_linked_symref function
+ worktree: add top-level worktree.c
Add the "list" subcommand to "git worktree".
* rt/placeholder-in-usage (2015-10-16) 1 commit
(merged to 'next' on 2015-10-20 at 5189b23)
+ am, credential-cache: add angle brackets to usage string
A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.
* tk/stripspace (2015-10-16) 2 commits
(merged to 'next' on 2015-10-20 at 327a997)
+ stripspace: use parse-options for command-line parsing
+ strbuf: make stripspace() part of strbuf
The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.
--------------------------------------------------
[New Topics]
* gr/rebase-i-drop-warn (2015-10-26) 1 commit
- rebase-i: work around Windows CRLF line endings
Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.
Waiting for comments.
* jc/add-u-A-default-to-top (2015-10-24) 1 commit
- add: simplify -u/-A without pathspec
"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.
Waiting for comments.
* jk/delete-modechange-conflict (2015-10-26) 3 commits
- merge: detect delete/modechange conflict
- t6031: generalize for recursive and resolve strategies
- t6031: move triple-rename test to t3030
Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.
Will merge to 'next'.
* jk/war-on-sprintf (2015-10-23) 2 commits
(merged to 'next' on 2015-10-23 at 3a94851)
+ compat/mingw.c: remove printf format warning
+ read_branches_file: plug a FILE* leak
Will merge to 'master'.
* js/imap-send-curl-compilation-fix (2015-10-26) 1 commit
- imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
"git imap-send" did not compile well with older version of cURL library.
Will merge to 'next'.
* js/misc-fixes (2015-10-26) 3 commits
- Correct fscanf formatting string for I64u values
- Silence GCC's "cast of pointer to integer of a different size" warning
- Squelch warning about an integer overflow
Various compilation fixes and squelching of warnings.
Will merge to 'next'.
* mk/blame-error-message (2015-10-26) 1 commit
- blame: fix option name in error message
Will merge to 'next'.
* pt/http-socks-proxy (2015-10-26) 1 commit
- remote-http(s): support SOCKS proxies
Add support for talking http/https over socks proxy.
Will merge to 'next'.
* rs/pop-commit (2015-10-26) 1 commit
- use pop_commit() for consuming the first entry of a struct commit_list
Code simplification.
Will merge to 'next'.
* xf/user-manual-ff (2015-10-26) 1 commit
- user-manual: fix the description of fast-forward
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* ar/clone-dissociate (2015-10-22) 1 commit
(merged to 'next' on 2015-10-23 at 6bf746f)
+ clone: allow "--dissociate" without reference
"git clone --dissociate" used to require that "--reference" was
used at the same time, but you can create a new repository that
borrows objects from another without using "--reference", namely
with "clone --local" from a repository that borrows objects from
other repositories.
Will merge to 'master'.
* da/difftool (2015-10-21) 1 commit
- difftool: gracefully handle symlinks to directories
The code to reuse checked out files for comparison was too
aggressive and forgot that symbolic links cannot be reused
for comparison.
Smells wrong that this special-cases based on the target of
symbolic link.
* dt/name-hash-dir-entry-fix (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at 15eb519)
+ name-hash: don't reuse cache_entry in dir_entry
The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component). This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.
Will merge to 'master'.
* jc/everyday-markup (2015-10-22) 1 commit
(merged to 'next' on 2015-10-22 at 0a2702d)
+ Documentation/everyday: match undefline with the text
AsciiDoc markup fixes.
Will merge to 'master'.
* tk/sigchain-unnecessary-post-tempfile (2015-10-22) 4 commits
(merged to 'next' on 2015-10-22 at b049f0a)
+ shallow: remove unused #include "sigchain.h"
+ read-cache: remove unused #include "sigchain.h"
+ diff: remove unused #include "sigchain.h"
+ credential-cache--daemon: remove unused #include "sigchain.h"
Remove no-longer used #include.
Will merge to 'master'.
* xf/user-manual-markup (2015-10-22) 3 commits
(merged to 'next' on 2015-10-22 at cd33c83)
+ Documentation: match undefline with the text in old release notes
+ Documentation: match underline with the text
+ Documentation: fix header markup
AsciiDoc markup fixes.
Will merge to 'master'.
* jc/em-dash-in-doc (2015-10-22) 1 commit
(merged to 'next' on 2015-10-23 at 31a08ce)
+ Documentation: AsciiDoc spells em-dash as double-dashes, not triple
AsciiDoc markup fixes.
Will merge to 'master'.
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
(merged to 'next' on 2015-10-23 at 8a697f0)
+ notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
Will cook in 'next'.
* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
- refs: break out ref conflict checks
- refs: make files_log_ref_write functions public
- initdb: move safe_create_dir into common code
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.c: move refname_is_safe to the common code
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_pseudoref and delete_ref to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
Expecting a reroll after an review of the remainder.
($gmane/279897).
* jc/mailinfo (2015-10-21) 1 commit
- mailinfo: ignore in-body header that we do not care about
(this branch uses jc/am-mailinfo-direct and jc/mailinfo-lib.)
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* jc/am-mailinfo-direct (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at ca15014)
+ am: make direct call to mailinfo
(this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
Will merge to 'master'.
* jc/mailinfo-lib (2015-10-21) 34 commits
(merged to 'next' on 2015-10-22 at 405bd66)
+ mailinfo: remove calls to exit() and die() deep in the callchain
+ mailinfo: handle charset conversion errors in the caller
+ mailinfo: libify
+ mailinfo: keep the parsed log message in a strbuf
+ mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
+ mailinfo: move content/content_top to struct mailinfo
+ mailinfo: move [ps]_hdr_data to struct mailinfo
+ mailinfo: move cmitmsg and patchfile to struct mailinfo
+ mailinfo: move charset to struct mailinfo
+ mailinfo: move transfer_encoding to struct mailinfo
+ mailinfo: move check for metainfo_charset to convert_to_utf8()
+ mailinfo: move metainfo_charset to struct mailinfo
+ mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
+ mailinfo: move add_message_id and message_id to struct mailinfo
+ mailinfo: move patch_lines to struct mailinfo
+ mailinfo: move filter/header stage to struct mailinfo
+ mailinfo: move global "FILE *fin, *fout" to struct mailinfo
+ mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
+ mailinfo: introduce "struct mailinfo" to hold globals
+ mailinfo: move global "line" into mailinfo() function
+ mailinfo: do not let find_boundary() touch global "line" directly
+ mailinfo: do not let handle_boundary() touch global "line" directly
+ mailinfo: do not let handle_body() touch global "line" directly
+ mailinfo: get rid of function-local static states
+ mailinfo: move definition of MAX_HDR_PARSED closer to its use
+ mailinfo: move cleanup_space() before its users
+ mailinfo: move check_header() after the helpers it uses
+ mailinfo: move read_one_header_line() closer to its callers
+ mailinfo: move handle_boundary() lower
+ mailinfo: plug strbuf leak during continuation line handling
+ mailinfo: explicitly close file handle to the patch output
+ mailinfo: fix an off-by-one error in the boundary stack
+ mailinfo: fold decode_header_bq() into decode_header()
+ mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
Will merge to 'master'.
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
(merged to 'next' on 2015-10-23 at dc631e5)
+ am: make a direct call to merge_recursive
+ merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Will cook in 'next'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* rp/link-curl-before-ssl (2015-10-21) 3 commits
(merged to 'next' on 2015-10-22 at dad4fc6)
+ configure.ac: detect ssl need with libcurl
+ Makefile: make curl-config path configurable
+ Makefile: link libcurl before zlib
The linkage order of libraries was wrong in places around libcurl.
Will merge to 'master'.
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-23) 18 commits
- (NEEDSWORK) clone: allow an explicit argument for parallel submodule clones
- submodule update: expose parallelism to the user
- git submodule update: have a dedicated helper for cloning
- submodule config: keep update strategy around
(merged to 'next' on 2015-10-23 at 8f04bbd)
+ run-command: fix missing output from late callbacks
+ test-run-command: increase test coverage
+ test-run-command: test for gracefully aborting
+ run-command: initialize the shutdown flag
+ run-command: clear leftover state from child_process structure
+ run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will cook in 'next'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that
has been deprecated since October 2007.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* km/cache-entry-refcnt (2015-10-14) 1 commit
. merge: fix cache_entry use-after-free
Made unnecessary with dt/name-hash-dir-entry-fix topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Oct 2015, #05; Thu, 22)
@ 2015-10-22 20:51 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-22 20:51 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
With somewhat reduced review bandwidth, I'd expect that the upcoming
cycle would be slower than usual. At tinyurl.com/gitCal, I
tentatively drew a 14-week schedule for this cycle (I plan to be
offline during weeks #7-#9 myself---hopefully we'll have capable
interim maintainers to take care of the list traffic in the meantime
as in past years).
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* jk/war-on-sprintf (2015-10-05) 70 commits
(merged to 'next' on 2015-10-15 at 27a1ae5)
+ name-rev: use strip_suffix to avoid magic numbers
+ use strbuf_complete to conditionally append slash
+ fsck: use for_each_loose_file_in_objdir
+ Makefile: drop D_INO_IN_DIRENT build knob
+ fsck: drop inode-sorting code
+ convert strncpy to memcpy
+ notes: document length of fanout path with a constant
+ color: add color_set helper for copying raw colors
+ prefer memcpy to strcpy
+ help: clean up kfmclient munging
+ receive-pack: simplify keep_arg computation
+ avoid sprintf and strcpy with flex arrays
+ use alloc_ref rather than hand-allocating "struct ref"
+ color: add overflow checks for parsing colors
+ drop strcpy in favor of raw sha1_to_hex
+ use sha1_to_hex_r() instead of strcpy
+ daemon: use cld->env_array when re-spawning
+ stat_tracking_info: convert to argv_array
+ http-push: use an argv_array for setup_revisions
+ fetch-pack: use argv_array for index-pack / unpack-objects
+ diagnose_invalid_index_path: use strbuf to avoid strcpy/strcat
+ write_loose_object: convert to strbuf
+ remove_leading_path: use a strbuf for internal storage
+ enter_repo: convert fixed-size buffers to strbufs
+ merge-recursive: convert malloc / strcpy to strbuf
+ transport: use strbufs for status table "quickref" strings
+ apply: convert root string to strbuf
+ init: use strbufs to store paths
+ probe_utf8_pathname_composition: use internal strbuf
+ precompose_utf8: drop unused variable
+ sha1_get_pack_name: use a strbuf
+ http-walker: store url in a strbuf
+ http-push: use strbuf instead of fwrite_buffer
+ remote-ext: simplify git pkt-line generation
+ upload-archive: convert sprintf to strbuf
+ resolve_ref: use strbufs for internal buffers
+ read_remotes_file: simplify string handling
+ read_branches_file: simplify string handling
+ mailmap: replace strcpy with xstrdup
+ help: drop prepend function in favor of xstrfmt
+ ref-filter: drop sprintf and strcpy calls
+ use strip_suffix and xstrfmt to replace suffix
+ fetch: replace static buffer with xstrfmt
+ config: use xstrfmt in normalize_value
+ replace trivial malloc + sprintf / strcpy calls with xstrfmt
+ receive-pack: convert strncpy to xsnprintf
+ http-push: replace strcat with xsnprintf
+ add_packed_git: convert strcpy into xsnprintf
+ entry.c: convert strcpy to xsnprintf
+ grep: use xsnprintf to format failure message
+ compat/hstrerror: convert sprintf to snprintf
+ stop_progress_msg: convert sprintf to xsnprintf
+ find_short_object_filename: convert sprintf to xsnprintf
+ use xsnprintf for generating git object headers
+ archive-tar: use xsnprintf for trivial formatting
+ convert trivial sprintf / strcpy calls to xsnprintf
+ compat/inet_ntop: fix off-by-one in inet_ntop4
+ test-dump-cache-tree: avoid overflow of cache-tree name
+ progress: store throughput display in a strbuf
+ trace: use strbuf for quote_crnl output
+ mailsplit: make PATH_MAX buffers dynamic
+ fsck: use strbuf to generate alternate directories
+ add reentrant variants of sha1_to_hex and find_unique_abbrev
+ strbuf: make strbuf_complete_line more generic
+ add git_path_buf helper function
+ add xsnprintf helper function
+ fsck: don't fsck alternates for connectivity-only check
+ archive-tar: fix minor indentation violation
+ mailsplit: fix FILE* leak in split_maildir
+ show-branch: avoid segfault with --reflog of unborn branch
(this branch is used by dt/refs-backend-lmdb and dt/refs-backend-pre-vtable.)
Many allocations that is manually counted (correctly) that are
followed by strcpy/sprintf have been replaced with a less error
prone constructs such as xstrfmt.
* ls/p4-test-updates (2015-10-12) 2 commits
(merged to 'next' on 2015-10-15 at 3c94932)
+ git-p4: skip t9819 test case on case insensitive file systems
+ git-p4: avoid "stat" command in t9815 git-p4-submit-fail
A few test scripts around "git p4" have been improved for
portability.
* tb/t0027-crlf (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 7ab4f31)
+ t0027: improve test for not-normalized files
The test for various line-ending conversions has been enhanced.
--------------------------------------------------
[New Topics]
* ar/clone-dissociate (2015-10-22) 1 commit
- clone: allow "--dissociate" without reference
"git clone --dissociate" used to require that "--reference" was
used at the same time, but you can create a new repository that
borrows objects from another without using "--reference", namely
with "clone --local" from a repository that borrows objects from
other repositories.
Will merge to 'next'.
* da/difftool (2015-10-21) 1 commit
- difftool: gracefully handle symlinks to directories
The code to reuse checked out files for comparison was too
aggressive and forgot that symbolic links cannot be reused
for comparison.
Smells wrong that this special-cases based on the target of
symbolic link.
* dt/name-hash-dir-entry-fix (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at 15eb519)
+ name-hash: don't reuse cache_entry in dir_entry
The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component). This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.
Will merge to 'master'.
* jc/everyday-markup (2015-10-22) 1 commit
(merged to 'next' on 2015-10-22 at 0a2702d)
+ Documentation/everyday: match undefline with the text
AsciiDoc markup fixes.
Will merge to 'master'.
* jk/repository-extension (2015-06-24) 2 commits
(merged to 'next' on 2015-10-22 at 116c8ce)
+ introduce "preciousObjects" repository extension
+ introduce "extensions" form of core.repositoryformatversion
Prepare for Git on-disk repository representation to undergo
backward incompatible changes by introducing a new repository
format version "1", with an extension mechanism.
Will merge to 'master'.
* tk/sigchain-unnecessary-post-tempfile (2015-10-22) 4 commits
(merged to 'next' on 2015-10-22 at b049f0a)
+ shallow: remove unused #include "sigchain.h"
+ read-cache: remove unused #include "sigchain.h"
+ diff: remove unused #include "sigchain.h"
+ credential-cache--daemon: remove unused #include "sigchain.h"
Remove no-longer used #include.
Will merge to 'master'.
* xf/user-manual-markup (2015-10-22) 3 commits
(merged to 'next' on 2015-10-22 at cd33c83)
+ Documentation: match undefline with the text in old release notes
+ Documentation: match underline with the text
+ Documentation: fix header markup
AsciiDoc markup fixes.
Will merge to 'master'.
* jc/em-dash-in-doc (2015-10-22) 1 commit
- Documentation: AsciiDoc spells em-dash as double-dashes, not triple
AsciiDoc markup fixes.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
- notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
Will cook in 'next'.
* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
- refs: break out ref conflict checks
- refs: make files_log_ref_write functions public
- initdb: move safe_create_dir into common code
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.c: move refname_is_safe to the common code
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_pseudoref and delete_ref to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
Expecting a reroll after an review of the remainder.
($gmane/279897).
* jc/usage-stdin (2015-10-16) 1 commit
(merged to 'next' on 2015-10-20 at 937d4aa)
+ usage: do not insist that standard input must come from a file
The synopsis text and the usage string of subcommands that read
list of things from the standard input are often shown as if they
only take input from a file on a filesystem, which was misleading.
Will merge to 'master'.
* rt/placeholder-in-usage (2015-10-16) 1 commit
(merged to 'next' on 2015-10-20 at 5189b23)
+ am, credential-cache: add angle brackets to usage string
A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.
Will merge to 'master'.
* tk/stripspace (2015-10-16) 2 commits
(merged to 'next' on 2015-10-20 at 327a997)
+ stripspace: use parse-options for command-line parsing
+ strbuf: make stripspace() part of strbuf
The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.
Will merge to 'master'.
* dk/p4-import-ctypes (2015-10-20) 1 commit
(merged to 'next' on 2015-10-22 at 5760144)
+ git-p4: import the ctypes module
"git-p4" tried to use from ctypes module without first importing
it.
Will merge to 'master'.
* dt/t7063-fix-flaky-test (2015-10-19) 1 commit
(merged to 'next' on 2015-10-20 at 156af72)
+ t7063: fix flaky untracked-cache test
Will merge to 'master'.
* es/worktree-add (2015-10-18) 1 commit
(merged to 'next' on 2015-10-20 at ccadb70)
+ worktree: usage: denote <branch> as optional with 'add'
Will merge to 'master'.
* kn/for-each-tag (2015-10-18) 1 commit
(merged to 'next' on 2015-10-20 at 7afd374)
+ tag.c: use the correct algorithm for the '--contains' option
Recent update to "git tag --contains" caused a performance
regression.
Will merge to 'master'.
* mr/worktree-list (2015-10-08) 5 commits
(merged to 'next' on 2015-10-20 at 7cb272d)
+ worktree: add 'list' command
+ worktree: add details to the worktree struct
+ worktree: add a function to get worktree details
+ worktree: refactor find_linked_symref function
+ worktree: add top-level worktree.c
Add the "list" subcommand to "git worktree".
Will merge to 'master'.
* jc/mailinfo (2015-10-21) 1 commit
- mailinfo: ignore in-body header that we do not care about
(this branch uses jc/am-mailinfo-direct and jc/mailinfo-lib.)
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* jc/am-mailinfo-direct (2015-10-21) 1 commit
(merged to 'next' on 2015-10-22 at ca15014)
+ am: make direct call to mailinfo
(this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
Will merge to 'master'.
* jc/mailinfo-lib (2015-10-21) 34 commits
(merged to 'next' on 2015-10-22 at 405bd66)
+ mailinfo: remove calls to exit() and die() deep in the callchain
+ mailinfo: handle charset conversion errors in the caller
+ mailinfo: libify
+ mailinfo: keep the parsed log message in a strbuf
+ mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
+ mailinfo: move content/content_top to struct mailinfo
+ mailinfo: move [ps]_hdr_data to struct mailinfo
+ mailinfo: move cmitmsg and patchfile to struct mailinfo
+ mailinfo: move charset to struct mailinfo
+ mailinfo: move transfer_encoding to struct mailinfo
+ mailinfo: move check for metainfo_charset to convert_to_utf8()
+ mailinfo: move metainfo_charset to struct mailinfo
+ mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
+ mailinfo: move add_message_id and message_id to struct mailinfo
+ mailinfo: move patch_lines to struct mailinfo
+ mailinfo: move filter/header stage to struct mailinfo
+ mailinfo: move global "FILE *fin, *fout" to struct mailinfo
+ mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
+ mailinfo: introduce "struct mailinfo" to hold globals
+ mailinfo: move global "line" into mailinfo() function
+ mailinfo: do not let find_boundary() touch global "line" directly
+ mailinfo: do not let handle_boundary() touch global "line" directly
+ mailinfo: do not let handle_body() touch global "line" directly
+ mailinfo: get rid of function-local static states
+ mailinfo: move definition of MAX_HDR_PARSED closer to its use
+ mailinfo: move cleanup_space() before its users
+ mailinfo: move check_header() after the helpers it uses
+ mailinfo: move read_one_header_line() closer to its callers
+ mailinfo: move handle_boundary() lower
+ mailinfo: plug strbuf leak during continuation line handling
+ mailinfo: explicitly close file handle to the patch output
+ mailinfo: fix an off-by-one error in the boundary stack
+ mailinfo: fold decode_header_bq() into decode_header()
+ mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
Will merge to 'master'.
* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
(merged to 'next' on 2015-10-15 at 7dde994)
+ am -3: do not let failed merge from completing the error codepath
(this branch is used by js/am-3-merge-recursive-direct.)
"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).
Will merge to 'master'.
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
(this branch uses jc/am-3-fallback-regression-fix.)
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Will cook in 'next'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* rp/link-curl-before-ssl (2015-10-21) 3 commits
(merged to 'next' on 2015-10-22 at dad4fc6)
+ configure.ac: detect ssl need with libcurl
+ Makefile: make curl-config path configurable
+ Makefile: link libcurl before zlib
The linkage order of libraries was wrong in places around libcurl.
Will merge to 'master'.
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-21) 16 commits
- git submodule update: have a dedicated helper for cloning
- submodule config: keep update strategy around
- run-command: fix missing output from late callbacks
- test-run-command: increase test coverage
- test-run-command: test for gracefully aborting
- run-command: initialize the shutdown flag
- run-command: clear leftover state from child_process structure
- run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will cook in 'next'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that
has been deprecated since October 2007.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* km/cache-entry-refcnt (2015-10-14) 1 commit
. merge: fix cache_entry use-after-free
Made unnecessary with dt/name-hash-dir-entry-fix topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Oct 2015, #04; Tue, 20)
@ 2015-10-20 22:10 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-20 22:10 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
With somewhat reduced review bandwidth, I'd expect that the upcoming
cycle would be slower than usual. At tinyurl.com/gitCal, I
tentatively drew a 14-week schedule for this cycle (I plan to be
offline during weeks #7-#9 myself---hopefully we'll have capable
interim maintainers to take care of the list traffic in the meantime
as in past years).
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* cc/quote-comments (2015-10-07) 2 commits
(merged to 'next' on 2015-10-09 at fc8a359)
+ quote: move comment before sq_quote_buf()
+ quote: fix broken sq_quote_buf() related comment
A no-op code-health maintenance.
* dt/log-follow-config (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 64a30d2)
+ log: Update log.follow doc and add to config.txt
Description of the "log.follow" configuration variable in "git log"
documentation is now also copied to "git config" documentation.
* es/worktree-add-cleanup (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 6ffd721)
+ t2026: rename worktree prune test
A no-op code-health maintenance.
* gr/rebase-i-drop-warn (2015-10-05) 2 commits
(merged to 'next' on 2015-10-09 at 0626b96)
+ rebase-i: loosen over-eager check_bad_cmd check
+ rebase-i: explicitly accept tab as separator in commands
"git rebase -i" had a minor regression recently, which stopped
considering a line that begins with an indented '#' in its insn
sheet not a comment, which is now fixed.
* jc/doc-gc-prune-now (2015-10-14) 1 commit
(merged to 'next' on 2015-10-15 at 5c07566)
+ Documentation/gc: warn against --prune=<now>
"git gc" is safe to run anytime only because it has the built-in
grace period to protect young objects. In order to run with no
grace period, the user must make sure that the repository is
quiescent.
* jc/fsck-dropped-errors (2015-09-23) 1 commit
(merged to 'next' on 2015-10-09 at 887fcac)
+ fsck: exit with non-zero when problems are found
There were some classes of errors that "git fsck" diagnosed to its
standard error that did not cause it to exit with non-zero status.
* jk/filter-branch-use-of-sed-on-incomplete-line (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 9e7c032)
+ filter-branch: remove multi-line headers in msg filter
A recent "filter-branch --msg-filter" broke skipping of the commit
object header, which is fixed.
* js/clone-dissociate (2015-10-07) 4 commits
(merged to 'next' on 2015-10-09 at ba30393)
+ clone --dissociate: avoid locking pack files
+ sha1_file.c: add a function to release all packs
+ sha1_file: consolidate code to close a pack's file descriptor
+ t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
"git clone --dissociate" runs a big "git repack" process at the
end, and it helps to close file descriptors that are open on the
packs and their idx files before doing so on filesystems that
cannot remove a file that is still open.
* js/gc-with-stale-symref (2015-10-08) 2 commits
(merged to 'next' on 2015-10-09 at 8b89576)
+ pack-objects: do not get distracted by broken symrefs
+ gc: demonstrate failure with stale remote HEAD
"git gc" used to barf when a symbolic ref has gone dangling
(e.g. the branch that used to be your upstream's default when you
cloned from it is now gone, and you did "fetch --prune").
* js/icase-wt-detection (2015-09-28) 1 commit
(merged to 'next' on 2015-10-09 at 78ff500)
+ setup: fix "inside work tree" detection on case-insensitive filesystems
On a case insensitive filesystems, setting GIT_WORK_TREE variable
using a random cases that does not agree with what the filesystem
thinks confused Git that it wasn't inside the working tree.
* kn/for-each-branch (2015-09-25) 8 commits
(merged to 'next' on 2015-10-09 at 45723ce)
+ branch: add '--points-at' option
+ branch.c: use 'ref-filter' APIs
+ branch.c: use 'ref-filter' data structures
+ branch: drop non-commit error reporting
+ branch: move 'current' check down to the presentation layer
+ branch: roll show_detached HEAD into regular ref_list
+ branch: bump get_head_description() to the top
+ branch: refactor width computation
(this branch is used by kn/for-each-branch-remainder.)
Update "git branch" that list existing branches, using the
ref-filter API that is shared with "git tag" and "git
for-each-ref".
* ls/p4-lfs (2015-10-03) 7 commits
(merged to 'next' on 2015-10-14 at 4b8c365)
+ git-p4: add Git LFS backend for large file system
+ git-p4: add support for large file systems
+ git-p4: check free space during streaming
+ git-p4: add file streaming progress in verbose mode
+ git-p4: return an empty list if a list config has no values
+ git-p4: add gitConfigInt reader
+ git-p4: add optional type specifier to gitConfig reader
Teach "git p4" to send large blobs outside the repository by
talking to Git LFS.
* ls/p4-translation-failure (2015-09-22) 2 commits
(merged to 'next' on 2015-10-09 at b462387)
+ git-p4: handle "Translation of file content failed"
+ git-p4: add test case for "Translation of file content failed" error
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.
* mk/submodule-gitdir-path (2015-09-14) 2 commits
(merged to 'next' on 2015-10-09 at cf8768e)
+ path: implement common_dir handling in git_pathdup_submodule()
+ submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
The submodule code has been taught to work better with separate
work trees created via "git worktree add".
* mm/detach-at-HEAD-reflog (2015-10-02) 2 commits
(merged to 'next' on 2015-10-09 at 624bc87)
+ status: don't say 'HEAD detached at HEAD'
+ t3203: test 'detached at' after checkout --detach
After "git checkout --detach", "git status" reported a fairly
useless "HEAD detached at HEAD", instead of saying at which exact
commit.
* nd/clone-linked-checkout (2015-09-28) 6 commits
(merged to 'next' on 2015-10-09 at a93973f)
+ clone: better error when --reference is a linked checkout
+ clone: allow --local from a linked checkout
+ enter_repo: allow .git files in strict mode
+ enter_repo: avoid duplicating logic, use is_git_directory() instead
+ t0002: add test for enter_repo(), non-strict mode
+ path.c: delete an extra space
It was not possible to use a repository-lookalike created by "git
worktree add" as a local source of "git clone".
* nd/gc-auto-background-fix (2015-09-21) 1 commit
(merged to 'next' on 2015-10-09 at 1f0fc60)
+ gc: save log from daemonized gc --auto and print it next time
When "git gc --auto" is backgrounded, its diagnosis message is
lost. Save it to a file in $GIT_DIR and show it next time the "gc
--auto" is run.
* pt/am-builtin (2015-09-30) 1 commit
(merged to 'next' on 2015-10-09 at 396def8)
+ am: configure gpg at startup
When "git am" was rewritten as a built-in, it stopped paying
attention to user.signingkey, which was fixed.
* rd/test-path-utils (2015-10-08) 1 commit
(merged to 'next' on 2015-10-15 at 827a271)
+ test-path-utils.c: remove incorrect assumption
The normalize_ceiling_entry() function does not muck with the end
of the path it accepts, and the real world callers do rely on that,
but a test insisted that the function drops a trailing slash.
* sa/send-email-smtp-batch-data-limit (2015-09-30) 1 commit
(merged to 'next' on 2015-10-09 at c021fdf)
+ git-send-email.perl: Fixed sending of many/huge changes/patches
When "git send-email" wanted to talk over Net::SMTP::SSL,
Net::Cmd::datasend() did not like to be fed too many bytes at the
same time and failed to send messages. Send the payload one line
at a time to work around the problem.
* sb/http-flaky-test-fix (2015-09-25) 1 commit
(merged to 'next' on 2015-10-09 at 9dc37f3)
+ t5561: get rid of racy appending to logfile
A test script for the HTTP service had a timing dependent bug,
which was fixed.
* sb/perf-without-installed-git (2015-09-25) 1 commit
(merged to 'next' on 2015-10-09 at 7a1ed05)
+ t/perf: make runner work even if Git is not installed
Performance-measurement tests did not work without an installed Git.
* sb/submodule-config-parse (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 6fea79d)
+ submodule-config: "goto" removal in parse_config()
Code simplification.
* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 37888a2)
+ Documentation/interpret-trailers: Grammar fix
--------------------------------------------------
[New Topics]
* dt/refs-backend-pre-vtable (2015-10-15) 27 commits
- introduce "extensions" form of core.repositoryformatversion
- refs: break out ref conflict checks
- refs: make files_log_ref_write functions public
- initdb: move safe_create_dir into common code
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.c: move refname_is_safe to the common code
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_pseudoref and delete_ref to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
(this branch uses jk/war-on-sprintf; is tangled with dt/refs-backend-lmdb.)
The early part of the pluggable ref backend series, which sifts the
ref API functions into two bins: the filesystem backend specific
ones and the generic API functions. The next step will start
introducing the framework to dispatch generic calls to specific
backend implementation(s) and then finally plug a new backend that
is different from the file backend.
Expecting a reroll after an review of the remainder.
($gmane/279897).
* jc/usage-stdin (2015-10-16) 1 commit
- usage: do not insist that standard input must come from a file
The synopsys text and the usage string of subcommands that read
list of things from the standard input are often shown as if they
only take input from a file on a filesystem, which was misleading.
Will merge to 'next'.
* rt/placeholder-in-usage (2015-10-16) 1 commit
- am, credential-cache: add angle brackets to usage string
A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.
Will merge to 'next'.
* tk/stripspace (2015-10-16) 2 commits
- stripspace: use parse-options for command-line parsing
- strbuf: make stripspace() part of strbuf
The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.
Will merge to 'next'.
* dk/p4-import-ctypes (2015-10-20) 1 commit
- git-p4: import the ctypes module
"git-p4" tried to use from ctypes module without first importing
it.
Will merge to 'next'.
* dt/t7063-fix-flaky-test (2015-10-19) 1 commit
- t7063: fix flaky untracked-cache test
Will merge to 'next'.
* es/worktree-add (2015-10-18) 1 commit
- worktree: usage: denote <branch> as optional with 'add'
Will merge to 'next'.
* kn/for-each-tag (2015-10-18) 1 commit
- tag.c: use the correct algorithm for the '--contains' option
Recent update to "git tag --contains" caused a performance
regression.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without correspoinding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
- notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* mr/worktree-list (2015-10-08) 5 commits
- worktree: add 'list' command
- worktree: add details to the worktree struct
- worktree: add a function to get worktree details
- worktree: refactor find_linked_symref function
- worktree: add top-level worktree.c
Add the "list" subcommand to "git worktree".
Will merge to 'next'.
* jc/mailinfo (2015-10-20) 1 commit
- mailinfo: ignore in-body header that we do not care about
(this branch uses jc/am-mailinfo-direct and jc/mailinfo-lib.)
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Comments?
* jc/am-mailinfo-direct (2015-10-20) 2 commits
- mailinfo: plug strbuf leak during continuation line handling
- am: make direct call to mailinfo
(this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
Needs benchmark on platforms with slow run_command().
* jc/mailinfo-lib (2015-10-19) 33 commits
- mailinfo: remove calls to exit() and die() deep in the callchain
- mailinfo: handle charset conversion errors in the caller
- mailinfo: libify
- mailinfo: move definition of MAX_HDR_PARSED closer to its use
- mailinfo: move cleanup_space() before its users
- mailinfo: move check_header() after the helpers it uses
- mailinfo: move read_one_header_line() closer to its callers
- mailinfo: keep the parsed log message in a strbuf
- mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
- mailinfo: move content/content_top to struct mailinfo
- mailinfo: move [ps]_hdr_data to struct mailinfo
- mailinfo: move cmitmsg and patchfile to struct mailinfo
- mailinfo: move charset to struct mailinfo
- mailinfo: move transfer_encoding to struct mailinfo
- mailinfo: move check for metainfo_charset to convert_to_utf8()
- mailinfo: move metainfo_charset to struct mailinfo
- mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
- mailinfo: move add_message_id and message_id to struct mailinfo
- mailinfo: move patch_lines to struct mailinfo
- mailinfo: move filter/header stage to struct mailinfo
- mailinfo: move global "FILE *fin, *fout" to struct mailinfo
- mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
- mailinfo: introduce "struct mailinfo" to hold globals
- mailinfo: move global "line" into mailinfo() function
- mailinfo: do not let find_boundary() touch global "line" directly
- mailinfo: do not let handle_boundary() touch global "line" directly
- mailinfo: do not let handle_body() touch global "line" directly
- mailinfo: get rid of function-local static states
- mailinfo: move handle_boundary() lower
- mailinfo: explicitly close file handle to the patch output
- mailinfo: fix an off-by-one error in the boundary stack
- mailinfo: fold decode_header_bq() into decode_header()
- mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
(merged to 'next' on 2015-10-15 at 7dde994)
+ am -3: do not let failed merge from completing the error codepath
(this branch is used by js/am-3-merge-recursive-direct.)
"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
(this branch uses jc/am-3-fallback-regression-fix.)
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
* km/cache-entry-refcnt (2015-10-14) 1 commit
- merge: fix cache_entry use-after-free
Sometimes we discarded a cache-entry that is still referenced from
name-hash (used only to hold the pathname there), leading to use
after free errors. Reference-count cache entries to work it
around.
* ls/p4-test-updates (2015-10-12) 2 commits
(merged to 'next' on 2015-10-15 at 3c94932)
+ git-p4: skip t9819 test case on case insensitive file systems
+ git-p4: avoid "stat" command in t9815 git-p4-submit-fail
A few test scripts around "git p4" have been improved for
portability.
Will merge to 'master'.
* tb/t0027-crlf (2015-10-12) 1 commit
(merged to 'next' on 2015-10-15 at 7ab4f31)
+ t0027: improve test for not-normalized files
The test for various line-ending conversions has been enhanced.
Will merge to 'master'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
Comments?
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/war-on-sprintf (2015-10-05) 70 commits
(merged to 'next' on 2015-10-15 at 27a1ae5)
+ name-rev: use strip_suffix to avoid magic numbers
+ use strbuf_complete to conditionally append slash
+ fsck: use for_each_loose_file_in_objdir
+ Makefile: drop D_INO_IN_DIRENT build knob
+ fsck: drop inode-sorting code
+ convert strncpy to memcpy
+ notes: document length of fanout path with a constant
+ color: add color_set helper for copying raw colors
+ prefer memcpy to strcpy
+ help: clean up kfmclient munging
+ receive-pack: simplify keep_arg computation
+ avoid sprintf and strcpy with flex arrays
+ use alloc_ref rather than hand-allocating "struct ref"
+ color: add overflow checks for parsing colors
+ drop strcpy in favor of raw sha1_to_hex
+ use sha1_to_hex_r() instead of strcpy
+ daemon: use cld->env_array when re-spawning
+ stat_tracking_info: convert to argv_array
+ http-push: use an argv_array for setup_revisions
+ fetch-pack: use argv_array for index-pack / unpack-objects
+ diagnose_invalid_index_path: use strbuf to avoid strcpy/strcat
+ write_loose_object: convert to strbuf
+ remove_leading_path: use a strbuf for internal storage
+ enter_repo: convert fixed-size buffers to strbufs
+ merge-recursive: convert malloc / strcpy to strbuf
+ transport: use strbufs for status table "quickref" strings
+ apply: convert root string to strbuf
+ init: use strbufs to store paths
+ probe_utf8_pathname_composition: use internal strbuf
+ precompose_utf8: drop unused variable
+ sha1_get_pack_name: use a strbuf
+ http-walker: store url in a strbuf
+ http-push: use strbuf instead of fwrite_buffer
+ remote-ext: simplify git pkt-line generation
+ upload-archive: convert sprintf to strbuf
+ resolve_ref: use strbufs for internal buffers
+ read_remotes_file: simplify string handling
+ read_branches_file: simplify string handling
+ mailmap: replace strcpy with xstrdup
+ help: drop prepend function in favor of xstrfmt
+ ref-filter: drop sprintf and strcpy calls
+ use strip_suffix and xstrfmt to replace suffix
+ fetch: replace static buffer with xstrfmt
+ config: use xstrfmt in normalize_value
+ replace trivial malloc + sprintf / strcpy calls with xstrfmt
+ receive-pack: convert strncpy to xsnprintf
+ http-push: replace strcat with xsnprintf
+ add_packed_git: convert strcpy into xsnprintf
+ entry.c: convert strcpy to xsnprintf
+ grep: use xsnprintf to format failure message
+ compat/hstrerror: convert sprintf to snprintf
+ stop_progress_msg: convert sprintf to xsnprintf
+ find_short_object_filename: convert sprintf to xsnprintf
+ use xsnprintf for generating git object headers
+ archive-tar: use xsnprintf for trivial formatting
+ convert trivial sprintf / strcpy calls to xsnprintf
+ compat/inet_ntop: fix off-by-one in inet_ntop4
+ test-dump-cache-tree: avoid overflow of cache-tree name
+ progress: store throughput display in a strbuf
+ trace: use strbuf for quote_crnl output
+ mailsplit: make PATH_MAX buffers dynamic
+ fsck: use strbuf to generate alternate directories
+ add reentrant variants of sha1_to_hex and find_unique_abbrev
+ strbuf: make strbuf_complete_line more generic
+ add git_path_buf helper function
+ add xsnprintf helper function
+ fsck: don't fsck alternates for connectivity-only check
+ archive-tar: fix minor indentation violation
+ mailsplit: fix FILE* leak in split_maildir
+ show-branch: avoid segfault with --reflog of unborn branch
(this branch is used by dt/refs-backend-lmdb and dt/refs-backend-pre-vtable.)
Many allocations that is manually counted (correctly) that are
followed by strcpy/sprintf have been replaced with a less error
prone constructs such as xstrfmt.
Macintosh-specific breakage was noticed and corrected in this
reroll.
Will merge to 'master'.
* rp/link-curl-before-ssl (2015-09-25) 3 commits
- configure: make curl-config path configurable
- configure.ac: detect ssl need with libcurl
- Makefile: link libcurl before openssl and crypto
Waiting for the (hopefully) final submission.
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-20) 14 commits
- run-command: fix missing output from late callbacks
- test-run-command: increase test coverage
- test-run-command: test for gracefully aborting
- run-command: initialize the shutdown flag
- run-command: call get_next_task with a clean child process.
- run-command: fix early shutdown
(merged to 'next' on 2015-10-15 at df63590)
+ submodules: allow parallel fetching, add tests and documentation
+ fetch_populated_submodules: use new parallel job processing
+ run-command: add an asynchronous parallel child processor
+ sigchain: add command to pop all common signals
+ strbuf: add strbuf_read_once to read without blocking
+ xread_nonblock: add functionality to read from fds without blocking
+ xread: poll on non blocking fds
+ submodule.c: write "Fetching submodule <foo>" to stderr
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will cook in 'next'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that
has been deprecated since October 2007.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* dt/refs-backend-lmdb (2015-10-12) 45 commits
. refs: tests for db backend
. refs: add LMDB refs backend
. introduce "extensions" form of core.repositoryformatversion
. refs: add register_refs_backend
. refs: allow ref backend to be set for clone
. refs: always handle non-normal refs in files backend
. refs: move duplicate check to common code
. refs: break out a ref conflict check
. refs: make files_log_ref_write functions public
. refs: make lock generic
. refs-be-files.c: add method to rename refs
. refs.c: add method for initializing refs db
. initdb: move safe_create_dir into common code
. refs.c: add method for initial ref transaction commit
. refs.c: add methods for reflog
. refs.c: add ref backend init function
. refs.c: move should_autocreate_reflog to common code
. refs.c: move peel_object to the common code
. refs.c: move copy_msg to the common code
. refs.h: document make refname_is_safe and add it to header
. refs.c: move refname_is_safe to the common code
. refs-be-files.c: add do_for_each_per_worktree_ref
. refs-be-files.c: add method for for_each_reftype_...
. refs-be-files.c: add methods for the ref iterators
. refs-be-files.c: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
. refs: move transaction functions into common code
. refs.c: move head_ref_namespaced to the common code
. refs.c: move ref iterators to the common code
. refs.c: move prettify_refname to the common code
. refs.c: move is_branch to the common code
. refs.c: move check_refname_format to the common code
. refs.c: move resolve_refdup to common
. refs.c: move read_ref, read_ref_full and ref_exists to the common code
. refs.c: move warn_if_dangling_symref* to the common code
. refs.c: move dwim and friend functions to the common refs code
. refs.c: move the hidden refs functions to the common code
. refs.c: move read_ref_at to the common refs file
. refs.c: move delete_ref and delete_refs to the common code
. refs.c: move update_ref to refs.c
. refs.c: add a new refs.c file to hold all common refs code
. refs-be-files.c: rename refs to refs-be-files
. refs: make repack_without_refs and is_branch public
. refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
(this branch uses jk/war-on-sprintf; is tangled with dt/refs-backend-pre-vtable.)
Being rerolled separately.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-19 22:27 2% ` David Turner
@ 2015-10-20 2:13 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-20 2:13 UTC (permalink / raw)
To: David Turner; +Cc: René Scharfe, git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> The problem is not the name_hash, but with the dir_hash. The dir_hash
> is only even populated on case-insensitive filesystems (which is why you
> and Linus don't see this bug). The dir_hash is not designed to catch
> d/f conflicts, but rather case conflicts (one side of a merge has
> foo/bar; the other has FOO/bar). For each directory, it maintains a
> pointer to a cache_entry. Then add_to_index uses that cache_entry to
> rewrite incoming entries' parent directories to the expected case.
> Weirdly, that part of add_to_index is, so far as I can tell, never
> called during a merge. So where's are we using the freed value?
> Probably in dir_entry_cmp, while adding another entry to the hashmap;
> that's where our crash seems to have happened. And our failure depended
> on the details of the hash function as well; if a certain collision did
> not happen, we would not see it.
>
> There is, I think, another way to handle this: we could *copy* the path
> into the struct dir_entry instead of pointing to a cache_entry. But
> this seems like a bunch of extra work; the refcounting is simpler.
This codepath is a mess. Whoever wrote hash_dir_entry() seems to
have already known that the code is buggy by leaving this comment
there:
* Note that the cache_entry stored with the dir_entry merely
* supplies the name of the directory (up to dir_entry.namelen). We
* track the number of 'active' files in a directory in dir_entry.nr,
* so we can tell if the directory is still relevant, e.g. for git
* status. However, if cache_entries are removed, we cannot pinpoint
* an exact cache_entry that's still active. It is very possible that
* multiple dir_entries point to the same cache_entry.
If you add "a/frotz" to the index, the code will somehow create a
dir_entry to represent that the canonical case for directory "a/" is
such, so that when you later try to add "A/nitfol", the code can
grab the canonical path "a/" from dir_entry hash and turn it into
"a/nitfol". That is what happens in add_to_index in read-cache.c
But what happens if, after adding "a/frotz" and "a/nitfol" to the
index like that, you remove "a/frotz"? I do not see any code that
notices the poitner to "a/frotz" will become stale and replace it
with a pointer to "a/nitfol" that is still in the system. The next
time you try to add "a/xyzzy", find_dir_entry() will try to see if
there is an existing entry that matches "a/xyzzy"'s directory, and
one of the dir_entries has a stale pointer to ce for "a/frotz" that
is already gone.
I think the root cause of the bug is the external interface to the
index_dir_exists() function. For the above processing, there is no
reason for dir_entry() to hold a pointer to ce for "a/frotz" or
"a/nitfol". All it needs to have is an embedded string in the
structure itself, i.e.
struct dir_entry {
struct hashmap_entry ent;
struct dir_entry *parent;
int nr;
unsigned int namelen;
char name[FLEX_ARRAY];
};
The caller of index_dir_exists() in add_to_index() can be adjusted
to work with a new function in name-hash.c that does this part:
const char *startPtr = ce->name;
const char *ptr = startPtr;
while (*ptr) {
while (*ptr && *ptr != '/')
++ptr;
if (*ptr == '/') {
struct cache_entry *foundce;
++ptr;
foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
if (foundce) {
memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
startPtr = ptr;
}
}
}
Perhaps name it "adjust_dirname_case(istate, ce->name)" and have it
do the whole while loop above, all inside name-hash.c. That would
make this caller a lot easier to read and understand what is going
on.
The other one, directory_exists_in_index_icase() in dir.c, expects
that a ce is returned, but the way it uses the returned value does
not really require the function to return a ce. It does look at the
ce->ce_mode but that is only because the way index_dir_exists()
tells its caller if there is a directory (hence some files inside
it) or if there is a submodule (hence there is nothing below it) by
making a fallback call internally to index_file_exists() and returns
the ce for gitlink only when (1) there is no directory in dir_hash
and (2) file_hash as a submodule in that path.
A more cleaner helper function to give what this caller really wants
to know that name-hash.c can provide would be a function that takes
pathname and len and returns an enum: "there is nothing there",
"there is a directory", or "there is a submodule". For completeness
of the API, even though this sole caller does not need it, we could
throw in "there is a regular file" there, too, if we wanted to.
If I were to clean this up, I would probably use the above updated
definition of struct dir_entry and:
* drop the fallback "return gitlink if there is one" from
index_dir_exists(), and make index_dir_exists() return 0 (false)
or 1 (true).
* have directory_exists_in_index() first call the updated
index_dir_exists() via the cache_dir_exists() convenience macro.
If it returned true, it should return index_direcgtory. If it
returned false, make a call to cache_file_exists() to see if
there is a gitlink and rturn index_gitdir when that is the case.
When all of the above fails, return index_nonexistent.
That way, we do not have to worry about "this ce no longer exists in
the main index but we need to keep it around", saving 8-bytes from
each ce and refcounting mess in the code.
^ permalink raw reply [relevance 1%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-16 16:04 2% ` Junio C Hamano
@ 2015-10-19 22:27 2% ` David Turner
2015-10-20 2:13 1% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-19 22:27 UTC (permalink / raw)
To: Junio C Hamano; +Cc: René Scharfe, git, Keith McGuigan
On Fri, 2015-10-16 at 09:04 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> > We also do dozens or hundreds of merges per day and only saw this quite
> > rarely. Interestingly, we could only trigger it with an alternate
> > hashing function for git's hashmap implementation, and only once a
> > certain bug in that implementation was *fixed*. But that was just a
> > trigger; it was certainly not the cause. The bug would, in general,
> > have caused more hash collisions due to worse mixing, but I believe it
> > is possible that some particular collision would have been present in
> > the non-bugged version of the code but not in the bugged version.
> >
> > It may have also had something to do with a case-insensitive filesystem;
> > we never saw anyone reproduce it on anything but OS X, and even there it
> > was quite difficult to reproduce.
> >
> > In short, I don't think we know why the bug was not seen widely.
>
> It has been a long time since I looked at name-hash.c and I am fuzzy
> on what the four functions (cache|index)_(file|dir)_exists are meant
> for, but I have this feeling that the original premise of the patch,
> "we may free a ce because we no longer use it in the index, but it
> may still need to keep a reference to it in name-hash" may be wrong
> in the first place. The proposed "fix" conceptually feels wrong.
>
> The whole point of the name-hash is so that we can detect collisions
> in two names, one of which wants to have a file in one place while
> the other wants to have a directory, at the same path in the index.
> The pathnames and cache entries registered in the name-hash have to
> be the ones that are relevant to the index in quesition. If a new
> ce will be added to the index, the name-hash will have to know about
> its path (and that is what CE_HASHED bit is about). On the other
> hand, if you are going to remove an existing ce from the index, its
> sub-paths should no longer prevent other cache entries to be there.
>
> E.g. if you have "a/b", it must prevent "A" from entering the index
> and the name-hash helps you to do so; when you remove "a/b", then
> name-hash must now allow "A" to enter the index. So "a/b" must be
> removed from the name-hash by calling remove_name_hash() and normal
> codepaths indeed do so.
>
> I do not doubt the existence of "use-after-free bug" you observed,
> but I am not convinced that refcounting is "fixing" the problem; it
> smells like papering over a different bug that is the root cause of
> the use-after-free.
>
> For example, if we forget to "unhash" a ce from name-hash when we
> remove a ce from the index (or after we "hashed" it, expecting to
> add it to the index, but in the end decided not to add to the index,
> perhaps), we would see a now-freed ce still in the name-hash.
> Checking a path against the name-hash in such a state would have to
> use the ce->name from that stale ce, which is a use-after-free bug.
>
> In such a situation, isn't the real cause of the bug the fact that
> the stale ce that is no longer relevant to the true index contents
> still in name-hash? The refcounting does not fix the fact that a
> ce->name of a stale ce that is no longer relevant being used for D/F
> collision checking.
>
> I am not saying that I found such a codepath that forgets to unhash,
> but from the overall design and purpose of the name-hash subsystem,
> anything that deliberately _allows_ a stale ce that does not exist
> in the index in there smells like a workaround going in a wrong
> direction.
I've spent some time looking into this, but I don't quite have a repro.
I do have some comments which might be interesting.
The problem is not the name_hash, but with the dir_hash. The dir_hash
is only even populated on case-insensitive filesystems (which is why you
and Linus don't see this bug). The dir_hash is not designed to catch
d/f conflicts, but rather case conflicts (one side of a merge has
foo/bar; the other has FOO/bar). For each directory, it maintains a
pointer to a cache_entry. Then add_to_index uses that cache_entry to
rewrite incoming entries' parent directories to the expected case.
Weirdly, that part of add_to_index is, so far as I can tell, never
called during a merge. So where's are we using the freed value?
Probably in dir_entry_cmp, while adding another entry to the hashmap;
that's where our crash seems to have happened. And our failure depended
on the details of the hash function as well; if a certain collision did
not happen, we would not see it.
There is, I think, another way to handle this: we could *copy* the path
into the struct dir_entry instead of pointing to a cache_entry. But
this seems like a bunch of extra work; the refcounting is simpler.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-16 7:05 2% ` David Turner
@ 2015-10-16 16:04 2% ` Junio C Hamano
2015-10-19 22:27 2% ` David Turner
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-16 16:04 UTC (permalink / raw)
To: David Turner; +Cc: René Scharfe, git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> We also do dozens or hundreds of merges per day and only saw this quite
> rarely. Interestingly, we could only trigger it with an alternate
> hashing function for git's hashmap implementation, and only once a
> certain bug in that implementation was *fixed*. But that was just a
> trigger; it was certainly not the cause. The bug would, in general,
> have caused more hash collisions due to worse mixing, but I believe it
> is possible that some particular collision would have been present in
> the non-bugged version of the code but not in the bugged version.
>
> It may have also had something to do with a case-insensitive filesystem;
> we never saw anyone reproduce it on anything but OS X, and even there it
> was quite difficult to reproduce.
>
> In short, I don't think we know why the bug was not seen widely.
It has been a long time since I looked at name-hash.c and I am fuzzy
on what the four functions (cache|index)_(file|dir)_exists are meant
for, but I have this feeling that the original premise of the patch,
"we may free a ce because we no longer use it in the index, but it
may still need to keep a reference to it in name-hash" may be wrong
in the first place. The proposed "fix" conceptually feels wrong.
The whole point of the name-hash is so that we can detect collisions
in two names, one of which wants to have a file in one place while
the other wants to have a directory, at the same path in the index.
The pathnames and cache entries registered in the name-hash have to
be the ones that are relevant to the index in quesition. If a new
ce will be added to the index, the name-hash will have to know about
its path (and that is what CE_HASHED bit is about). On the other
hand, if you are going to remove an existing ce from the index, its
sub-paths should no longer prevent other cache entries to be there.
E.g. if you have "a/b", it must prevent "A" from entering the index
and the name-hash helps you to do so; when you remove "a/b", then
name-hash must now allow "A" to enter the index. So "a/b" must be
removed from the name-hash by calling remove_name_hash() and normal
codepaths indeed do so.
I do not doubt the existence of "use-after-free bug" you observed,
but I am not convinced that refcounting is "fixing" the problem; it
smells like papering over a different bug that is the root cause of
the use-after-free.
For example, if we forget to "unhash" a ce from name-hash when we
remove a ce from the index (or after we "hashed" it, expecting to
add it to the index, but in the end decided not to add to the index,
perhaps), we would see a now-freed ce still in the name-hash.
Checking a path against the name-hash in such a state would have to
use the ce->name from that stale ce, which is a use-after-free bug.
In such a situation, isn't the real cause of the bug the fact that
the stale ce that is no longer relevant to the true index contents
still in name-hash? The refcounting does not fix the fact that a
ce->name of a stale ce that is no longer relevant being used for D/F
collision checking.
I am not saying that I found such a codepath that forgets to unhash,
but from the overall design and purpose of the name-hash subsystem,
anything that deliberately _allows_ a stale ce that does not exist
in the index in there smells like a workaround going in a wrong
direction.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-15 20:51 2% ` Junio C Hamano
@ 2015-10-16 7:05 2% ` David Turner
2015-10-16 16:04 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-16 7:05 UTC (permalink / raw)
To: Junio C Hamano; +Cc: René Scharfe, git, Keith McGuigan
On Thu, 2015-10-15 at 13:51 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> >> > +static inline void drop_ce_ref(struct cache_entry *ce)
> >> > +{
> >> > + if (ce != NULL) {
> >> > + assert(ce->ref_count >= 0);
> >>
> >> Shouldn't this be "> 0" to prevent double frees?
> >
> > No. If the ref_count is 1, then there is still some reference to the
> > ce. If it is 0, there is no reference to it, and the next check (< 1)
> > will succeed and the ce will get freed.
> >
> >> > + if (--ce->ref_count < 1) {
> >> > + free(ce);
> >> > + }
> >> > + }
> >> > +}
>
> Hmm, but it still feels fuzzy, no? I cannot tell from the above
> exchange if a ce with ref_count==0 upon entry to this function is
> supposed to have somebody pointing at it, somebody just assigned
> NULL (or another pointer) to the last pointer that was pointing at
> it, or what else. If the expected calling sequence were:
>
> drop_ce_ref(thing->ce);
> thing->ce = NULL;
>
> and the original thing->ce were the last reference to the cache
> entry about to be freed, its refcnt is better be 1 not 0. And when
> this function decrements refcnt down to 0, the cache entry is freed.
>
> Admittedly, if the original refcnt were 0, with signed refcnt, it
> will decrement to -1 and it will be freed, too, but I do not think
> that is what was intended---refcnt is initialized to 0 upon creating
> an unreferenced cache entry, and set_index_entry() and friends that
> store a pointer to anything calls add_ce_ref(), so I read the code
> as intending to make "0 means no pointer points at it".
>
> As far as I can tell, the only effect of this assert() that uses >=0
> not >0 is to avoid triggering it on this calling sequence:
>
> new_ce = new_cache_entry();
> drop_ce_ref(new_ce);
>
> that is, you create because you _might_ use it, and then later
> decide not to use it (and the free() part wouldn't have worked
> correctly with unsigned refcnt ;-).
You and René are right: there is an off-by-one here. Will fix and
re-roll. Thanks.
> By the way, the log message says "During merges, we would previously
> free entries that we no longer need in the destination index. But
> those entries might also be stored in the dir_entry cache," as if
> this issue were present and waiting to trigger for all merges for
> all people. Given that Linus does hundreds of merges in a day
> during the merge window (and I do several dozens a day), I am quite
> surprised that nobody noticed this issue. If there is a more
> specific condition that allows this bug to trigger (e.g. "dir-entry
> cache is used only under such and such conditions") that the log
> message does not talk about to explain why this bug was not seen
> widely, it would be a good thing to add. It is very puzzling
> otherwise.
We also do dozens or hundreds of merges per day and only saw this quite
rarely. Interestingly, we could only trigger it with an alternate
hashing function for git's hashmap implementation, and only once a
certain bug in that implementation was *fixed*. But that was just a
trigger; it was certainly not the cause. The bug would, in general,
have caused more hash collisions due to worse mixing, but I believe it
is possible that some particular collision would have been present in
the non-bugged version of the code but not in the bugged version.
It may have also had something to do with a case-insensitive filesystem;
we never saw anyone reproduce it on anything but OS X, and even there it
was quite difficult to reproduce.
In short, I don't think we know why the bug was not seen widely.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-15 19:02 2% ` David Turner
2015-10-15 20:38 2% ` René Scharfe
@ 2015-10-15 20:51 2% ` Junio C Hamano
2015-10-16 7:05 2% ` David Turner
1 sibling, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-15 20:51 UTC (permalink / raw)
To: David Turner; +Cc: René Scharfe, git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
>> > +static inline void drop_ce_ref(struct cache_entry *ce)
>> > +{
>> > + if (ce != NULL) {
>> > + assert(ce->ref_count >= 0);
>>
>> Shouldn't this be "> 0" to prevent double frees?
>
> No. If the ref_count is 1, then there is still some reference to the
> ce. If it is 0, there is no reference to it, and the next check (< 1)
> will succeed and the ce will get freed.
>
>> > + if (--ce->ref_count < 1) {
>> > + free(ce);
>> > + }
>> > + }
>> > +}
Hmm, but it still feels fuzzy, no? I cannot tell from the above
exchange if a ce with ref_count==0 upon entry to this function is
supposed to have somebody pointing at it, somebody just assigned
NULL (or another pointer) to the last pointer that was pointing at
it, or what else. If the expected calling sequence were:
drop_ce_ref(thing->ce);
thing->ce = NULL;
and the original thing->ce were the last reference to the cache
entry about to be freed, its refcnt is better be 1 not 0. And when
this function decrements refcnt down to 0, the cache entry is freed.
Admittedly, if the original refcnt were 0, with signed refcnt, it
will decrement to -1 and it will be freed, too, but I do not think
that is what was intended---refcnt is initialized to 0 upon creating
an unreferenced cache entry, and set_index_entry() and friends that
store a pointer to anything calls add_ce_ref(), so I read the code
as intending to make "0 means no pointer points at it".
As far as I can tell, the only effect of this assert() that uses >=0
not >0 is to avoid triggering it on this calling sequence:
new_ce = new_cache_entry();
drop_ce_ref(new_ce);
that is, you create because you _might_ use it, and then later
decide not to use it (and the free() part wouldn't have worked
correctly with unsigned refcnt ;-).
By the way, the log message says "During merges, we would previously
free entries that we no longer need in the destination index. But
those entries might also be stored in the dir_entry cache," as if
this issue were present and waiting to trigger for all merges for
all people. Given that Linus does hundreds of merges in a day
during the merge window (and I do several dozens a day), I am quite
surprised that nobody noticed this issue. If there is a more
specific condition that allows this bug to trigger (e.g. "dir-entry
cache is used only under such and such conditions") that the log
message does not talk about to explain why this bug was not seen
widely, it would be a good thing to add. It is very puzzling
otherwise.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-15 19:02 2% ` David Turner
@ 2015-10-15 20:38 2% ` René Scharfe
2015-10-15 20:51 2% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: René Scharfe @ 2015-10-15 20:38 UTC (permalink / raw)
To: David Turner; +Cc: git, Keith McGuigan
Am 15.10.2015 um 21:02 schrieb David Turner:
> On Thu, 2015-10-15 at 05:35 +0200, René Scharfe wrote:
>> Am 15.10.2015 um 00:07 schrieb David Turner:
>>> From: Keith McGuigan <kmcguigan@twitter.com>
>>>
>>> During merges, we would previously free entries that we no longer need
>>> in the destination index. But those entries might also be stored in
>>> the dir_entry cache, and when a later call to add_to_index found them,
>>> they would be used after being freed.
>>>
>>> To prevent this, add a ref count for struct cache_entry. Whenever
>>> a cache entry is added to a data structure, the ref count is incremented;
>>> when it is removed from the data structure, it is decremented. When
>>> it hits zero, the cache_entry is freed.
>>>
>>> Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
>>> Signed-off-by: David Turner <dturner@twopensource.com>
>>> ---
>>>
>>> Fix type of ref_count (from unsigned int to int).
>>>
>>>
>>> cache.h | 27 +++++++++++++++++++++++++++
>>> name-hash.c | 7 ++++++-
>>> read-cache.c | 6 +++++-
>>> split-index.c | 13 ++++++++-----
>>> unpack-trees.c | 6 ++++--
>>> 5 files changed, 50 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/cache.h b/cache.h
>>> index 752031e..7906026 100644
>>> --- a/cache.h
>>> +++ b/cache.h
>>> @@ -149,6 +149,7 @@ struct stat_data {
>>>
>>> struct cache_entry {
>>> struct hashmap_entry ent;
>>> + int ref_count; /* count the number of refs to this in dir_hash */
>>> struct stat_data ce_stat_data;
>>> unsigned int ce_mode;
>>> unsigned int ce_flags;
>>> @@ -213,6 +214,32 @@ struct cache_entry {
>>> struct pathspec;
>>>
>>> /*
>>> + * Increment the cache_entry reference count. Should be called
>>> + * whenever a pointer to a cache_entry is retained in a data structure,
>>> + * thus marking it as alive.
>>> + */
>>> +static inline void add_ce_ref(struct cache_entry *ce)
>>> +{
>>> + assert(ce != NULL && ce->ref_count >= 0);
>>> + ce->ref_count++;
>>> +}
>>> +
>>> +/*
>>> + * Decrement the cache_entry reference count. Should be called whenever
>>> + * a pointer to a cache_entry is dropped. Once the counter drops to 0
>>> + * the cache_entry memory will be safely freed.
>>> + */
>>> +static inline void drop_ce_ref(struct cache_entry *ce)
>>> +{
>>> + if (ce != NULL) {
>>> + assert(ce->ref_count >= 0);
>>
>> Shouldn't this be "> 0" to prevent double frees?
>
> No. If the ref_count is 1, then there is still some reference to the
> ce. If it is 0, there is no reference to it, and the next check (< 1)
> will succeed and the ce will get freed.
>
>>> + if (--ce->ref_count < 1) {
>>> + free(ce);
>>> + }
>>> + }
>>> +}
OK, let me think out loud, step by step:
Given ref_count == 1 then the assert passes, ref_count gets decremented
to 0, which is less than 1, so ce is freed.
Given ref_count == 0 then the assert passes, refcount gets decremented
to -1, which is less than 1, so ce is freed again.
Where did I go wrong?
René
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-15 3:35 2% ` René Scharfe
@ 2015-10-15 19:02 2% ` David Turner
2015-10-15 20:38 2% ` René Scharfe
2015-10-15 20:51 2% ` Junio C Hamano
0 siblings, 2 replies; 200+ results
From: David Turner @ 2015-10-15 19:02 UTC (permalink / raw)
To: René Scharfe; +Cc: git, Keith McGuigan
On Thu, 2015-10-15 at 05:35 +0200, René Scharfe wrote:
> Am 15.10.2015 um 00:07 schrieb David Turner:
> > From: Keith McGuigan <kmcguigan@twitter.com>
> >
> > During merges, we would previously free entries that we no longer need
> > in the destination index. But those entries might also be stored in
> > the dir_entry cache, and when a later call to add_to_index found them,
> > they would be used after being freed.
> >
> > To prevent this, add a ref count for struct cache_entry. Whenever
> > a cache entry is added to a data structure, the ref count is incremented;
> > when it is removed from the data structure, it is decremented. When
> > it hits zero, the cache_entry is freed.
> >
> > Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> >
> > Fix type of ref_count (from unsigned int to int).
> >
> >
> > cache.h | 27 +++++++++++++++++++++++++++
> > name-hash.c | 7 ++++++-
> > read-cache.c | 6 +++++-
> > split-index.c | 13 ++++++++-----
> > unpack-trees.c | 6 ++++--
> > 5 files changed, 50 insertions(+), 9 deletions(-)
> >
> > diff --git a/cache.h b/cache.h
> > index 752031e..7906026 100644
> > --- a/cache.h
> > +++ b/cache.h
> > @@ -149,6 +149,7 @@ struct stat_data {
> >
> > struct cache_entry {
> > struct hashmap_entry ent;
> > + int ref_count; /* count the number of refs to this in dir_hash */
> > struct stat_data ce_stat_data;
> > unsigned int ce_mode;
> > unsigned int ce_flags;
> > @@ -213,6 +214,32 @@ struct cache_entry {
> > struct pathspec;
> >
> > /*
> > + * Increment the cache_entry reference count. Should be called
> > + * whenever a pointer to a cache_entry is retained in a data structure,
> > + * thus marking it as alive.
> > + */
> > +static inline void add_ce_ref(struct cache_entry *ce)
> > +{
> > + assert(ce != NULL && ce->ref_count >= 0);
> > + ce->ref_count++;
> > +}
> > +
> > +/*
> > + * Decrement the cache_entry reference count. Should be called whenever
> > + * a pointer to a cache_entry is dropped. Once the counter drops to 0
> > + * the cache_entry memory will be safely freed.
> > + */
> > +static inline void drop_ce_ref(struct cache_entry *ce)
> > +{
> > + if (ce != NULL) {
> > + assert(ce->ref_count >= 0);
>
> Shouldn't this be "> 0" to prevent double frees?
No. If the ref_count is 1, then there is still some reference to the
ce. If it is 0, there is no reference to it, and the next check (< 1)
will succeed and the ce will get freed.
> > + if (--ce->ref_count < 1) {
> > + free(ce);
> > + }
> > + }
> > +}
>
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] merge: fix cache_entry use-after-free
2015-10-14 22:07 1% [PATCH v3] " David Turner
@ 2015-10-15 3:35 2% ` René Scharfe
2015-10-15 19:02 2% ` David Turner
0 siblings, 1 reply; 200+ results
From: René Scharfe @ 2015-10-15 3:35 UTC (permalink / raw)
To: David Turner, git; +Cc: Keith McGuigan
Am 15.10.2015 um 00:07 schrieb David Turner:
> From: Keith McGuigan <kmcguigan@twitter.com>
>
> During merges, we would previously free entries that we no longer need
> in the destination index. But those entries might also be stored in
> the dir_entry cache, and when a later call to add_to_index found them,
> they would be used after being freed.
>
> To prevent this, add a ref count for struct cache_entry. Whenever
> a cache entry is added to a data structure, the ref count is incremented;
> when it is removed from the data structure, it is decremented. When
> it hits zero, the cache_entry is freed.
>
> Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
>
> Fix type of ref_count (from unsigned int to int).
>
>
> cache.h | 27 +++++++++++++++++++++++++++
> name-hash.c | 7 ++++++-
> read-cache.c | 6 +++++-
> split-index.c | 13 ++++++++-----
> unpack-trees.c | 6 ++++--
> 5 files changed, 50 insertions(+), 9 deletions(-)
>
> diff --git a/cache.h b/cache.h
> index 752031e..7906026 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -149,6 +149,7 @@ struct stat_data {
>
> struct cache_entry {
> struct hashmap_entry ent;
> + int ref_count; /* count the number of refs to this in dir_hash */
> struct stat_data ce_stat_data;
> unsigned int ce_mode;
> unsigned int ce_flags;
> @@ -213,6 +214,32 @@ struct cache_entry {
> struct pathspec;
>
> /*
> + * Increment the cache_entry reference count. Should be called
> + * whenever a pointer to a cache_entry is retained in a data structure,
> + * thus marking it as alive.
> + */
> +static inline void add_ce_ref(struct cache_entry *ce)
> +{
> + assert(ce != NULL && ce->ref_count >= 0);
> + ce->ref_count++;
> +}
> +
> +/*
> + * Decrement the cache_entry reference count. Should be called whenever
> + * a pointer to a cache_entry is dropped. Once the counter drops to 0
> + * the cache_entry memory will be safely freed.
> + */
> +static inline void drop_ce_ref(struct cache_entry *ce)
> +{
> + if (ce != NULL) {
> + assert(ce->ref_count >= 0);
Shouldn't this be "> 0" to prevent double frees?
> + if (--ce->ref_count < 1) {
> + free(ce);
> + }
> + }
> +}
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2015, #03; Wed, 14)
@ 2015-10-14 22:23 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-14 22:23 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
With somewhat reduced review bandwidth, I'd expect that the upcoming
cycle would be slower than usual. At tinyurl.com/gitCal, I
tentatively drew a 14-week schedule for this cycle (I plan to be
offline during weeks #7-#9 myself---hopefully we'll have capable
interim maintainers to take care of the list traffic in the meantime
as in past years).
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit
(merged to 'next' on 2015-10-07 at 8bbff49)
+ Documentation: fix section header mark-up
* jk/notes-dwim-doc (2015-09-22) 1 commit
(merged to 'next' on 2015-10-07 at c4341d1)
+ notes: correct documentation of DWIMery for notes references
(this branch is used by mh/notes-allow-reading-treeish.)
The way how --ref/--notes to specify the notes tree reference are
DWIMmed was not clearly documented.
* nd/ls-remote-does-not-have-u-option (2015-09-28) 1 commit
(merged to 'next' on 2015-10-07 at 0790a76)
+ ls-remote.txt: delete unsupported option
* pt/pull-builtin (2015-10-02) 1 commit
(merged to 'next' on 2015-10-07 at 19af20e)
+ merge: grammofix in please-commit-before-merge message
* tk/typofix-connect-unknown-proto-error (2015-09-25) 1 commit
(merged to 'next' on 2015-10-07 at cc3430e)
+ connect: fix typo in result string of prot_name()
--------------------------------------------------
[New Topics]
* jc/mailinfo (2015-10-08) 1 commit
. mailinfo: ignore in-body header that we do not care about
Some people write arbitrary garbage at the beginning of a piece of
e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
message and expect them to be discarded, even though "From:" and
"Subject:" are the only documented in-body headers that you are
supposed to have there. Allow some garbage (specifically, what may
look like RFC2822 headers like "MIME-Version: ...") to be there and
ignore them.
I have a feeling that that this is a step in a wrong direction.
Excluded from 'pu' for now.
* jk/filter-branch-use-of-sed-on-incomplete-line (2015-10-12) 1 commit
- filter-branch: remove multi-line headers in msg filter
A recent "filter-branch --msg-filter" broke skipping of the commit
object header, which is fixed.
Will merge to 'next'.
* rd/test-path-utils (2015-10-08) 1 commit
- test-path-utils.c: remove incorrect assumption
The normalize_ceiling_entry() function does not muck with the end
of the path it accepts, and the real world callers do rely on that,
but a test insisted that the function drops a trailing slash.
Will merge to 'next'.
* jc/doc-gc-prune-now (2015-10-14) 1 commit
- Documentation/gc: warn against --prune=<now>
"git gc" is safe to run anytime only because it has the built-in
grace period to protect young objects. In order to run with no
grace period, the user must make sure that the repository is
quiescent.
Will merge to 'next'.
* jc/am-mailinfo-direct (2015-10-14) 1 commit
- am: make direct call to mailinfo
(this branch uses jc/mailinfo-lib.)
"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.
Needs benchmark on platforms with slow run_command().
* jc/mailinfo-lib (2015-10-14) 30 commits
- mailinfo: remove calls to exit() and die() deep in the callchain
- mailinfo: handle charset conversion errors in the caller
- mailinfo: libify
- mailinfo: move definition of MAX_HDR_PARSED to closer to its use
- mailinfo: move cleanup_space() before its users
- mailinfo: move check_header() after the helpers it uses
- mailinfo: move read_one_header_line() closer to its callers
- mailinfo: move content/content_top to struct mailinfo
- mailinfo: keep the parsed log message in a strbuf
- mailinfo: move [ps]_hdr_data to struct mailinfo
- mailinfo: move cmitmsg and patchfile to struct mailinfo
- mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
- mailinfo: move charset to struct mailinfo
- mailinfo: move transfer_encoding to struct mailinfo
- mailinfo: move metainfo_charset to struct mailinfo
- mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
- mailinfo: move add_message_id and message_id to struct mailinfo
- mailinfo: move patch_lines to struct mailinfo
- mailinfo: move filter/header stage to struct mailinfo
- mailinfo: move global "FILE *fin, *fout" to struct mailinfo
- mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
- mailinfo: introduce "struct mailinfo" to hold globals
- mailinfo: move global "line" into mailinfo() function
- mailinfo: always pass "line" as an argument
- mailinfo: get rid of function-local static states
- mailinfo: move handle_boundary() lower
- mailinfo: fold decode_header_bq() into decode_header()
- mailinfo: explicitly close file handle to the patch output
- mailinfo: fix for off-by-one error in boundary stack
- mailinfo: remove a no-op call convert_to_utf8(it, "")
(this branch is used by jc/am-mailinfo-direct.)
The implementation of "git mailinfo" was refactored so that a
mailinfo() function can be directly called from inside a process.
* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
- am -3: do not let failed merge from completing the error codepath
(this branch is used by js/am-3-merge-recursive-direct.)
"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
(this branch uses jc/am-3-fallback-regression-fix.)
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
* km/cache-entry-refcnt (2015-10-12) 1 commit
- merge: fix cache_entry use-after-free
Sometimes we discarded a cache-entry that is still referenced from
name-hash (used only to hold the pathname there), leading to use
after free errors. Reference-count cache entries to work it
around.
* ls/p4-test-updates (2015-10-12) 2 commits
- git-p4: skip t9819 test case on case insensitive file systems
- git-p4: avoid "stat" command in t9815 git-p4-submit-fail
A few test scripts around "git p4" have been improved for
portability.
Will merge to 'next'.
* sb/submodule-config-parse (2015-10-12) 1 commit
- submodule-config: "goto" removal in parse_config()
Will merge to 'next'.
* tb/t0027-crlf (2015-10-12) 1 commit
- t0027: improve test for not-normalized files
The test for various line-ending conversions has been enhanced.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* dk/gc-idx-wo-pack (2015-08-17) 3 commits
- DONTMERGE: log message, grace-period and tests $gmane/276058
- gc: remove stale .idx files without corresponding .pack file
- prepare_packed_git(): refactor garbage reporting in pack directory
Having a leftover .idx file without correspoinding .pack file in
the repository hurts performance; "git gc" learned to prune them.
Waiting for a reroll.
* nd/ita-cleanup (2015-09-06) 6 commits
- grep: make it clear i-t-a entries are ignored
- checkout(-index): do not checkout i-t-a entries
- apply: make sure check_preimage() does not leave empty file on error
- apply: fix adding new files on i-t-a entries
- add and use a convenience macro ce_intent_to_add()
- blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not yet
in the index, but various commands behaved as if they already are.
Some commits need better explanation.
Waiting for a reroll.
* ld/p4-detached-head (2015-09-09) 2 commits
- git-p4: work with a detached head
- git-p4: add failing test for submit from detached head
Will be rerolled.
($gmane/277574)
* mr/worktree-list (2015-10-08) 5 commits
- worktree: add 'list' command
- worktree: add details to the worktree struct
- worktree: add a function to get worktree details
- worktree: refactor find_linked_symref function
- worktree: add top-level worktree.c
Add the "list" subcommand to "git worktree".
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
* wp/sha1-name-negative-match (2015-06-08) 2 commits
- sha1_name.c: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "branch^{/!-<pattern>}" notation to name a commit
reachable from branch that does not match the given pattern.
Becoming tired of waiting for a reroll.
($gmane/271213).
* ak/format-patch-odir-config (2015-06-19) 1 commit
- format-patch: introduce format.outputDirectory configuration
Reroll exists but didn't pick it up as it seemed to be still
collecting review comments.
Becoming tired of waiting for a reroll.
($gmane/272180).
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
- notes: allow treeish expressions as notes ref
+ Merge branch 'jk/notes-dwim-doc' into next
+ Merge branch 'jc/merge-drop-old-syntax' into next
(this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
--------------------------------------------------
[Cooking]
* cc/quote-comments (2015-10-07) 2 commits
(merged to 'next' on 2015-10-09 at fc8a359)
+ quote: move comment before sq_quote_buf()
+ quote: fix broken sq_quote_buf() related comment
A no-op code-health maintenance.
Will merge to 'master'.
* dt/log-follow-config (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 64a30d2)
+ log: Update log.follow doc and add to config.txt
Description of the "log.follow" configuration variable in "git log"
documentation is now also copied to "git config" documentation.
Will merge to 'master'.
* es/worktree-add-cleanup (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 6ffd721)
+ t2026: rename worktree prune test
A no-op code-health maintenance.
Will merge to 'master'.
* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- pretty: add format specifiers for short and raw date formats
Introduce "%as" and "%aR" placeholders for "log --format" to show
the author date in the short and raw formats.
I have a feeling that that this is a step in a wrong direction.
* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
(merged to 'next' on 2015-10-09 at 37888a2)
+ Documentation/interpret-trailers: Grammar fix
Will merge to 'master'.
* dt/refs-backend-lmdb (2015-10-12) 45 commits
- refs: tests for db backend
- refs: add LMDB refs backend
- introduce "extensions" form of core.repositoryformatversion
- refs: add register_refs_backend
- refs: allow ref backend to be set for clone
- refs: always handle non-normal refs in files backend
- refs: move duplicate check to common code
- refs: break out a ref conflict check
- refs: make files_log_ref_write functions public
- refs: make lock generic
- refs-be-files.c: add method to rename refs
- refs.c: add method for initializing refs db
- initdb: move safe_create_dir into common code
- refs.c: add method for initial ref transaction commit
- refs.c: add methods for reflog
- refs.c: add ref backend init function
- refs.c: move should_autocreate_reflog to common code
- refs.c: move peel_object to the common code
- refs.c: move copy_msg to the common code
- refs.h: document make refname_is_safe and add it to header
- refs.c: move refname_is_safe to the common code
- refs-be-files.c: add do_for_each_per_worktree_ref
- refs-be-files.c: add method for for_each_reftype_...
- refs-be-files.c: add methods for the ref iterators
- refs-be-files.c: add methods for misc ref operations
- refs: add a backend method structure with transaction functions
- refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
- refs.c: move is_branch to the common code
- refs.c: move check_refname_format to the common code
- refs.c: move resolve_refdup to common
- refs.c: move read_ref, read_ref_full and ref_exists to the common code
- refs.c: move warn_if_dangling_symref* to the common code
- refs.c: move dwim and friend functions to the common refs code
- refs.c: move the hidden refs functions to the common code
- refs.c: move read_ref_at to the common refs file
- refs.c: move delete_ref and delete_refs to the common code
- refs.c: move update_ref to refs.c
- refs.c: add a new refs.c file to hold all common refs code
- refs-be-files.c: rename refs to refs-be-files
- refs: make repack_without_refs and is_branch public
- refs.c: create a public version of verify_refname_available
- Merge branch 'jk/war-on-sprintf' into HEAD
(this branch uses jk/war-on-sprintf.)
Pluggable ref backend.
Expecting a reroll (as two parts series).
* gr/rebase-i-drop-warn (2015-10-05) 2 commits
(merged to 'next' on 2015-10-09 at 0626b96)
+ rebase-i: loosen over-eager check_bad_cmd check
+ rebase-i: explicitly accept tab as separator in commands
"git rebase -i" had a minor regression recently, which stopped
considering a line that begins with an indented '#' in its insn
sheet not a comment, which is now fixed.
Will merge to 'master'.
* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
(this branch uses kn/for-each-branch.)
More unification among "branch -l", "tag -l" and "for-each-ref --format".
Expecting a reroll.
($gmane/278926)
* jk/war-on-sprintf (2015-10-05) 70 commits
- name-rev: use strip_suffix to avoid magic numbers
- use strbuf_complete to conditionally append slash
- fsck: use for_each_loose_file_in_objdir
- Makefile: drop D_INO_IN_DIRENT build knob
- fsck: drop inode-sorting code
- convert strncpy to memcpy
- notes: document length of fanout path with a constant
- color: add color_set helper for copying raw colors
- prefer memcpy to strcpy
- help: clean up kfmclient munging
- receive-pack: simplify keep_arg computation
- avoid sprintf and strcpy with flex arrays
- use alloc_ref rather than hand-allocating "struct ref"
- color: add overflow checks for parsing colors
- drop strcpy in favor of raw sha1_to_hex
- use sha1_to_hex_r() instead of strcpy
- daemon: use cld->env_array when re-spawning
- stat_tracking_info: convert to argv_array
- http-push: use an argv_array for setup_revisions
- fetch-pack: use argv_array for index-pack / unpack-objects
- diagnose_invalid_index_path: use strbuf to avoid strcpy/strcat
- write_loose_object: convert to strbuf
- remove_leading_path: use a strbuf for internal storage
- enter_repo: convert fixed-size buffers to strbufs
- merge-recursive: convert malloc / strcpy to strbuf
- transport: use strbufs for status table "quickref" strings
- apply: convert root string to strbuf
- init: use strbufs to store paths
- probe_utf8_pathname_composition: use internal strbuf
- precompose_utf8: drop unused variable
- sha1_get_pack_name: use a strbuf
- http-walker: store url in a strbuf
- http-push: use strbuf instead of fwrite_buffer
- remote-ext: simplify git pkt-line generation
- upload-archive: convert sprintf to strbuf
- resolve_ref: use strbufs for internal buffers
- read_remotes_file: simplify string handling
- read_branches_file: simplify string handling
- mailmap: replace strcpy with xstrdup
- help: drop prepend function in favor of xstrfmt
- ref-filter: drop sprintf and strcpy calls
- use strip_suffix and xstrfmt to replace suffix
- fetch: replace static buffer with xstrfmt
- config: use xstrfmt in normalize_value
- replace trivial malloc + sprintf / strcpy calls with xstrfmt
- receive-pack: convert strncpy to xsnprintf
- http-push: replace strcat with xsnprintf
- add_packed_git: convert strcpy into xsnprintf
- entry.c: convert strcpy to xsnprintf
- grep: use xsnprintf to format failure message
- compat/hstrerror: convert sprintf to snprintf
- stop_progress_msg: convert sprintf to xsnprintf
- find_short_object_filename: convert sprintf to xsnprintf
- use xsnprintf for generating git object headers
- archive-tar: use xsnprintf for trivial formatting
- convert trivial sprintf / strcpy calls to xsnprintf
- compat/inet_ntop: fix off-by-one in inet_ntop4
- test-dump-cache-tree: avoid overflow of cache-tree name
- progress: store throughput display in a strbuf
- trace: use strbuf for quote_crnl output
- mailsplit: make PATH_MAX buffers dynamic
- fsck: use strbuf to generate alternate directories
- add reentrant variants of sha1_to_hex and find_unique_abbrev
- strbuf: make strbuf_complete_line more generic
- add git_path_buf helper function
- add xsnprintf helper function
- fsck: don't fsck alternates for connectivity-only check
- archive-tar: fix minor indentation violation
- mailsplit: fix FILE* leak in split_maildir
- show-branch: avoid segfault with --reflog of unborn branch
(this branch is used by dt/refs-backend-lmdb.)
Many allocations that is manually counted (correctly) that are
followed by strcpy/sprintf have been replaced with a less error
prone constructs such as xstrfmt.
Macintosh-specific breakage was noticed and corrected in this
reroll.
Will wait for a week or so before merging to 'next'.
* rp/link-curl-before-ssl (2015-09-25) 3 commits
- configure: make curl-config path configurable
- configure.ac: detect ssl need with libcurl
- Makefile: link libcurl before openssl and crypto
Rerolls exist, but are still being discussed.
* sb/http-flaky-test-fix (2015-09-25) 1 commit
(merged to 'next' on 2015-10-09 at 9dc37f3)
+ t5561: get rid of racy appending to logfile
Will merge to 'master'.
* sb/perf-without-installed-git (2015-09-25) 1 commit
(merged to 'next' on 2015-10-09 at 7a1ed05)
+ t/perf: make runner work even if Git is not installed
Performance-measurement tests did not work without an installed Git.
Will merge to 'master'.
* js/clone-dissociate (2015-10-07) 4 commits
(merged to 'next' on 2015-10-09 at ba30393)
+ clone --dissociate: avoid locking pack files
+ sha1_file.c: add a function to release all packs
+ sha1_file: consolidate code to close a pack's file descriptor
+ t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
"git clone --dissociate" runs a big "git repack" process at the
end, and it helps to close file descriptors that are open on the
packs and their idx files before doing so on filesystems that
cannot remove a file that is still open.
Will merge to 'master'.
* js/gc-with-stale-symref (2015-10-08) 2 commits
(merged to 'next' on 2015-10-09 at 8b89576)
+ pack-objects: do not get distracted by broken symrefs
+ gc: demonstrate failure with stale remote HEAD
"git gc" used to barf when a symbolic ref has gone dangling
(e.g. the branch that used to be your upstream's default when you
cloned from it is now gone, and you did "fetch --prune").
Will merge to 'master'.
* js/icase-wt-detection (2015-09-28) 1 commit
(merged to 'next' on 2015-10-09 at 78ff500)
+ setup: fix "inside work tree" detection on case-insensitive filesystems
Will merge to 'master'.
* mm/detach-at-HEAD-reflog (2015-10-02) 2 commits
(merged to 'next' on 2015-10-09 at 624bc87)
+ status: don't say 'HEAD detached at HEAD'
+ t3203: test 'detached at' after checkout --detach
After "git checkout --detach", "git status" reported a fairly
useless "HEAD detached at HEAD", instead of saying at which exact
commit.
Will merge to 'master'.
* pt/am-builtin (2015-09-30) 1 commit
(merged to 'next' on 2015-10-09 at 396def8)
+ am: configure gpg at startup
When "git am" was rewritten as a built-in, it stopped paying
attention to user.signingkey.
Will merge to 'master'.
* sa/send-email-smtp-batch-data-limit (2015-09-30) 1 commit
(merged to 'next' on 2015-10-09 at c021fdf)
+ git-send-email.perl: Fixed sending of many/huge changes/patches
When "git send-email" wanted to talk over Net::SMTP::SSL,
Net::Cmd::datasend() did not like to be fed too many bytes at the
same time and failed to send messages. Send the payload one line
at a time to work around the problem.
Will merge to 'master'.
* ls/p4-translation-failure (2015-09-22) 2 commits
(merged to 'next' on 2015-10-09 at b462387)
+ git-p4: handle "Translation of file content failed"
+ git-p4: add test case for "Translation of file content failed" error
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.
Will merge to 'master'.
* kn/for-each-branch (2015-09-25) 8 commits
(merged to 'next' on 2015-10-09 at 45723ce)
+ branch: add '--points-at' option
+ branch.c: use 'ref-filter' APIs
+ branch.c: use 'ref-filter' data structures
+ branch: drop non-commit error reporting
+ branch: move 'current' check down to the presentation layer
+ branch: roll show_detached HEAD into regular ref_list
+ branch: bump get_head_description() to the top
+ branch: refactor width computation
(this branch is used by kn/for-each-branch-remainder.)
Update "git branch" that list existing branches, using the
ref-filter API that is shared with "git tag" and "git
for-each-ref".
Will merge to 'master'.
* jc/fsck-dropped-errors (2015-09-23) 1 commit
(merged to 'next' on 2015-10-09 at 887fcac)
+ fsck: exit with non-zero when problems are found
There were some classes of errors that "git fsck" diagnosed to its
standard error that did not cause it to exit with non-zero status.
Will merge to 'master'.
* nd/gc-auto-background-fix (2015-09-21) 1 commit
(merged to 'next' on 2015-10-09 at 1f0fc60)
+ gc: save log from daemonized gc --auto and print it next time
When "git gc --auto" is backgrounded, its diagnosis message is
lost. Save it to a file in $GIT_DIR and show it next time the "gc
--auto" is run.
Will merge to 'master'.
* jk/graph-format-padding (2015-09-14) 1 commit
- pretty: pass graph width to pretty formatting for use in '%>|(N)'
Redefine the way '%>|(N)' padding and the "--graph" option
interacts. It has been that the available columns to display the
log message was measured from the edge of the area the graph ended,
but with this it becomes the beginning of the entire output.
I have a suspicion that 50% of the users would appreciate this
change, and the remainder see this break their expectation. If
that is the case, we might need to introduce a similar but
different alignment operator so that this new behaviour is
available to those who want to use it, without negatively affecting
existing uses.
Undecided.
($gmane/278326)
* sb/submodule-parallel-fetch (2015-10-12) 8 commits
- submodules: allow parallel fetching, add tests and documentation
- fetch_populated_submodules: use new parallel job processing
- run-command: add an asynchronous parallel child processor
- sigchain: add command to pop all common signals
- strbuf: add strbuf_read_once to read without blocking
- xread_nonblock: add functionality to read from fds without blocking
- xread: poll on non blocking fds
- submodule.c: write "Fetching submodule <foo>" to stderr
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
Will merge to 'next'.
* mk/submodule-gitdir-path (2015-09-14) 2 commits
(merged to 'next' on 2015-10-09 at cf8768e)
+ path: implement common_dir handling in git_pathdup_submodule()
+ submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
The submodule code has been taught to work better with separate
work trees created via "git worktree add".
Will merge to 'master'.
* ls/p4-lfs (2015-10-03) 7 commits
(merged to 'next' on 2015-10-14 at 4b8c365)
+ git-p4: add Git LFS backend for large file system
+ git-p4: add support for large file systems
+ git-p4: check free space during streaming
+ git-p4: add file streaming progress in verbose mode
+ git-p4: return an empty list if a list config has no values
+ git-p4: add gitConfigInt reader
+ git-p4: add optional type specifier to gitConfig reader
Teach "git p4" to send large blobs outside the repository by
talking to Git LFS.
Will merge to 'master'.
* nd/clone-linked-checkout (2015-09-28) 6 commits
(merged to 'next' on 2015-10-09 at a93973f)
+ clone: better error when --reference is a linked checkout
+ clone: allow --local from a linked checkout
+ enter_repo: allow .git files in strict mode
+ enter_repo: avoid duplicating logic, use is_git_directory() instead
+ t0002: add test for enter_repo(), non-strict mode
+ path.c: delete an extra space
It was not possible to use a repository-lookalike created by "git
worktree add" as a local source of "git clone".
Will merge to 'master'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
(this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
Stop supporting "git merge <message> HEAD <commit>" syntax that
has been deprecated since October 2007.
Will keep in 'next' during the 2.7 cycle.
--------------------------------------------------
[Discarded]
* sb/remove-get-pathspec (2015-08-03) 1 commit
. builtin/mv: remove get_pathspec()
($gmane/276104)
* nd/list-files (2015-02-09) 21 commits
. t3080: tests for git-list-files
. list-files: -M aka diff-cached
. list-files -F: show submodules with the new indicator '&'
. list-files: add -F/--classify
. list-files: show directories as well as files
. list-files: do not show duplicate cached entries
. list-files: sort output and remove duplicates
. list-files: add -t back
. list-files: add -1 short for --no-column
. list-files: add -R/--recursive short for --max-depth=-1
. list-files: -u does not imply showing stages
. list-files: make alias 'ls' default to 'list-files'
. list-files: a user friendly version of ls-files and more
. ls-files: support --max-depth
. ls-files: add --column
. ls-files: add --color to highlight file names
. ls-files: buffer full item in strbuf before printing
. ls_colors.c: highlight submodules like directories
. ls_colors.c: add a function to color a file name
. ls_colors.c: parse color.ls.* from config file
. ls_colors.c: add $LS_COLORS parsing code
A new "git list-files" Porcelain command, "ls-files" with bells and
whistles.
Reroll to base on wt-status work ($gmane/265142) has seen some
positive discussions.
($gmane/265534).
* mh/numparse (2015-03-19) 14 commits
. diff_opt_parse(): use convert_i() when handling --abbrev=<num>
. diff_opt_parse(): use convert_i() when handling "-l<num>"
. opt_arg(): simplify pointer handling
. opt_arg(): report errors parsing option values
. opt_arg(): use convert_i() in implementation
. opt_arg(): val is always non-NULL
. builtin_diff(): detect errors when parsing --unified argument
. handle_revision_opt(): use convert_ui() when handling "--abbrev="
. strtoul_ui(), strtol_i(): remove functions
. handle_revision_opt(): use convert_i() when handling "-<digit>"
. handle_revision_opt(): use skip_prefix() in many places
. write_subdirectory(): use convert_ui() for parsing mode
. cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
. numparse: new module for parsing integral numbers
Many codepaths use unchecked use of strtol() and friends (or even
worse, atoi()). Introduce a set of wrappers that try to be more
careful.
($gmane/268058).
* kk/log-merges-config (2015-04-21) 5 commits
. bash-completion: add support for git-log --merges= and log.merges
. t4202-log: add tests for --merges=
. Documentation: add git-log --merges= option and log.merges config. var
. log: honor log.merges= option
. revision: add --merges={show|only|hide} option
"git log" (but not other commands in the "log" family) learned to
pay attention to the log.merges configuration variable that can be
set to "show" (the normal behaviour), "only" (hide non-merge
commits), or "hide" (hide merge commits). --merges=(show|only|hide)
can be used to override the setting from the command line.
The documentation may need to be updated once more ($gmane/267250).
* bw/portability-solaris (2015-07-20) 3 commits
. tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
. tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
. tests: modify tr expressions so that xpg4/tr handles it on Solaris
($gmane/274296)
* jc/clone-bundle (2015-04-30) 1 commit
. repack: optionally create a clone.bundle
Still an early WIP.
* mg/index-read-error-messages (2015-06-01) 2 commits
. messages: uniform error messages for index write
. show-index: uniform error messages for index read
The tip was RFC.
Waiting for a reroll.
* mk/utf8-no-iconv-warn (2015-06-08) 1 commit
. utf8.c: print warning about disabled iconv
Warn when a reencoding is requested in a build without iconv
support, as the end user is likely to get an unexpected result. I
think the same level of safety should be added to a build with
iconv support when the specified encoding is not available, but the
patch does not go there.
($gmane/277424).
* pw/remote-set-url-fetch (2014-11-26) 1 commit
. remote: add --fetch and --both options to set-url
Ejected.
* tr/remerge-diff (2014-11-10) 9 commits
. t4213: avoid "|" in sed regexp
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. merge_diff_mode: fold all merge diff variants into an enum
. combine-diff: do not pass revs->dense_combined_merges redundantly
. merge-recursive: -Xindex-only to leave worktree unchanged
. merge-recursive: internal flag to avoid touching the worktree
. merge-recursive: remove dead conditional in update_stages()
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Waiting for a reroll.
($gmane/256591).
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
. perf-lib: add test_perf_cleanup target
. perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
* jc/show-branch (2014-03-24) 5 commits
. show-branch: use commit slab to represent bitflags of arbitrary width
. show-branch.c: remove "all_mask"
. show-branch.c: abstract out "flags" operation
. show-branch.c: lift all_mask/all_revs to a global static
. show-branch.c: update comment style
Waiting for the final step to lift the hard-limit.
^ permalink raw reply [relevance 2%]
* [PATCH v3] merge: fix cache_entry use-after-free
@ 2015-10-14 22:07 1% David Turner
2015-10-15 3:35 2% ` René Scharfe
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-14 22:07 UTC (permalink / raw)
To: git; +Cc: Keith McGuigan, David Turner
From: Keith McGuigan <kmcguigan@twitter.com>
During merges, we would previously free entries that we no longer need
in the destination index. But those entries might also be stored in
the dir_entry cache, and when a later call to add_to_index found them,
they would be used after being freed.
To prevent this, add a ref count for struct cache_entry. Whenever
a cache entry is added to a data structure, the ref count is incremented;
when it is removed from the data structure, it is decremented. When
it hits zero, the cache_entry is freed.
Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
Fix type of ref_count (from unsigned int to int).
cache.h | 27 +++++++++++++++++++++++++++
name-hash.c | 7 ++++++-
read-cache.c | 6 +++++-
split-index.c | 13 ++++++++-----
unpack-trees.c | 6 ++++--
5 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/cache.h b/cache.h
index 752031e..7906026 100644
--- a/cache.h
+++ b/cache.h
@@ -149,6 +149,7 @@ struct stat_data {
struct cache_entry {
struct hashmap_entry ent;
+ int ref_count; /* count the number of refs to this in dir_hash */
struct stat_data ce_stat_data;
unsigned int ce_mode;
unsigned int ce_flags;
@@ -213,6 +214,32 @@ struct cache_entry {
struct pathspec;
/*
+ * Increment the cache_entry reference count. Should be called
+ * whenever a pointer to a cache_entry is retained in a data structure,
+ * thus marking it as alive.
+ */
+static inline void add_ce_ref(struct cache_entry *ce)
+{
+ assert(ce != NULL && ce->ref_count >= 0);
+ ce->ref_count++;
+}
+
+/*
+ * Decrement the cache_entry reference count. Should be called whenever
+ * a pointer to a cache_entry is dropped. Once the counter drops to 0
+ * the cache_entry memory will be safely freed.
+ */
+static inline void drop_ce_ref(struct cache_entry *ce)
+{
+ if (ce != NULL) {
+ assert(ce->ref_count >= 0);
+ if (--ce->ref_count < 1) {
+ free(ce);
+ }
+ }
+}
+
+/*
* Copy the sha1 and stat state of a cache entry from one to
* another. But we never change the name, or the hash state!
*/
diff --git a/name-hash.c b/name-hash.c
index 702cd05..f12c919 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -66,6 +66,7 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
dir = xcalloc(1, sizeof(struct dir_entry));
hashmap_entry_init(dir, memihash(ce->name, namelen));
dir->namelen = namelen;
+ add_ce_ref(ce);
dir->ce = ce;
hashmap_add(&istate->dir_hash, dir);
@@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
while (dir && !(--dir->nr)) {
struct dir_entry *parent = dir->parent;
- hashmap_remove(&istate->dir_hash, dir, NULL);
+ struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
+ assert(removed == dir);
+ drop_ce_ref(dir->ce);
free(dir);
dir = parent;
}
@@ -105,6 +108,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
ce->ce_flags |= CE_HASHED;
hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
hashmap_add(&istate->name_hash, ce);
+ add_ce_ref(ce);
if (ignore_case)
add_dir_entry(istate, ce);
@@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
return;
ce->ce_flags &= ~CE_HASHED;
hashmap_remove(&istate->name_hash, ce, ce);
+ drop_ce_ref(ce);
if (ignore_case)
remove_dir_entry(istate, ce);
diff --git a/read-cache.c b/read-cache.c
index 87204a5..8b685bb 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -52,7 +52,9 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
+ /* istate->cache[nr] is assumed to not hold a live value */
istate->cache[nr] = ce;
+ add_ce_ref(ce);
add_name_hash(istate, ce);
}
@@ -62,7 +64,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
replace_index_entry_in_base(istate, old, ce);
remove_name_hash(istate, old);
- free(old);
+ drop_ce_ref(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -75,6 +77,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
new = xmalloc(cache_entry_size(namelen));
copy_cache_entry(new, old);
+ new->ref_count = 0;
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
new->index = 0;
@@ -1426,6 +1429,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
{
struct cache_entry *ce = xmalloc(cache_entry_size(len));
+ ce->ref_count = 0;
ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
diff --git a/split-index.c b/split-index.c
index 968b780..61b5631 100644
--- a/split-index.c
+++ b/split-index.c
@@ -124,7 +124,7 @@ static void replace_entry(size_t pos, void *data)
src->ce_flags |= CE_UPDATE_IN_BASE;
src->ce_namelen = dst->ce_namelen;
copy_cache_entry(dst, src);
- free(src);
+ drop_ce_ref(src);
si->nr_replacements++;
}
@@ -227,7 +227,7 @@ void prepare_to_write_split_index(struct index_state *istate)
base->ce_flags = base_flags;
if (ret)
ce->ce_flags |= CE_UPDATE_IN_BASE;
- free(base);
+ drop_ce_ref(base);
si->base->cache[ce->index - 1] = ce;
}
for (i = 0; i < si->base->cache_nr; i++) {
@@ -302,7 +302,7 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
- free(ce);
+ drop_ce_ref(ce);
}
void replace_index_entry_in_base(struct index_state *istate,
@@ -314,8 +314,11 @@ void replace_index_entry_in_base(struct index_state *istate,
istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) {
new->index = old->index;
- if (old != istate->split_index->base->cache[new->index - 1])
- free(istate->split_index->base->cache[new->index - 1]);
+ if (old != istate->split_index->base->cache[new->index - 1]) {
+ struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
+ drop_ce_ref(ce);
+ }
istate->split_index->base->cache[new->index - 1] = new;
+ add_ce_ref(new);
}
}
diff --git a/unpack-trees.c b/unpack-trees.c
index f932e80..1a0a637 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
o);
for (i = 0; i < n; i++) {
struct cache_entry *ce = src[i + o->merge];
- if (ce != o->df_conflict_entry)
- free(ce);
+ if (ce != o->df_conflict_entry) {
+ drop_ce_ref(ce);
+ src[i + o->merge] = NULL;
+ }
}
return rc;
}
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply related [relevance 1%]
* Re: [PATCH v2] merge: fix cache_entry use-after-free
2015-10-14 21:17 2% ` Junio C Hamano
@ 2015-10-14 22:00 2% ` David Turner
0 siblings, 0 replies; 200+ results
From: David Turner @ 2015-10-14 22:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Keith McGuigan
On Wed, 2015-10-14 at 14:17 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> > + unsigned int ref_count; /* count the number of refs to this in dir_hash */
>
> Me makes a mental note of the type used...
>
> > @@ -213,6 +214,32 @@ struct cache_entry {
> > struct pathspec;
> >
> > /*
> > + * Increment the cache_entry reference count. Should be called
> > + * whenever a pointer to a cache_entry is retained in a data structure,
> > + * thus marking it as alive.
> > + */
> > +static inline void add_ce_ref(struct cache_entry *ce)
> > +{
> > + assert(ce != NULL && ce->ref_count >= 0);
>
> ... and notices that ce->ref_count will always be non-negative here
>
>
> > + ce->ref_count++;
> > +}
> > +
> > +/*
> > + * Decrement the cache_entry reference count. Should be called whenever
> > + * a pointer to a cache_entry is dropped. Once the counter drops to 0
> > + * the cache_entry memory will be safely freed.
> > + */
> > +static inline void drop_ce_ref(struct cache_entry *ce)
> > +{
> > + if (ce != NULL) {
> > + assert(ce->ref_count >= 0);
>
> ... and here.
>
> By not checking integer overflow/wraparound, the code is assuming
> that a ce entry will never referenced more than 4 billion times on
> 32-bit platform. And that is a sensible assumption as there aren't
> that many pointers in the address space to make that many reference
> anyway.
>
> Perhaps the code can assume the number won't be more than 2 billion
> and use a signed type instead for the reference counting?
Will do.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2] merge: fix cache_entry use-after-free
2015-10-12 22:03 1% [PATCH v2] " David Turner
2015-10-12 22:28 2% ` Junio C Hamano
@ 2015-10-14 21:17 2% ` Junio C Hamano
2015-10-14 22:00 2% ` David Turner
1 sibling, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-14 21:17 UTC (permalink / raw)
To: David Turner; +Cc: git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> + unsigned int ref_count; /* count the number of refs to this in dir_hash */
Me makes a mental note of the type used...
> @@ -213,6 +214,32 @@ struct cache_entry {
> struct pathspec;
>
> /*
> + * Increment the cache_entry reference count. Should be called
> + * whenever a pointer to a cache_entry is retained in a data structure,
> + * thus marking it as alive.
> + */
> +static inline void add_ce_ref(struct cache_entry *ce)
> +{
> + assert(ce != NULL && ce->ref_count >= 0);
... and notices that ce->ref_count will always be non-negative here
> + ce->ref_count++;
> +}
> +
> +/*
> + * Decrement the cache_entry reference count. Should be called whenever
> + * a pointer to a cache_entry is dropped. Once the counter drops to 0
> + * the cache_entry memory will be safely freed.
> + */
> +static inline void drop_ce_ref(struct cache_entry *ce)
> +{
> + if (ce != NULL) {
> + assert(ce->ref_count >= 0);
... and here.
By not checking integer overflow/wraparound, the code is assuming
that a ce entry will never referenced more than 4 billion times on
32-bit platform. And that is a sensible assumption as there aren't
that many pointers in the address space to make that many reference
anyway.
Perhaps the code can assume the number won't be more than 2 billion
and use a signed type instead for the reference counting?
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2] merge: fix cache_entry use-after-free
2015-10-13 19:22 2% ` David Turner
@ 2015-10-13 21:05 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-13 21:05 UTC (permalink / raw)
To: David Turner; +Cc: git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
>> This one smelled iffy. I think it is safe because the caller does
>> not look at src[] other than src[0] after this function returns, and
>> this setting to NULL happens only when o->merge is set to 1, so I do
>> not think this is buggy, but at the same time I do not think setting
>> to NULL is necessary.
>>
>> Other than that, looks nice. Thanks.
>
> I like to set a pointer to NULL after I free the thing pointed to by it,
> because it helps make use-after-free bugs easier to detect.
Yes, but it also helps unintended bugs to creep in if done blindly,
and that is why I vetted what happens in the codepath of the caller
of this function after src[] entries are NULLed (the caller could be
expecting to do things only to NULLed fields, for example, in which
case clearing them like this patch would have changed the behaviour
of the caller after this function returns).
Thanks.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2] merge: fix cache_entry use-after-free
2015-10-12 22:28 2% ` Junio C Hamano
@ 2015-10-13 19:22 2% ` David Turner
2015-10-13 21:05 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-13 19:22 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Keith McGuigan
On Mon, 2015-10-12 at 15:28 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> > From: Keith McGuigan <kmcguigan@twitter.com>
> >
> > During merges, we would previously free entries that we no longer need
> > in the destination index. But those entries might also be stored in
> > the dir_entry cache, and when a later call to add_to_index found them,
> > they would be used after being freed.
> >
> > To prevent this, add a ref count for struct cache_entry. Whenever
> > a cache entry is added to a data structure, the ref count is incremented;
> > when it is removed from the data structure, it is decremented. When
> > it hits zero, the cache_entry is freed.
> >
> > Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> > ---
>
> I'll forge your "messenger's sign-off" here ;-)
Thanks.
> > diff --git a/unpack-trees.c b/unpack-trees.c
> > index f932e80..1a0a637 100644
> > --- a/unpack-trees.c
> > +++ b/unpack-trees.c
> > @@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
> > o);
> > for (i = 0; i < n; i++) {
> > struct cache_entry *ce = src[i + o->merge];
> > - if (ce != o->df_conflict_entry)
> > - free(ce);
> > + if (ce != o->df_conflict_entry) {
> > + drop_ce_ref(ce);
> > + src[i + o->merge] = NULL;
> > + }
>
> This one smelled iffy. I think it is safe because the caller does
> not look at src[] other than src[0] after this function returns, and
> this setting to NULL happens only when o->merge is set to 1, so I do
> not think this is buggy, but at the same time I do not think setting
> to NULL is necessary.
>
> Other than that, looks nice. Thanks.
I like to set a pointer to NULL after I free the thing pointed to by it,
because it helps make use-after-free bugs easier to detect.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2] merge: fix cache_entry use-after-free
2015-10-12 22:03 1% [PATCH v2] " David Turner
@ 2015-10-12 22:28 2% ` Junio C Hamano
2015-10-13 19:22 2% ` David Turner
2015-10-14 21:17 2% ` Junio C Hamano
1 sibling, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-12 22:28 UTC (permalink / raw)
To: David Turner; +Cc: git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> From: Keith McGuigan <kmcguigan@twitter.com>
>
> During merges, we would previously free entries that we no longer need
> in the destination index. But those entries might also be stored in
> the dir_entry cache, and when a later call to add_to_index found them,
> they would be used after being freed.
>
> To prevent this, add a ref count for struct cache_entry. Whenever
> a cache entry is added to a data structure, the ref count is incremented;
> when it is removed from the data structure, it is decremented. When
> it hits zero, the cache_entry is freed.
>
> Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> ---
I'll forge your "messenger's sign-off" here ;-)
> diff --git a/unpack-trees.c b/unpack-trees.c
> index f932e80..1a0a637 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
> o);
> for (i = 0; i < n; i++) {
> struct cache_entry *ce = src[i + o->merge];
> - if (ce != o->df_conflict_entry)
> - free(ce);
> + if (ce != o->df_conflict_entry) {
> + drop_ce_ref(ce);
> + src[i + o->merge] = NULL;
> + }
This one smelled iffy. I think it is safe because the caller does
not look at src[] other than src[0] after this function returns, and
this setting to NULL happens only when o->merge is set to 1, so I do
not think this is buggy, but at the same time I do not think setting
to NULL is necessary.
Other than that, looks nice. Thanks.
^ permalink raw reply [relevance 2%]
* [PATCH v2] merge: fix cache_entry use-after-free
@ 2015-10-12 22:03 1% David Turner
2015-10-12 22:28 2% ` Junio C Hamano
2015-10-14 21:17 2% ` Junio C Hamano
0 siblings, 2 replies; 200+ results
From: David Turner @ 2015-10-12 22:03 UTC (permalink / raw)
To: git; +Cc: Keith McGuigan
From: Keith McGuigan <kmcguigan@twitter.com>
During merges, we would previously free entries that we no longer need
in the destination index. But those entries might also be stored in
the dir_entry cache, and when a later call to add_to_index found them,
they would be used after being freed.
To prevent this, add a ref count for struct cache_entry. Whenever
a cache entry is added to a data structure, the ref count is incremented;
when it is removed from the data structure, it is decremented. When
it hits zero, the cache_entry is freed.
Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
---
This version addresses Junio's comments on v1. It adds a missing
add_ce_ref, and fixes a formatting nit.
| 27 +++++++++++++++++++++++++++
| 7 ++++++-
| 6 +++++-
| 13 ++++++++-----
| 6 ++++--
5 files changed, 50 insertions(+), 9 deletions(-)
--git a/cache.h b/cache.h
index 752031e..738f76d 100644
--- a/cache.h
+++ b/cache.h
@@ -149,6 +149,7 @@ struct stat_data {
struct cache_entry {
struct hashmap_entry ent;
+ unsigned int ref_count; /* count the number of refs to this in dir_hash */
struct stat_data ce_stat_data;
unsigned int ce_mode;
unsigned int ce_flags;
@@ -213,6 +214,32 @@ struct cache_entry {
struct pathspec;
/*
+ * Increment the cache_entry reference count. Should be called
+ * whenever a pointer to a cache_entry is retained in a data structure,
+ * thus marking it as alive.
+ */
+static inline void add_ce_ref(struct cache_entry *ce)
+{
+ assert(ce != NULL && ce->ref_count >= 0);
+ ce->ref_count++;
+}
+
+/*
+ * Decrement the cache_entry reference count. Should be called whenever
+ * a pointer to a cache_entry is dropped. Once the counter drops to 0
+ * the cache_entry memory will be safely freed.
+ */
+static inline void drop_ce_ref(struct cache_entry *ce)
+{
+ if (ce != NULL) {
+ assert(ce->ref_count >= 0);
+ if (--ce->ref_count < 1) {
+ free(ce);
+ }
+ }
+}
+
+/*
* Copy the sha1 and stat state of a cache entry from one to
* another. But we never change the name, or the hash state!
*/
--git a/name-hash.c b/name-hash.c
index 702cd05..f12c919 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -66,6 +66,7 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
dir = xcalloc(1, sizeof(struct dir_entry));
hashmap_entry_init(dir, memihash(ce->name, namelen));
dir->namelen = namelen;
+ add_ce_ref(ce);
dir->ce = ce;
hashmap_add(&istate->dir_hash, dir);
@@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
while (dir && !(--dir->nr)) {
struct dir_entry *parent = dir->parent;
- hashmap_remove(&istate->dir_hash, dir, NULL);
+ struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
+ assert(removed == dir);
+ drop_ce_ref(dir->ce);
free(dir);
dir = parent;
}
@@ -105,6 +108,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
ce->ce_flags |= CE_HASHED;
hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
hashmap_add(&istate->name_hash, ce);
+ add_ce_ref(ce);
if (ignore_case)
add_dir_entry(istate, ce);
@@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
return;
ce->ce_flags &= ~CE_HASHED;
hashmap_remove(&istate->name_hash, ce, ce);
+ drop_ce_ref(ce);
if (ignore_case)
remove_dir_entry(istate, ce);
--git a/read-cache.c b/read-cache.c
index 87204a5..8b685bb 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -52,7 +52,9 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
+ /* istate->cache[nr] is assumed to not hold a live value */
istate->cache[nr] = ce;
+ add_ce_ref(ce);
add_name_hash(istate, ce);
}
@@ -62,7 +64,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
replace_index_entry_in_base(istate, old, ce);
remove_name_hash(istate, old);
- free(old);
+ drop_ce_ref(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -75,6 +77,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
new = xmalloc(cache_entry_size(namelen));
copy_cache_entry(new, old);
+ new->ref_count = 0;
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
new->index = 0;
@@ -1426,6 +1429,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
{
struct cache_entry *ce = xmalloc(cache_entry_size(len));
+ ce->ref_count = 0;
ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
--git a/split-index.c b/split-index.c
index 968b780..61b5631 100644
--- a/split-index.c
+++ b/split-index.c
@@ -124,7 +124,7 @@ static void replace_entry(size_t pos, void *data)
src->ce_flags |= CE_UPDATE_IN_BASE;
src->ce_namelen = dst->ce_namelen;
copy_cache_entry(dst, src);
- free(src);
+ drop_ce_ref(src);
si->nr_replacements++;
}
@@ -227,7 +227,7 @@ void prepare_to_write_split_index(struct index_state *istate)
base->ce_flags = base_flags;
if (ret)
ce->ce_flags |= CE_UPDATE_IN_BASE;
- free(base);
+ drop_ce_ref(base);
si->base->cache[ce->index - 1] = ce;
}
for (i = 0; i < si->base->cache_nr; i++) {
@@ -302,7 +302,7 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
- free(ce);
+ drop_ce_ref(ce);
}
void replace_index_entry_in_base(struct index_state *istate,
@@ -314,8 +314,11 @@ void replace_index_entry_in_base(struct index_state *istate,
istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) {
new->index = old->index;
- if (old != istate->split_index->base->cache[new->index - 1])
- free(istate->split_index->base->cache[new->index - 1]);
+ if (old != istate->split_index->base->cache[new->index - 1]) {
+ struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
+ drop_ce_ref(ce);
+ }
istate->split_index->base->cache[new->index - 1] = new;
+ add_ce_ref(new);
}
}
--git a/unpack-trees.c b/unpack-trees.c
index f932e80..1a0a637 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
o);
for (i = 0; i < n; i++) {
struct cache_entry *ce = src[i + o->merge];
- if (ce != o->df_conflict_entry)
- free(ce);
+ if (ce != o->df_conflict_entry) {
+ drop_ce_ref(ce);
+ src[i + o->merge] = NULL;
+ }
}
return rc;
}
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply related [relevance 1%]
* Re: [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-09 22:16 2% ` David Turner
@ 2015-10-09 22:51 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2015-10-09 22:51 UTC (permalink / raw)
To: David Turner; +Cc: git mailing list, Duy Nguyen
David Turner <dturner@twopensource.com> writes:
>> > + assert(removed == dir);
>> > + drop_ce_ref(dir->ce);
>>
>> This is curious. In remove_name_hash() you do not have the
>> corresponding assert. Why is it necessary here (or is it
>> unnecessary over there)?
>
> It is unnecessary in any case: it's an assert rather than a check for an
> expected (or even unexpected) case. That just happens to be where Keith
> first managed to track down the use-after free, so that's where he
> happened to put the assert while trying to debug it. I'm in general in
> favor of more asserts rather than fewer, so I would prefer to keep it
> in. But I can remove it if you like.
OK, it was just the inconsistency between the two made them look
curious, as if one of them is more likely to get broken, or the
patch author was not so sure about the assumption, or something.
>> > + add_ce_ref(ce);
>> > add_name_hash(istate, ce);
>> > }
>>
>> What happens to the existing entry that used to be istate->cache[nr],
>> which may or may not be 'ce' that is replacing it?
>>
>> It turns out that all three calling sites are safe, but it is not
>> immediately obvious why. Perhaps some comment in front of the
>> function is in order, to warn those who may have to add a new caller
>> or restructure the existing calling chain, that istate->cache[nr] is
>> expected not to hold a live reference when the function is called,
>> or something?
>
> Happy to add it if you want, but to me it was clear without because if
> there were a value in istate->cache[nr], that old value would be leaked.
OK, that's sort-of-cheating, but is a sound short-cut ;-).
>> > + if (old != istate->split_index->base->cache[new->index - 1]) {
>> > + struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
>> > + drop_ce_ref(ce);
>> > + }
>> > istate->split_index->base->cache[new->index - 1] = new;
>>
>> Does 'new' already have the right refcount at this point?
>
> I spoke to Keith, and he thinks we do need an add_ce_ref there. I'll fix
> that on the reroll. Duy, do you agree?
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-08 20:00 2% ` Junio C Hamano
@ 2015-10-09 22:16 2% ` David Turner
2015-10-09 22:51 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-09 22:16 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git mailing list, Duy Nguyen
+Duy Nguyen, who knows the split index better.
On Thu, 2015-10-08 at 13:00 -0700, Junio C Hamano wrote:
> David Turner <dturner@twopensource.com> writes:
>
> > From: Keith McGuigan <kmcguigan@twitter.com>
> >
> > During merges, we would previously free entries that we no longer need
> > in the destination index. But those entries might also be stored in
> > the dir_entry cache, and when a later call to add_to_index found them,
> > they would be used after being freed.
> >
> > To prevent this, add a ref count for struct cache_entry. Whenever
> > a cache entry is added to a data structure, the ref count is incremented;
> > when it is removed from the data structure, it is decremented. When
> > it hits zero, the cache_entry is freed.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> > ---
>
> Thanks.
>
> > @@ -213,6 +214,32 @@ struct cache_entry {
> > struct pathspec;
> >
> > /*
> > + * Increment the cache_entry reference count. Should be called
> > + * whenever a pointer to a cache_entry is retained in a data structure,
> > + * thus marking it as alive.
> > + */
> > +static inline void add_ce_ref(struct cache_entry *ce)
> > +{
> > + assert(ce != NULL && ce->ref_count >= 0);
> > + ++ce->ref_count;
> > +}
>
> We tend to prefer post-increment when the distinction between pre-
> or post- does not make any difference, which is the case here.
Will fix.
> > diff --git a/name-hash.c b/name-hash.c
> > index 702cd05..f12c919 100644
> > --- a/name-hash.c
> > +++ b/name-hash.c
> > @@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
> > struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
> > while (dir && !(--dir->nr)) {
> > struct dir_entry *parent = dir->parent;
> > - hashmap_remove(&istate->dir_hash, dir, NULL);
> > + struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
> > + assert(removed == dir);
> > + drop_ce_ref(dir->ce);
>
> This is curious. In remove_name_hash() you do not have the
> corresponding assert. Why is it necessary here (or is it
> unnecessary over there)?
It is unnecessary in any case: it's an assert rather than a check for an
expected (or even unexpected) case. That just happens to be where Keith
first managed to track down the use-after free, so that's where he
happened to put the assert while trying to debug it. I'm in general in
favor of more asserts rather than fewer, so I would prefer to keep it
in. But I can remove it if you like.
> > @@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
> > return;
> > ce->ce_flags &= ~CE_HASHED;
> > hashmap_remove(&istate->name_hash, ce, ce);
> > + drop_ce_ref(ce);
> >
> > if (ignore_case)
> > remove_dir_entry(istate, ce);
> > diff --git a/read-cache.c b/read-cache.c
> > index 87204a5..442de34 100644
> > --- a/read-cache.c
> > +++ b/read-cache.c
> > @@ -53,6 +53,7 @@ static const char *alternate_index_output;
> > static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
> > {
> > istate->cache[nr] = ce;
> > + add_ce_ref(ce);
> > add_name_hash(istate, ce);
> > }
>
> What happens to the existing entry that used to be istate->cache[nr],
> which may or may not be 'ce' that is replacing it?
>
> It turns out that all three calling sites are safe, but it is not
> immediately obvious why. Perhaps some comment in front of the
> function is in order, to warn those who may have to add a new caller
> or restructure the existing calling chain, that istate->cache[nr] is
> expected not to hold a live reference when the function is called,
> or something?
Happy to add it if you want, but to me it was clear without because if
there were a value in istate->cache[nr], that old value would be leaked.
Let me know.
> > @@ -314,8 +314,10 @@ void replace_index_entry_in_base(struct index_state *istate,
> > istate->split_index->base &&
> > old->index <= istate->split_index->base->cache_nr) {
> > new->index = old->index;
> > - if (old != istate->split_index->base->cache[new->index - 1])
> > - free(istate->split_index->base->cache[new->index - 1]);
> > + if (old != istate->split_index->base->cache[new->index - 1]) {
> > + struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
> > + drop_ce_ref(ce);
> > + }
> > istate->split_index->base->cache[new->index - 1] = new;
>
> Does 'new' already have the right refcount at this point?
I spoke to Keith, and he thinks we do need an add_ce_ref there. I'll fix
that on the reroll. Duy, do you agree?
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-08 18:47 1% ` David Turner
@ 2015-10-08 20:00 2% ` Junio C Hamano
2015-10-09 22:16 2% ` David Turner
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2015-10-08 20:00 UTC (permalink / raw)
To: David Turner; +Cc: git, Keith McGuigan
David Turner <dturner@twopensource.com> writes:
> From: Keith McGuigan <kmcguigan@twitter.com>
>
> During merges, we would previously free entries that we no longer need
> in the destination index. But those entries might also be stored in
> the dir_entry cache, and when a later call to add_to_index found them,
> they would be used after being freed.
>
> To prevent this, add a ref count for struct cache_entry. Whenever
> a cache entry is added to a data structure, the ref count is incremented;
> when it is removed from the data structure, it is decremented. When
> it hits zero, the cache_entry is freed.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
> ---
Thanks.
> @@ -213,6 +214,32 @@ struct cache_entry {
> struct pathspec;
>
> /*
> + * Increment the cache_entry reference count. Should be called
> + * whenever a pointer to a cache_entry is retained in a data structure,
> + * thus marking it as alive.
> + */
> +static inline void add_ce_ref(struct cache_entry *ce)
> +{
> + assert(ce != NULL && ce->ref_count >= 0);
> + ++ce->ref_count;
> +}
We tend to prefer post-increment when the distinction between pre-
or post- does not make any difference, which is the case here.
> diff --git a/name-hash.c b/name-hash.c
> index 702cd05..f12c919 100644
> --- a/name-hash.c
> +++ b/name-hash.c
> @@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
> struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
> while (dir && !(--dir->nr)) {
> struct dir_entry *parent = dir->parent;
> - hashmap_remove(&istate->dir_hash, dir, NULL);
> + struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
> + assert(removed == dir);
> + drop_ce_ref(dir->ce);
This is curious. In remove_name_hash() you do not have the
corresponding assert. Why is it necessary here (or is it
unnecessary over there)?
> @@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
> return;
> ce->ce_flags &= ~CE_HASHED;
> hashmap_remove(&istate->name_hash, ce, ce);
> + drop_ce_ref(ce);
>
> if (ignore_case)
> remove_dir_entry(istate, ce);
> diff --git a/read-cache.c b/read-cache.c
> index 87204a5..442de34 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -53,6 +53,7 @@ static const char *alternate_index_output;
> static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
> {
> istate->cache[nr] = ce;
> + add_ce_ref(ce);
> add_name_hash(istate, ce);
> }
What happens to the existing entry that used to be istate->cache[nr],
which may or may not be 'ce' that is replacing it?
It turns out that all three calling sites are safe, but it is not
immediately obvious why. Perhaps some comment in front of the
function is in order, to warn those who may have to add a new caller
or restructure the existing calling chain, that istate->cache[nr] is
expected not to hold a live reference when the function is called,
or something?
> @@ -314,8 +314,10 @@ void replace_index_entry_in_base(struct index_state *istate,
> istate->split_index->base &&
> old->index <= istate->split_index->base->cache_nr) {
> new->index = old->index;
> - if (old != istate->split_index->base->cache[new->index - 1])
> - free(istate->split_index->base->cache[new->index - 1]);
> + if (old != istate->split_index->base->cache[new->index - 1]) {
> + struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
> + drop_ce_ref(ce);
> + }
> istate->split_index->base->cache[new->index - 1] = new;
Does 'new' already have the right refcount at this point?
^ permalink raw reply [relevance 2%]
* [PATCH 0/1] merge: fix cache_entry use-after-free
@ 2015-10-08 18:47 5% David Turner
2015-10-08 18:47 1% ` David Turner
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-08 18:47 UTC (permalink / raw)
To: git; +Cc: David Turner
Keith diagnosed the problem and wrote the patch. I wrote the commit
message and am sending it upstream with his OK.
Keith McGuigan (1):
merge: fix cache_entry use-after-free
cache.h | 27 +++++++++++++++++++++++++++
name-hash.c | 7 ++++++-
read-cache.c | 5 ++++-
split-index.c | 12 +++++++-----
unpack-trees.c | 6 ++++--
5 files changed, 48 insertions(+), 9 deletions(-)
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply [relevance 5%]
* [PATCH 0/1] merge: fix cache_entry use-after-free
2015-10-08 18:47 5% [PATCH 0/1] merge: fix cache_entry use-after-free David Turner
@ 2015-10-08 18:47 1% ` David Turner
2015-10-08 20:00 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: David Turner @ 2015-10-08 18:47 UTC (permalink / raw)
To: git; +Cc: Keith McGuigan, David Turner
From: Keith McGuigan <kmcguigan@twitter.com>
During merges, we would previously free entries that we no longer need
in the destination index. But those entries might also be stored in
the dir_entry cache, and when a later call to add_to_index found them,
they would be used after being freed.
To prevent this, add a ref count for struct cache_entry. Whenever
a cache entry is added to a data structure, the ref count is incremented;
when it is removed from the data structure, it is decremented. When
it hits zero, the cache_entry is freed.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Keith McGuigan <kmcguigan@twitter.com>
---
| 27 +++++++++++++++++++++++++++
| 7 ++++++-
| 5 ++++-
| 12 +++++++-----
| 6 ++++--
5 files changed, 48 insertions(+), 9 deletions(-)
--git a/cache.h b/cache.h
index 752031e..7563658 100644
--- a/cache.h
+++ b/cache.h
@@ -149,6 +149,7 @@ struct stat_data {
struct cache_entry {
struct hashmap_entry ent;
+ unsigned int ref_count; /* count the number of refs to this in dir_hash */
struct stat_data ce_stat_data;
unsigned int ce_mode;
unsigned int ce_flags;
@@ -213,6 +214,32 @@ struct cache_entry {
struct pathspec;
/*
+ * Increment the cache_entry reference count. Should be called
+ * whenever a pointer to a cache_entry is retained in a data structure,
+ * thus marking it as alive.
+ */
+static inline void add_ce_ref(struct cache_entry *ce)
+{
+ assert(ce != NULL && ce->ref_count >= 0);
+ ++ce->ref_count;
+}
+
+/*
+ * Decrement the cache_entry reference count. Should be called whenever
+ * a pointer to a cache_entry is dropped. Once the counter drops to 0
+ * the cache_entry memory will be safely freed.
+ */
+static inline void drop_ce_ref(struct cache_entry *ce)
+{
+ if (ce != NULL) {
+ assert(ce->ref_count >= 0);
+ if (--ce->ref_count < 1) {
+ free(ce);
+ }
+ }
+}
+
+/*
* Copy the sha1 and stat state of a cache entry from one to
* another. But we never change the name, or the hash state!
*/
--git a/name-hash.c b/name-hash.c
index 702cd05..f12c919 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -66,6 +66,7 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
dir = xcalloc(1, sizeof(struct dir_entry));
hashmap_entry_init(dir, memihash(ce->name, namelen));
dir->namelen = namelen;
+ add_ce_ref(ce);
dir->ce = ce;
hashmap_add(&istate->dir_hash, dir);
@@ -92,7 +93,9 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce));
while (dir && !(--dir->nr)) {
struct dir_entry *parent = dir->parent;
- hashmap_remove(&istate->dir_hash, dir, NULL);
+ struct dir_entry *removed = hashmap_remove(&istate->dir_hash, dir, NULL);
+ assert(removed == dir);
+ drop_ce_ref(dir->ce);
free(dir);
dir = parent;
}
@@ -105,6 +108,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
ce->ce_flags |= CE_HASHED;
hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
hashmap_add(&istate->name_hash, ce);
+ add_ce_ref(ce);
if (ignore_case)
add_dir_entry(istate, ce);
@@ -147,6 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce)
return;
ce->ce_flags &= ~CE_HASHED;
hashmap_remove(&istate->name_hash, ce, ce);
+ drop_ce_ref(ce);
if (ignore_case)
remove_dir_entry(istate, ce);
--git a/read-cache.c b/read-cache.c
index 87204a5..442de34 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -53,6 +53,7 @@ static const char *alternate_index_output;
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
istate->cache[nr] = ce;
+ add_ce_ref(ce);
add_name_hash(istate, ce);
}
@@ -62,7 +63,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
replace_index_entry_in_base(istate, old, ce);
remove_name_hash(istate, old);
- free(old);
+ drop_ce_ref(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -75,6 +76,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
new = xmalloc(cache_entry_size(namelen));
copy_cache_entry(new, old);
+ new->ref_count = 0;
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
new->index = 0;
@@ -1426,6 +1428,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
{
struct cache_entry *ce = xmalloc(cache_entry_size(len));
+ ce->ref_count = 0;
ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
--git a/split-index.c b/split-index.c
index 968b780..ad28f7b 100644
--- a/split-index.c
+++ b/split-index.c
@@ -124,7 +124,7 @@ static void replace_entry(size_t pos, void *data)
src->ce_flags |= CE_UPDATE_IN_BASE;
src->ce_namelen = dst->ce_namelen;
copy_cache_entry(dst, src);
- free(src);
+ drop_ce_ref(src);
si->nr_replacements++;
}
@@ -227,7 +227,7 @@ void prepare_to_write_split_index(struct index_state *istate)
base->ce_flags = base_flags;
if (ret)
ce->ce_flags |= CE_UPDATE_IN_BASE;
- free(base);
+ drop_ce_ref(base);
si->base->cache[ce->index - 1] = ce;
}
for (i = 0; i < si->base->cache_nr; i++) {
@@ -302,7 +302,7 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
- free(ce);
+ drop_ce_ref(ce);
}
void replace_index_entry_in_base(struct index_state *istate,
@@ -314,8 +314,10 @@ void replace_index_entry_in_base(struct index_state *istate,
istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) {
new->index = old->index;
- if (old != istate->split_index->base->cache[new->index - 1])
- free(istate->split_index->base->cache[new->index - 1]);
+ if (old != istate->split_index->base->cache[new->index - 1]) {
+ struct cache_entry *ce = istate->split_index->base->cache[new->index - 1];
+ drop_ce_ref(ce);
+ }
istate->split_index->base->cache[new->index - 1] = new;
}
}
--git a/unpack-trees.c b/unpack-trees.c
index f932e80..1a0a637 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -606,8 +606,10 @@ static int unpack_nondirectories(int n, unsigned long mask,
o);
for (i = 0; i < n; i++) {
struct cache_entry *ce = src[i + o->merge];
- if (ce != o->df_conflict_entry)
- free(ce);
+ if (ce != o->df_conflict_entry) {
+ drop_ce_ref(ce);
+ src[i + o->merge] = NULL;
+ }
}
return rc;
}
--
2.4.2.644.g97b850b-twtrsrc
^ permalink raw reply related [relevance 1%]
* [PATCH] merge: Fix English grammar in please-commit-before-merge message.
@ 2015-10-02 4:25 3% Alex Henrie
0 siblings, 0 replies; 200+ results
From: Alex Henrie @ 2015-10-02 4:25 UTC (permalink / raw)
To: pyokagan, avarab, gitster, git; +Cc: Alex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
advice.c | 2 +-
contrib/examples/git-pull.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/advice.c b/advice.c
index 4965686..4dc5cf1 100644
--- a/advice.c
+++ b/advice.c
@@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)
{
error(_("You have not concluded your merge (MERGE_HEAD exists)."));
if (advice_resolve_conflict)
- advise(_("Please, commit your changes before you can merge."));
+ advise(_("Please, commit your changes before merging."));
die(_("Exiting because of unfinished merge."));
}
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index e8dc2e0..6b3a03f 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -69,7 +69,7 @@ as appropriate to mark resolution and make a commit.")"
die_merge () {
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
-Please, commit your changes before you can merge.")"
+Please, commit your changes before merging.")"
else
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
fi
--
2.6.0
^ permalink raw reply related [relevance 3%]
* Re: [PATCH] git-svn: merge: fix rooturl/branchurl match check
2014-10-15 12:39 2% [PATCH] git-svn: merge: fix rooturl/branchurl match check Tommaso Colombo
@ 2014-10-20 6:24 2% ` Eric Wong
0 siblings, 0 replies; 200+ results
From: Eric Wong @ 2014-10-20 6:24 UTC (permalink / raw)
To: Tommaso Colombo; +Cc: git, Tommaso Colombo
Tommaso Colombo <tommaso.colombo@outlook.com> wrote:
> When populating svn:mergeinfo, git-svn merge checks if the merge parent
> of the merged branch is under the same root as the git-svn repository.
> This was implemented comparing $gs->repos_root with the return value of
> of cmt_metadata for the merge parent. However, the first may contain a
> username, whereas the second does not. In this case the comparison
> fails.
>
> Remove the username from $gs->repos_root before performing the
> comparison.
Thanks. Commit makes sense, but one of the test cases fails for me,
can you check it out?
$ make && make t9161-git-svn-mergeinfo-push.sh -C t GIT_TEST_OPTS='-i -v'
<snip successes>
ok 11 - reintegration merge
expecting success:
mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
/branches/svnb2:3,8,16-17
/branches/svnb3:4,9
/branches/svnb5:6,11"
not ok 12 - check reintegration mergeinfo
#
# mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
# test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
# /branches/svnb2:3,8,16-17
# /branches/svnb3:4,9
# /branches/svnb5:6,11"
#
make: *** [t9161-git-svn-mergeinfo-push.sh] Error 1
make: Leaving directory `/home/ew/git-core/t'
You'll also need to sign-off (see Documentation/SubmittingPatches)
It is required (project policy, not mine)
> @@ -729,7 +730,7 @@ sub populate_merge_info {
> }
> my $branchpath = $1;
>
> - my $ra = Git::SVN::Ra->new($branchurl);
> + my $ra = Git::SVN::Ra->new(add_path_to_url($gs->repos_root, $branchpath));
Also, please keep long lines wrapped to <= 80 columns.
Thanks again.
^ permalink raw reply [relevance 2%]
* [PATCH] git-svn: merge: fix rooturl/branchurl match check
@ 2014-10-15 12:39 2% Tommaso Colombo
2014-10-20 6:24 2% ` Eric Wong
0 siblings, 1 reply; 200+ results
From: Tommaso Colombo @ 2014-10-15 12:39 UTC (permalink / raw)
To: git; +Cc: Tommaso Colombo
When populating svn:mergeinfo, git-svn merge checks if the merge parent
of the merged branch is under the same root as the git-svn repository.
This was implemented comparing $gs->repos_root with the return value of
of cmt_metadata for the merge parent. However, the first may contain a
username, whereas the second does not. In this case the comparison
fails.
Remove the username from $gs->repos_root before performing the
comparison.
---
git-svn.perl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index b6e2186..0a5a5ff 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -707,7 +707,8 @@ sub populate_merge_info {
my $all_parents_ok = 1;
my $aggregate_mergeinfo = '';
my $rooturl = $gs->repos_root;
- my ($target_branch) = $gs->full_pushurl =~ /^\Q$rooturl\E(.*)/;
+ Git::SVN::remove_username($rooturl);
+ my $target_branch = $gs->path;
if (defined($rewritten_parent)) {
# Replace first parent with newly-rewritten version
@@ -729,7 +730,7 @@ sub populate_merge_info {
}
my $branchpath = $1;
- my $ra = Git::SVN::Ra->new($branchurl);
+ my $ra = Git::SVN::Ra->new(add_path_to_url($gs->repos_root, $branchpath));
my (undef, undef, $props) =
$ra->get_dir(canonicalize_path("."), $svnrev);
my $par_mergeinfo = $props->{'svn:mergeinfo'};
@@ -921,6 +922,7 @@ sub cmd_dcommit {
# information from different SVN repos, and paths
# which are not underneath this repository root.
my $rooturl = $gs->repos_root;
+ Git::SVN::remove_username($rooturl);
foreach my $d (@$linear_refs) {
my %parentshash;
read_commit_parents(\%parentshash, $d);
--
2.1.2.443.g670a3c1.dirty
^ permalink raw reply related [relevance 2%]
* Re: [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged
2014-08-13 0:03 1% ` [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged Jonathan Nieder
@ 2014-08-13 0:38 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-08-13 0:38 UTC (permalink / raw)
To: Jonathan Nieder
Cc: Stefan Beller, Johannes Schindelin, Daniel Barkalow,
Git Mailing List
On Tue, Aug 12, 2014 at 5:03 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> twoway_merge() is missing an o->gently check in the case where a file
> that needs to be modified is missing from the index but present in the
> old and new trees. As a result, in this case 'git checkout -m' errors
> out instead of trying to perform a merge.
>
> Fix it by checking o->gently. While at it, inline the o->gently check
> into reject_merge to prevent future call sites from making the same
> mistake.
>
> Noticed by code inspection. The motivating case hasn't been tested.
That sounds sloppy X-<. I may comment more after figuring out
what _other_ reject_merge() caller that does not appear in the
patch would change its behaviour with this patch.
side note: of course, if this were two patches, one that adds the
same o->gently ? -1 : reject thing to places where they forget to
do so, and the other that moves the gently thing to reject helper,
then we can read all the necessary information to judge the change
in the patch ;-)
Thanks.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> This is the most iffy of the three patches, mostly because I was too
> lazy to write a test. I believe it's safe as-is nonetheless.
>
> Thanks for reading.
>
> unpack-trees.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 187b15b..6c45af7 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -1178,7 +1178,8 @@ return_failed:
> static int reject_merge(const struct cache_entry *ce,
> struct unpack_trees_options *o)
> {
> - return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
> + return o->gently ? -1 :
> + add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
> }
>
> static int same(const struct cache_entry *a, const struct cache_entry *b)
> @@ -1633,7 +1634,7 @@ int threeway_merge(const struct cache_entry * const *stages,
> /* #14, #14ALT, #2ALT */
> if (remote && !df_conflict_head && head_match && !remote_match) {
> if (index && !same(index, remote) && !same(index, head))
> - return o->gently ? -1 : reject_merge(index, o);
> + return reject_merge(index, o);
> return merged_entry(remote, index, o);
> }
> /*
> @@ -1641,7 +1642,7 @@ int threeway_merge(const struct cache_entry * const *stages,
> * make sure that it matches head.
> */
> if (index && !same(index, head))
> - return o->gently ? -1 : reject_merge(index, o);
> + return reject_merge(index, o);
>
> if (head) {
> /* #5ALT, #15 */
> @@ -1770,7 +1771,7 @@ int twoway_merge(const struct cache_entry * const *src,
> else
> return merged_entry(newtree, current, o);
> }
> - return o->gently ? -1 : reject_merge(current, o);
> + return reject_merge(current, o);
> } else if ((!oldtree && !newtree) || /* 4 and 5 */
> (!oldtree && newtree &&
> same(current, newtree)) || /* 6 and 7 */
> @@ -1788,7 +1789,7 @@ int twoway_merge(const struct cache_entry * const *src,
> /* 20 or 21 */
> return merged_entry(newtree, current, o);
> } else
> - return o->gently ? -1 : reject_merge(current, o);
> + return reject_merge(current, o);
> }
> else if (newtree) {
> if (oldtree && !o->initial_checkout) {
> --
^ permalink raw reply [relevance 0%]
* [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged
@ 2014-08-13 0:03 1% ` Jonathan Nieder
2014-08-13 0:38 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Jonathan Nieder @ 2014-08-13 0:03 UTC (permalink / raw)
To: Stefan Beller; +Cc: gitster, Johannes.Schindelin, barkalow, git
twoway_merge() is missing an o->gently check in the case where a file
that needs to be modified is missing from the index but present in the
old and new trees. As a result, in this case 'git checkout -m' errors
out instead of trying to perform a merge.
Fix it by checking o->gently. While at it, inline the o->gently check
into reject_merge to prevent future call sites from making the same
mistake.
Noticed by code inspection. The motivating case hasn't been tested.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
This is the most iffy of the three patches, mostly because I was too
lazy to write a test. I believe it's safe as-is nonetheless.
Thanks for reading.
unpack-trees.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 187b15b..6c45af7 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1178,7 +1178,8 @@ return_failed:
static int reject_merge(const struct cache_entry *ce,
struct unpack_trees_options *o)
{
- return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
+ return o->gently ? -1 :
+ add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
}
static int same(const struct cache_entry *a, const struct cache_entry *b)
@@ -1633,7 +1634,7 @@ int threeway_merge(const struct cache_entry * const *stages,
/* #14, #14ALT, #2ALT */
if (remote && !df_conflict_head && head_match && !remote_match) {
if (index && !same(index, remote) && !same(index, head))
- return o->gently ? -1 : reject_merge(index, o);
+ return reject_merge(index, o);
return merged_entry(remote, index, o);
}
/*
@@ -1641,7 +1642,7 @@ int threeway_merge(const struct cache_entry * const *stages,
* make sure that it matches head.
*/
if (index && !same(index, head))
- return o->gently ? -1 : reject_merge(index, o);
+ return reject_merge(index, o);
if (head) {
/* #5ALT, #15 */
@@ -1770,7 +1771,7 @@ int twoway_merge(const struct cache_entry * const *src,
else
return merged_entry(newtree, current, o);
}
- return o->gently ? -1 : reject_merge(current, o);
+ return reject_merge(current, o);
} else if ((!oldtree && !newtree) || /* 4 and 5 */
(!oldtree && newtree &&
same(current, newtree)) || /* 6 and 7 */
@@ -1788,7 +1789,7 @@ int twoway_merge(const struct cache_entry * const *src,
/* 20 or 21 */
return merged_entry(newtree, current, o);
} else
- return o->gently ? -1 : reject_merge(current, o);
+ return reject_merge(current, o);
}
else if (newtree) {
if (oldtree && !o->initial_checkout) {
--
^ permalink raw reply related [relevance 1%]
* Re: Sharing merge conflict resolution between multiple developers
2014-08-11 23:29 2% ` Chris Packham
@ 2014-08-12 1:57 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-08-12 1:57 UTC (permalink / raw)
To: Chris Packham; +Cc: GIT
On Mon, Aug 11, 2014 at 4:29 PM, Chris Packham <judge.packham@gmail.com> wrote:
>> So, the "recording" phase may go something like this:
>> ...
>> git checkout merge-fix/$this-$that
>> git read-tree -m -u HEAD $this
>> git commit -a -m 'merge-fix/$this-$that postimage'
>>
>> The rough idea is "git show merge-fix/$this-$that" will show the
>> "patch" you can apply on top of the conflicted state other people
>> would get by running "git merge $that" while on "$this" branch.
>
> So how would someone else pickup that postimage and use it?
>
> git checkout $this
> git merge $that
> git fetch $remote ':/merge-fix/$this-$that postimage'
> git show ':/merge-fix/$this-$that postimage' | git apply (or patch -p1)
For a simpler case that would work, but because we are not saving
just a patch but two full trees to compare (i.e. merge-fix/$this-$that
is the postimage, its ^1 is the preimage), you should be able to use
the three-way merge in a similar way cherry-pick works. In fact, that
is how rerere replays the recorded resolution, not with a "patch -p1".
^ permalink raw reply [relevance 2%]
* Re: Sharing merge conflict resolution between multiple developers
2014-08-11 18:44 3% ` Junio C Hamano
@ 2014-08-11 23:29 2% ` Chris Packham
2014-08-12 1:57 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Chris Packham @ 2014-08-11 23:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT
On Tue, Aug 12, 2014 at 6:44 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Chris Packham <judge.packham@gmail.com> writes:
>
>> Is there any way where we could share the conflict resolution around
>> but still end up with a single merge commit.
>
> One idea that immediately comes to me is to use something like
> "rerere" (not its implementation and storage, but the underlying
> idea) enhanced with the trick I use to fix-up merges in my daily
> integration cycle (look for "merge-fix" in howto/maintain-git.txt
> in Documentation/).
>
>> developer A:
>> git merge $upstream
>> <conflicts>
>
> And then commit this immediately, together with conflict markers
> (i.e. "commit -a"), and discard it with "reset --hard HEAD^" *after*
> storing it somewhere safe. And then redo the same merge, resolve
> the conflicts and commit the usual way.
>
> The difference between the final conflict resolution and the
> original conflicted state can be used as a reference for others to
> redo the same conflict resolution later elsewhere. That can most
> easily be done by creating a commit that records the final state
> whose parent is the one you recorded the initial conflicted state.
>
> So, the "recording" phase may go something like this:
>
> git checkout $this
> git merge $that
> git commit -a -m 'merge-fix/$this-$that preimage'
> git branch merge-fix/$this-$that
> git reset --hard HEAD^
> git merge $that
> edit
> git commit -a -m 'merge $that to $this'
> git checkout merge-fix/$this-$that
> git read-tree -m -u HEAD $this
> git commit -a -m 'merge-fix/$this-$that postimage'
>
> The rough idea is "git show merge-fix/$this-$that" will show the
> "patch" you can apply on top of the conflicted state other people
> would get by running "git merge $that" while on "$this" branch.
So how would someone else pickup that postimage and use it?
git checkout $this
git merge $that
git fetch $remote ':/merge-fix/$this-$that postimage'
git show ':/merge-fix/$this-$that postimage' | git apply (or patch -p1)
edit
>
> "rerere" essentially does the above recording (and replaying)
> per-path and it comes with a clever indexing scheme to identify
> which previous conflict resolution would apply to the conflicts you
> see in your working tree.
I feel a toy patch coming on.
^ permalink raw reply [relevance 2%]
* Re: Sharing merge conflict resolution between multiple developers
@ 2014-08-11 18:44 3% ` Junio C Hamano
2014-08-11 23:29 2% ` Chris Packham
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2014-08-11 18:44 UTC (permalink / raw)
To: Chris Packham; +Cc: GIT
Chris Packham <judge.packham@gmail.com> writes:
> Is there any way where we could share the conflict resolution around
> but still end up with a single merge commit.
One idea that immediately comes to me is to use something like
"rerere" (not its implementation and storage, but the underlying
idea) enhanced with the trick I use to fix-up merges in my daily
integration cycle (look for "merge-fix" in howto/maintain-git.txt
in Documentation/).
> developer A:
> git merge $upstream
> <conflicts>
And then commit this immediately, together with conflict markers
(i.e. "commit -a"), and discard it with "reset --hard HEAD^" *after*
storing it somewhere safe. And then redo the same merge, resolve
the conflicts and commit the usual way.
The difference between the final conflict resolution and the
original conflicted state can be used as a reference for others to
redo the same conflict resolution later elsewhere. That can most
easily be done by creating a commit that records the final state
whose parent is the one you recorded the initial conflicted state.
So, the "recording" phase may go something like this:
git checkout $this
git merge $that
git commit -a -m 'merge-fix/$this-$that preimage'
git branch merge-fix/$this-$that
git reset --hard HEAD^
git merge $that
edit
git commit -a -m 'merge $that to $this'
git checkout merge-fix/$this-$that
git read-tree -m -u HEAD $this
git commit -a -m 'merge-fix/$this-$that postimage'
The rough idea is "git show merge-fix/$this-$that" will show the
"patch" you can apply on top of the conflicted state other people
would get by running "git merge $that" while on "$this" branch.
"rerere" essentially does the above recording (and replaying)
per-path and it comes with a clever indexing scheme to identify
which previous conflict resolution would apply to the conflicts you
see in your working tree.
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] Git v2.1.0-rc0
@ 2014-07-27 23:18 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-07-27 23:18 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
An early preview release Git v2.1.0-rc0 is now available for testing
at the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the 'v2.1.0-rc0'
tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
Git v2.1 Release Notes (draft)
==============================
Backward compatibility notes
----------------------------
* The default value we give to the environment variable LESS has been
changed from "FRSX" to "FRX", losing "S" (chop long lines instead
of wrapping). Existing users who prefer not to see line-wrapped
output may want to set
$ git config core.pager "less -S"
to restore the traditional behaviour. It is expected that people
find output from the most subcommands easier to read with the new
default, except for "blame" which tends to produce really long
lines. To override the new default only for "git blame", you can
do this:
$ git config pager.blame "less -S"
* A few disused directories in contrib/ have been retired.
Updates since v2.0
------------------
UI, Workflows & Features
* Since the very beginning of Git, we gave the LESS environment a
default value "FRSX" when we spawn "less" as the pager. "S" (chop
long lines instead of wrapping) has been removed from this default
set of options, because it is more or less a personal taste thing,
as opposed to others that have good justifications (i.e. "R" is
very much justified because many kinds of output we produce are
colored and "FX" is justified because output we produce is often
shorter than a page).
* The logic and data used to compute the display width needed for
UTF-8 strings have been updated to match Unicode 7.0 better.
* HTTP-based transports learned to propagate the error messages from
the webserver better to the client coming over the HTTP transport.
* The completion script for bash (in contrib/) has been updated to
handle aliases that define complex sequence of commands better.
* The "core.preloadindex" configuration variable is by default
enabled, allowing modern platforms to take advantage of the
multiple cores they have.
* "git clone" applies the "if cloning from a local disk, physically
copy repository using hardlinks, unless otherwise told not to with
--no-local" optimization when url.*.insteadOf mechanism rewrites a
"git clone $URL" that refers to a repository over the network to a
clone from a local disk.
* "git commit --date=<date>" option learned to read from more
timestamp formats, including "--date=now".
* The `core.commentChar` configuration variable is used to specify a
custom comment character other than the default "#" to be used in
the commit log editor. This can be set to `auto` to attempt to
choose a different character that does not conflict with what
already starts a line in the message being edited for cases like
"git commit --amend".
* "git format-patch" learned --signature-file=<file> to take the mail
signature from.
* "git grep" learned grep.fullname configuration variable to force
"--full-name" to be default. This may cause regressions on
scripted users that do not expect this new behaviour.
* "git imap-send" learned to ask the credential helper for auth
material.
* "git log" and friends now understand the value "auto" set to the
"log.decorate" configuration variable to enable the "--decorate"
option automatically when the output is sent to tty.
* "git merge" without argument, even when there is an upstream
defined for the current branch, refused to run until
merge.defaultToUpstream is set to true. Flip the default of that
configuration variable to true.
* "git mergetool" learned to drive the vimdiff3 backend.
* mergetool.prompt used to default to 'true', always asking "do you
really want to run the tool on this path?". Among the two
purposes this prompt serves, ignore the use case to confirm that
the user wants to view particular path with the named tool, and
redefine the meaning of the prompt only to confirm the choice of
the tool made by the autodetection (for those who configured the
tool explicitly, the prompt shown for the latter purpose is
simply annoying).
Strictly speaking, this is a backward incompatible change and the
users need to explicitly set the variable to 'true' if they want
to resurrect the now-ignored use case.
* "git replace" learned the "--edit" subcommand to create a
replacement by editing an existing object.
* "git replace" learned a "--graft" option to rewrite parents of a
commit.
* "git send-email" learned "--to-cover" and "--cc-cover" options, to
tell it to copy To: and Cc: headers found in the first input file
when emitting later input files.
* "git svn" learned to cope with malformed timestamps with only one
digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted
by some broken subversion server implementations.
* "git tag" when editing the tag message shows the name of the tag
being edited as a comment in the editor.
* "git tag" learned to pay attention to "tag.sort" configuration, to
be used as the default sort order when no --sort=<value> the option
is given.
* "git verify-commit" command to check GPG signature in signed
commits, in a way similar to "git verify-tag" is used to check
signed tags, was added.
Performance, Internal Implementation, etc.
* Build procedure for 'subtree' (in contrib/) has been cleaned up.
* The support for the profile-feedback build, which has been left
bit-rotten for quite a while, has been updated.
* An experimental format to use two files (the base file and
incremental changes relative to it) to represent the index has been
introduced; this may reduce I/O cost of rewriting a large index
when only small part of the working tree changes.
* Effort to shrink the size of patches Windows folks maintain on top
by upstreaming them continues.
* Patches maintained by msysgit folks for Windows port are being
upstreamed here a bit by bit.
* The leaf function to check validity of a refname format has been
micro-optimized, using SSE2 instructions when available. A few
breakages during its development have been caught and fixed already
but there might remain some more still; please test and report if
you find any.
* The `core.deltabasecachelimit` used to default to 16 MiB , but this
proved to be too small, and has been bumped to 96 MiB.
* "git blame" has been optimized greatly by reorganising the data
structure that is used to keep track of the work to be done.
* "git diff" that compares 3-or-more trees (e.g. parents and the
result of a merge) have been optimized.
* The API to update/delete references are being converted to handle
updates to multiple references in a transactional way. As an
example, "update-ref --stdin [-z]" has been updated to use this
API.
* skip_prefix() and strip_suffix() API functions are used a lot more
widely throughout the codebase now.
* Parts of the test scripts can be skipped by using a range notation,
e.g. "sh t1234-test.sh --run='1-4 6 8-'" to omit test piece 5 and 7
and run everything else.
Also contains various documentation updates and code clean-ups.
Fixes since v2.0
----------------
Unless otherwise noted, all the fixes since v2.0 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
* We used to unconditionally disable the pager in the pager process
we spawn to feed out output, but that prevented people who want to
run "less" within "less" from doing so.
(merge c0459ca je/pager-do-not-recurse later to maint).
* Tools that read diagnostic output in our standard error stream do
not want to see terminal control sequence (e.g. erase-to-eol).
Detect them by checking if the standard error stream is connected
to a tty.
(merge 38de156 mn/sideband-no-ansi later to maint).
* Mishandling of patterns in .gitignore that has trailing SPs quoted
with backslashes (e.g. ones that end with "\ ") have been
corrected.
(merge 97c1364be6b pb/trim-trailing-spaces later to maint).
* Reworded the error message given upon a failure to open an existing
loose object file due to e.g. permission issues; it was reported as
the object being corrupt, but that is not quite true.
(merge d6c8a05 jk/report-fail-to-read-objects-better later to maint).
* "git log -2master" is a common typo that shows two commits starting
from whichever random branch that is not 'master' that happens to
be checked out currently.
(merge e3fa568 jc/revision-dash-count-parsing later to maint).
* Code to avoid adding the same alternate object store twice was
subtly broken for a long time, but nobody seems to have noticed.
(merge 80b4785 rs/fix-alt-odb-path-comparison later to maint).
(merge 539e750 ek/alt-odb-entry-fix later to maint).
* The "%<(10,trunc)%s" pretty format specifier in the log family of
commands is used to truncate the string to a given length (e.g. 10
in the example) with padding to column-align the output, but did
not take into account that number of bytes and number of display
columns are different.
(merge 7d50987 as/pretty-truncate later to maint).
* "%G" (nothing after G) is an invalid pretty format specifier, but
the parser did not notice it as garbage.
(merge 958b2eb jk/pretty-G-format-fixes later to maint).
* A handful of code paths had to read the commit object more than
once when showing header fields that are usually not parsed. The
internal data structure to keep track of the contents of the commit
object has been updated to reduce the need for this double-reading,
and to allow the caller find the length of the object.
(merge 218aa3a jk/commit-buffer-length later to maint).
* The "mailmap.file" configuration option did not support the tilde
expansion (i.e. ~user/path and ~/path).
(merge 9352fd5 ow/config-mailmap-pathname later to maint).
* The completion scripts (in contrib/) did not know about quite a few
options that are common between "git merge" and "git pull", and a
couple of options unique to "git merge".
(merge 8fee872 jk/complete-merge-pull later to maint).
* The unix-domain socket used by the sample credential cache daemon
tried to unlink an existing stale one at a wrong path, if the path
to the socket was given as an overlong path that does not fit in
sun_path member of the sockaddr_un structure.
(merge 2869b3e rs/fix-unlink-unix-socket later to maint).
* An ancient rewrite passed a wrong pointer to a curl library
function in a rarely used code path.
(merge 479eaa8 ah/fix-http-push later to maint).
* "--ignore-space-change" option of "git apply" ignored the spaces
at the beginning of line too aggressively, which is inconsistent
with the option of the same name "diff" and "git diff" have.
(merge 14d3bb4 jc/apply-ignore-whitespace later to maint).
* "git blame" miscounted number of columns needed to show localized
timestamps, resulting in jaggy left-side-edge of the source code
lines in its output.
(merge dd75553 jx/blame-align-relative-time later to maint).
* "git blame" assigned the blame to the copy in the working-tree if
the repository is set to core.autocrlf=input and the file used CRLF
line endings.
(merge 4d4813a bc/blame-crlf-test later to maint).
* "git clone -b brefs/tags/bar" would have mistakenly thought we were
following a single tag, even though it was a name of the branch,
because it incorrectly used strstr().
(merge 60a5f5f jc/fix-clone-single-starting-at-a-tag later to maint).
* "git commit --allow-empty-messag -C $commit" did not work when the
commit did not have any log message.
(merge 076cbd6 jk/commit-C-pick-empty later to maint).
* "git diff --find-copies-harder" sometimes pretended as if the mode
bits have changed for paths that are marked with assume-unchanged
bit.
(merge 5304810 jk/diff-files-assume-unchanged later to maint).
* "filter-branch" left an empty single-parent commit that results when
all parents of a merge commit gets mapped to the same commit, even
under "--prune-empty".
(merge 79bc4ef cb/filter-branch-prune-empty-degenerate-merges later to maint).
* "git format-patch" did not enforce the rule that the "--follow"
option from the log/diff family of commands must be used with
exactly one pathspec.
(merge dd63f16 jk/diff-follow-must-take-one-pathspec later to maint).
* "git gc --auto" was recently changed to run in the background to
give control back early to the end-user sitting in front of the
terminal, but it forgot that housekeeping involving reflogs should
be done without other processes competing for accesses to the refs.
(merge 62aad18 nd/daemonize-gc later to maint).
* "git grep -O" to show the lines that hit in the pager did not work
well with case insensitive search. We now spawn "less" with its
"-I" option when it is used as the pager (which is the default).
(merge f7febbe sk/spawn-less-case-insensitively-from-grep-O-i later to maint).
* We used to disable threaded "git index-pack" on platforms without
thread-safe pread(); use a different workaround for such
platforms to allow threaded "git index-pack".
(merge 3953949 nd/index-pack-one-fd-per-thread later to maint).
* The error reporting from "git index-pack" has been improved to
distinguish missing objects from type errors.
(merge 77583e7 jk/index-pack-report-missing later to maint).
* "log --show-signature" incorrectly decided the color to paint a
mergetag that was and was not correctly validated.
(merge 42c55ce mg/fix-log-mergetag-color later to maint).
* "log --show-signature" did not pay attention to "--graph" option.
(merge cf3983d zk/log-graph-showsig later to maint).
* "git mailinfo" used to read beyond the end of header string while
parsing an incoming e-mail message to extract the patch.
(merge b1a013d rs/mailinfo-header-cmp later to maint).
* On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
(merge baa37bf dt/merge-recursive-case-insensitive later to maint).
* Merging changes into a file that ends in an incomplete line made the
last line into a complete one, even when the other branch did not
change anything around the end of file.
(merge ba31180 mk/merge-incomplete-files later to maint).
* "git pack-objects" unnecessarily copied the previous contents when
extending the hashtable, even though it will populate the table
from scratch anyway.
(merge fb79947 rs/pack-objects-no-unnecessary-realloc later to maint).
* Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
(merge d078d85 jk/repack-pack-keep-objects later to maint).
* "git rerere forget" did not work well when merge.conflictstyle
was set to a non-default value.
(merge de3d8bb fc/rerere-conflict-style later to maint).
* "git remote rm" and "git remote prune" can involve removing many
refs at once, which is not a very efficient thing to do when very
many refs exist in the packed-refs file.
(merge e6bea66 jl/remote-rm-prune later to maint).
* "git log --exclude=<glob> --all | git shortlog" worked as expected,
but "git shortlog --exclude=<glob> --all", which is supposed to be
identical to the above pipeline, was not accepted at the command
line argument parser level.
(merge eb07774 jc/shortlog-ref-exclude later to maint).
* The autostash mode of "git rebase -i" did not restore the dirty
working tree state if the user aborted the interactive rebase by
emptying the insn sheet.
(merge ddb5432 rr/rebase-autostash-fix later to maint).
* "git rebase --fork-point" did not filter out patch-identical
commits correctly.
* During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.
(merge 95104c7 bc/fix-rebase-merge-skip later to maint).
* "git show -s" (i.e. show log message only) used to incorrectly emit
an extra blank line after a merge commit.
(merge ad2f725 mk/show-s-no-extra-blank-line-for-merges later to maint).
* "git status", even though it is a read-only operation, tries to
update the index with refreshed lstat(2) info to optimize future
accesses to the working tree opportunistically, but this could
race with a "read-write" operation that modify the index while it
is running. Detect such a race and avoid overwriting the index.
(merge 426ddee ym/fix-opportunistic-index-update-race later to maint).
* "git status" (and "git commit") behaved as if changes in a modified
submodule are not there if submodule.*.ignore configuration is set,
which was misleading. The configuration is only to unclutter diff
output during the course of development, and should not to hide
changes in the "status" output to cause the users forget to commit
them.
(merge c215d3d jl/status-added-submodule-is-never-ignored later to maint).
* Documentation for "git submodule sync" forgot to say that the subcommand
can take the "--recursive" option.
(merge 9393ae7 mc/doc-submodule-sync-recurse later to maint).
* "git update-index --cacheinfo" in 2.0 release crashed on a
malformed command line.
(merge c8e1ee4 jc/rev-parse-argh-dashed-multi-words later to maint).
* The mode to run tests with HTTP server tests disabled was broken.
(merge afa53fe na/no-http-test-in-the-middle later to maint).
----------------------------------------------------------------
Changes since v2.0.0, 643 non-merge changes from 80 contributors,
are as follows:
Abbaad Haider (1):
http-push.c: make CURLOPT_IOCTLDATA a usable pointer
Alexey Shumkin (5):
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
t4041, t4205, t6006, t7102: don't hardcode tested encoding value
t4205 (log-pretty-format): use `tformat` rather than `format`
t4205, t6006: add tests that fail with i18n.logOutputEncoding set
pretty.c: format string with truncate respects logOutputEncoding
Anders Kaseorg (1):
gitk: Allow displaying time zones from author and commit dates timestamps
Andi Kleen (4):
Use BASIC_FLAGS for profile feedback
Don't define away __attribute__ on gcc
Run the perf test suite for profile feedback too
Fix profile feedback with -jN and add profile-fast
Andreas Schwab (1):
grep: add grep.fullName config variable
Ben Walton (1):
compat/bswap.h: fix endianness detection
Brian Gesiak (14):
strbuf: use _rtrim and _ltrim in strbuf_trim
api-strbuf.txt: add docs for _trim and _ltrim
builtin/ls-remote.c: rearrange xcalloc arguments
builtin/remote.c: rearrange xcalloc arguments
commit.c: rearrange xcalloc arguments
config.c: rearrange xcalloc arguments
diff.c: rearrange xcalloc arguments
http-push.c: rearrange xcalloc arguments
imap-send.c: rearrange xcalloc arguments
notes.c: rearrange xcalloc arguments
pack-revindex.c: rearrange xcalloc arguments
reflog-walk.c: rearrange xcalloc arguments
remote.c: rearrange xcalloc arguments
transport-helper.c: rearrange xcalloc arguments
Cezary Zawadka (1):
Windows: allow using UNC path for git repository
Charles Bailey (3):
compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
filter-branch: eliminate duplicate mapped parents
Fix contrib/subtree Makefile to patch #! line
Christian Couder (16):
replace: make sure --edit results in a different object
replace: refactor checking ref validity
replace: die early if replace ref already exists
replace: add tests for --edit
replace: add --edit to usage string
Documentation: replace: describe new --edit option
commit: add for_each_mergetag()
replace: cleanup redirection style in tests
replace: add --graft option
replace: add test for --graft
Documentation: replace: add --graft option
contrib: add convert-grafts-to-replace-refs.sh
replace: remove signature when using --graft
replace: add test for --graft with signed commit
replace: check mergetags when using --graft
replace: add test for --graft with a mergetag
Dan Albert (1):
imap-send: use git-credential
David Aguilar (3):
gitk: Honor TMPDIR when viewing external diffs
gitk: Use mktemp -d to avoid predictable temporary directories
gitk: Catch mkdtemp errors
David Kastrup (2):
blame: large-scale performance rewrite
Bump core.deltaBaseCacheLimit to 96m
David Turner (7):
docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
merge-recursive.c: fix case-changing merge bug
mv: allow renaming to fix case on case insensitive filesystems
refs.c: optimize check_refname_component()
refs.c: SSE2 optimizations for check_refname_component
refs.c: handle REFNAME_REFSPEC_PATTERN at end of page
refs: fix valgrind suppression file
Elia Pinto (62):
t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
test-gitmw-lib.sh: use the $( ... ) construct for command substitution
t7900-subtree.sh: use the $( ... ) construct for command substitution
appp.sh: use the $( ... ) construct for command substitution
git-pull.sh: use the $( ... ) construct for command substitution
git-rebase--merge.sh: use the $( ... ) construct for command substitution
git-rebase.sh: use the $( ... ) construct for command substitution
git-stash.sh: use the $( ... ) construct for command substitution
git-web--browse.sh: use the $( ... ) construct for command substitution
lib-credential.sh: use the $( ... ) construct for command substitution
lib-cvs.sh: use the $( ... ) construct for command substitution
lib-gpg.sh: use the $( ... ) construct for command substitution
p5302-pack-index.sh: use the $( ... ) construct for command substitution
t0001-init.sh: use the $( ... ) construct for command substitution
t0010-racy-git.sh: use the $( ... ) construct for command substitution
t0020-crlf.sh: use the $( ... ) construct for command substitution
t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
t0026-eol-config.sh: use the $( ... ) construct for command substitution
t0030-stripspace.sh: use the $( ... ) construct for command substitution
t0300-credentials.sh: use the $( ... ) construct for command substitution
t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
t1020-subdirectory.sh: use the $( ... ) construct for command substitution
t1050-large.sh: use the $( ... ) construct for command substitution
t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
t4006-diff-mode.sh: use the $( ... ) construct for command substitution
t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
t4012-diff-binary.sh: use the $( ... ) construct for command substitution
t4013-diff-various.sh: use the $( ... ) construct for command substitution
t4014-format-patch.sh: use the $( ... ) construct for command substitution
t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
t4038-diff-combined.sh: use the $( ... ) construct for command substitution
t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
t4119-apply-config.sh: use the $( ... ) construct for command substitution
t4204-patch-id.sh: use the $( ... ) construct for command substitution
t5000-tar-tree.sh: use the $( ... ) construct for command substitution
scripts: "export VAR=VALUE" construct is not portable
check_bindir: avoid "test <cond> -a/-o <cond>"
contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
git-bisect.sh: avoid "test <cond> -a/-o <cond>"
git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
git-submodule.sh: avoid "test <cond> -a/-o <cond>"
submodule.c: use the ARRAY_SIZE macro
Ephrim Khong (1):
sha1_file: do not add own object directory as alternate
Eric Wong (1):
config: preserve config file permissions on edits
Erik Faye-Lund (1):
send-email: recognize absolute path on Windows
Fabian Ruch (1):
sequencer: signal failed ff as an aborted, not a conflicted merge
Felipe Contreras (13):
fast-export: improve argument parsing
fast-export: add new --refspec option
transport-helper: add support for old:new refspec
transport-helper: add support to push symbolic refs
fast-import: add support to delete refs
fast-export: add support to delete refs
transport-helper: add support to delete branches
transport-helper: remove unnecessary strbuf resets
mergetools: add vimdiff3 mode
mergetool: run prompt only if guessed tool
merge: enable defaulttoupstream by default
rerere: fix for merge.conflictstyle
silence a bunch of format-zero-length warnings
Ilya Bobyr (4):
test-lib: document short options in t/README
test-lib: tests skipped by GIT_SKIP_TESTS say so
test-lib: '--run' to run only specific tests
gitk: Replace SHA1 entry field on keyboard paste
Jacek Konieczny (1):
pull: do not abuse 'break' inside a shell 'case'
Jacob Keller (2):
tag: fix --sort tests to use cat<<-\EOF format
tag: support configuring --sort via .gitconfig
James Denholm (6):
contrib/subtree/Makefile: scrap unused $(gitdir)
contrib/subtree/Makefile: use GIT-VERSION-FILE
contrib/subtree/Makefile: s/libexecdir/gitexecdir/
contrib/subtree/Makefile: clean up rules to generate documentation
contrib/subtree/Makefile: clean up rule for "clean"
contrib/subtree: allow adding an annotated tag
Jason St. John (1):
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
Jean-Jacques Lafay (1):
git tag --contains: avoid stack overflow
Jeff King (131):
run_external_diff: use an argv_array for the environment
run_external_diff: clean up error handling
run_external_diff: drop fflush(NULL)
run_external_diff: hoist common bits out of conditional
run_external_diff: refactor cmdline setup logic
commit: do not complain of empty messages from -C
t3910: show failure of core.precomposeunicode with decomposed filenames
replace: refactor command-mode determination
replace: use OPT_CMDMODE to handle modes
replace: factor object resolution out of replace_object
replace: add --edit option
commit: use split_ident_line to compare author/committer
pretty: make show_ident_date public
commit: print "Date" line when the user has set date
commit: accept more date formats for "--date"
inline constant return from error() function
let clang use the constant-return error() macro
grep: use run-command's "dir" option for --open-files-in-pager
t/lib-httpd: require SANITY prereq
index-pack: distinguish missing objects from type errors
run_diff_files: do not look at uninitialized stat data
run-command: store an optional argv_array
run_column_filter: use argv_array
git_connect: use argv_array
get_helper: use run-command's internal argv_array
get_exporter: use argv_array
get_importer: use run-command's internal argv_array
argv-array: drop "detach" code
open_sha1_file: report "most interesting" errno
move "--follow needs one pathspec" rule to diff_setup_done
format-patch: make newline after signature conditional
daemon/config: factor out duplicate xstrdup_tolower
test-lib: preserve GIT_CURL_VERBOSE from the environment
t/lib-httpd: use write_script to copy CGI scripts
t5550: test display of remote http error messages
strbuf: add strbuf_tolower function
http: extract type/subtype portion of content-type
http: optionally extract charset parameter from content-type
strbuf: add strbuf_reencode helper
remote-curl: reencode http error messages
http: default text charset to iso-8859-1
t5537: re-drop http tests
error_resolve_conflict: rewrap advice message
error_resolve_conflict: drop quotations around operation
update-index: fix segfault with missing --cacheinfo argument
repack: do not accidentally pack kept objects by default
repack: respect pack.writebitmaps
repack: s/write_bitmap/&s/ in code
pack-objects: stop respecting pack.writebitmaps
repack: simplify handling of --write-bitmap-index
repack: introduce repack.writeBitmaps config option
commit_tree: take a pointer/len pair rather than a const strbuf
replace dangerous uses of strbuf_attach
alloc: include any-object allocations in alloc_report
commit: push commit_index update into alloc_commit_node
do not create "struct commit" with xcalloc
logmsg_reencode: return const buffer
sequencer: use logmsg_reencode in get_message
t7700: drop explicit --no-pack-kept-objects from .keep test
provide a helper to free commit buffer
provide a helper to set the commit buffer
provide helpers to access the commit buffer
use get_cached_commit_buffer where appropriate
use get_commit_buffer to avoid duplicate code
convert logmsg_reencode to get_commit_buffer
use get_commit_buffer everywhere
commit-slab: provide a static initializer
commit: convert commit->buffer to a slab
commit: record buffer length in cache
reuse cached commit buffer when parsing signatures
t7510: stop referring to master in later tests
t7510: test a commit signed by an unknown key
t7510: check %G* pretty-format output
pretty: avoid reading past end-of-string with "%G"
parse_diff_color_slot: drop ofs parameter
daemon: mark some strings as const
avoid using skip_prefix as a boolean
strbuf: add xstrfmt helper
use xstrfmt in favor of manual size calculations
use xstrdup instead of xmalloc + strcpy
use xstrfmt to replace xmalloc + sprintf
use xstrfmt to replace xmalloc + strcpy/strcat
setup_git_env: use git_pathdup instead of xmalloc + sprintf
sequencer: use argv_array_pushf
merge: use argv_array when spawning merge strategy
walker_fetch: fix minor memory leak
unique_path: fix unlikely heap overflow
refactor skip_prefix to return a boolean
apply: use skip_prefix instead of raw addition
fast-import: fix read of uninitialized argv memory
transport-helper: avoid reading past end-of-string
use skip_prefix to avoid magic numbers
use skip_prefix to avoid repeating strings
fast-import: use skip_prefix for parsing input
daemon: use skip_prefix to avoid magic numbers
stat_opt: check extra strlen call
fast-import: refactor parsing of spaces
fetch-pack: refactor parsing in get_ack
git: avoid magic number with skip_prefix
use skip_prefix to avoid repeated calculations
http-push: refactor parsing of remote object names
setup_git_env(): introduce git_path_from_env() helper
move "%G" format test from t7510 to t6006
replace: replace spaces with tabs in indentation
avoid double close of descriptors handed to run_command
replace: use argv_array in export_object
replace: add a --raw mode for --edit
add strip_suffix function
implement ends_with via strip_suffix
replace has_extension with ends_with
use strip_suffix instead of ends_with in simple cases
index-pack: use strip_suffix to avoid magic numbers
strbuf: implement strbuf_strip_suffix
verify-pack: use strbuf_strip_suffix
prepare_packed_git_one: refactor duplicate-pack check
t7300: repair filesystem permissions with test_when_finished
remote-curl: do not complain on EOF from parent git
remote-curl: use error instead of fprintf(stderr)
remote-curl: mark helper-protocol errors more clearly
tag: use skip_prefix instead of magic numbers
alloc: write out allocator definitions
move setting of object->type to alloc_* functions
parse_object_buffer: do not set object type
add object_as_type helper for casting objects
alloc: factor out commit index
object_as_type: set commit index
diff-tree: avoid lookup_unknown_object
prio-queue: factor out compare and swap operations
prio-queue: make output stable with respect to insertion
paint_down_to_common: use prio_queue
t5539: update a flaky test
Jens Lehmann (21):
status/commit: show staged submodules regardless of ignore config
commit -m: commit staged submodules regardless of ignore config
git-gui: show staged submodules regardless of ignore config
git-gui: tolerate major version changes when comparing the git version
gitk: Show staged submodules regardless of ignore config
test-lib: add test_dir_is_empty()
t/Makefile: check helper scripts for non-portable shell commands too
t/Makefile: always test all lint targets when running tests
submodules: add the lib-submodule-update.sh test library
checkout: call the new submodule update test framework
apply: add t4137 for submodule updates
read-tree: add t1013 for submodule updates
reset: add t7112 for submodule updates
bisect: add t6041 for submodule updates
merge: add t7613 for submodule updates
rebase: add t3426 for submodule updates
pull: add t5572 for submodule updates
cherry-pick: add t3512 for submodule updates
am: add t4255 for submodule updates
stash: add t3906 for submodule updates
revert: add t3513 for submodule updates
Jens Lindström (3):
remote rm: delete remote configuration as the last
remote: repack packed-refs once when deleting multiple refs
remote prune: optimize "dangling symref" check/warning
Jeremiah Mahler (7):
format-patch: add "--signature-file=<file>" option
t9138-git-svn-authors-prog.sh fixups
Documentation: wording fixes in the user manual and glossary
t/t7810-grep.sh: remove duplicate test_config()
api-strbuf.txt minor typos
name-hash.c: replace cache_name_compare() with memcmp(3)
cleanup duplicate name_compare() functions
Jiang Xin (2):
blame: fix broken time_buf paddings in relative timestamp
blame: dynamic blame_date_width for different locales
Johannes Schindelin (2):
git grep -O -i: if the pager is 'less', pass the '-I' option
Win32: let mingw_execve() return an int
Johannes Sixt (1):
fix brown paper bag breakage in t5150-request-pull.sh
John Keeping (4):
completion: add a note that merge options are shared
completion: add missing options for git-merge
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
rebase: omit patch-identical commits with --fork-point
Jonathan McCrohan (1):
git-instaweb: add support for Apache 2.4
Jonathan Nieder (4):
contrib: remove vim support instructions
contrib: remove git-diffall
test-lint: find unportable sed, echo, test, and export usage after &&
test doc: test_write_lines does not split its arguments
Junio C Hamano (49):
apply --ignore-space-change: lines with and without leading whitespaces do not match
send-email: windows drive prefix (e.g. C:) appears only at the beginning
mergetool: document the default for --[no-]prompt
compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
CodingGuidelines: once it is in, it is not worth the code churn
CodingGuidelines: give an example for case/esac statement
CodingGuidelines: give an example for redirection
CodingGuidelines: give an example for control statements
CodingGuidelines: give an example for shell function preamble
CodingGuidelines: do not call the conditional statement "if()"
CodingGuidelines: on comparison
CodingGuidelines: on splitting a long line
CodingGuidelines: avoid "test <cond> -a/-o <cond>"
scripts: more "export VAR=VALUE" fixes
Git 1.9.4
fetch doc: update introductory part for clarity
fetch doc: update note on '+' in front of the refspec
fetch doc: remove notes on outdated "mixed layout"
First batch for 2.1
shortlog: allow --exclude=<glob> to be passed
fetch doc: on pulling multiple refspecs
fetch doc: update refspec format description
fetch doc: remove "short-cut" section
fetch doc: add a section on configured remote-tracking branches
fetch: allow explicit --refmap to override configuration
Second batch for 2.1
Update draft release notes to 2.1
test: turn EXPENSIVE into a lazy prerequisite
test: turn USR_BIN_TIME into a lazy prerequisite
t3302: coding style updates
t3302: do not chdir around in the primary test process
t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
revision: parse "git log -<count>" more carefully
t0008: do not depend on 'echo' handling backslashes specially
Third batch for 2.1
git-submodule.sh: avoid "echo" path-like values
Fourth batch for 2.1
builtin/clone.c: detect a clone starting at a tag correctly
Git 2.0.1
Fifth batch for 2.1
Sixth batch for 2.1
Start preparing for 2.0.2
Seventh batch for 2.1
Git 2.0.2
Eighth batch for 2.1
Ninth batch for 2.1
Git 2.0.3
Git 2.1.0-rc0
Jörn Engel (1):
pager: do allow spawning pager recursively
Karsten Blees (46):
MSVC: link dynamically to the CRT
Win32 dirent: remove unused dirent.d_ino member
Win32 dirent: remove unused dirent.d_reclen member
Win32 dirent: change FILENAME_MAX to MAX_PATH
Win32 dirent: clarify #include directives
Win32 dirent: improve dirent implementation
Win32: move main macro to a function
Win32: support Unicode console output
Win32: detect console streams more reliably
Win32: warn if the console font doesn't support Unicode
Win32: add Unicode conversion functions
Win32: Thread-safe windows console output
Win32: fix broken pipe detection
Win32: reliably detect console pipe handles
Win32: simplify internal mingw_spawn* APIs
Win32: fix potential multi-threading issue
MinGW: disable CRT command line globbing
Win32: Unicode arguments (outgoing)
Win32: Unicode arguments (incoming)
trace: move trace declarations from cache.h to new trace.h
trace: consistently name the format parameter
trace: remove redundant printf format attribute
symlinks: remove PATH_MAX limitation
hashmap: factor out getting a hash code from a SHA1
hashmap: improve struct hashmap member documentation
hashmap: add simplified hashmap_get_from_hash() API
hashmap: add string interning API
cache.h: rename cache_def_free to cache_def_clear
trace: improve trace performance
Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables
sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API
trace: add infrastructure to augment trace output with additional info
trace: disable additional trace output for unit tests
trace: add current timestamp to all trace output
trace: move code around, in preparation to file:line output
trace: add 'file:line' to all trace output
trace: add high resolution timer function to debug performance issues
trace: add trace_performance facility to debug performance issues
git: add performance tracing for git's main() function to debug scripts
wt-status: simplify performance measurement by using getnanotime()
progress: simplify performance measurement by using getnanotime()
api-trace.txt: add trace API documentation
Win32: Unicode file name support (except dirent)
Win32: Unicode file name support (dirent)
MinGW: fix compile error due to missing ELOOP
config: use chmod() instead of fchmod()
Kirill Smelkov (20):
combine-diff: move show_log_first logic/action out of paths scanning
combine-diff: move changed-paths scanning logic into its own function
tree-diff: no need to manually verify that there is no mode change for a path
tree-diff: no need to pass match to skip_uninteresting()
tree-diff: show_tree() is not needed
tree-diff: consolidate code for emitting diffs and recursion in one place
tree-diff: don't assume compare_tree_entry() returns -1,0,1
tree-diff: move all action-taking code out of compare_tree_entry()
tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
tree-diff: show_path prototype is not needed anymore
tree-diff: simplify tree_entry_pathcmp
tree-diff: remove special-case diff-emitting code for empty-tree cases
tree-diff: diff_tree() should now be static
tree-diff: rework diff_tree interface to be sha1 based
tree-diff: no need to call "full" diff_tree_sha1 from show_path()
tree-diff: reuse base str(buf) memory on sub-tree recursion
Portable alloca for Git
tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
combine-diff: speed it up, by using multiparent diff tree-walker directly
mingw: activate alloca
Linus Torvalds (1):
git log: support "auto" decorations
Luis R. Rodriguez (1):
git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
Marc Branchaud (2):
fetch doc: move FETCH_HEAD material lower and add an example
docs: Explain the purpose of fetch's and pull's <refspec> parameter.
Matthew Chen (1):
submodule: document "sync --recursive"
Matthieu Moy (4):
git-remote-mediawiki: allow stop/start-ing the test server
git-remote-mediawiki: fix encoding issue for UTF-8 media files
pager: remove 'S' from $LESS by default
rebase -i: test "Nothing to do" case with autostash
Max Kirillov (5):
git-show: fix 'git show -s' to not add extra terminator after merge commit
gitk: Switch to patch mode when searching for line origin
gitk: Add visiblerefs option, which lists always-shown branches
t6023-merge-file.sh: fix and mark as broken invalid tests
git-merge-file: do not add LF at EOF while applying unrelated change
Maxime Coste (2):
git-p4: Do not include diff in spec file when just preparing p4
git-p4: fix submit in non --prepare-p4-only mode
Michael Barabanov (1):
use local cloning if insteadOf makes a local URL
Michael Haggerty (27):
t1400: fix name and expected result of one test
t1400: provide more usual input to the command
parse_arg(): really test that argument is properly terminated
t1400: add some more tests involving quoted arguments
refs.h: rename the action_on_err constants
update_refs(): fix constness
update-ref --stdin: read the whole input at once
parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
update-ref.c: extract a new function, parse_refname()
update-ref --stdin: improve error messages for invalid values
update-ref --stdin: make error messages more consistent
update-ref --stdin: simplify error messages for missing oldvalues
t1400: test that stdin -z update treats empty <newvalue> as zeros
update-ref.c: extract a new function, parse_next_sha1()
update-ref --stdin -z: deprecate interpreting the empty string as zeros
t1400: test one mistake at a time
update-ref --stdin: improve the error message for unexpected EOF
update-ref --stdin: harmonize error messages
refs: add a concept of a reference transaction
update-ref --stdin: reimplement using reference transactions
refs: remove API function update_refs()
struct ref_update: rename field "ref_name" to "refname"
struct ref_update: store refname as a FLEX_ARRAY
ref_transaction_commit(): simplify code using temporary variables
struct ref_update: add a lock field
struct ref_update: add a type field
ref_transaction_commit(): work with transaction->updates in place
Michael J Gruber (7):
t7510: use consistent &&-chains in loop
gpg-interface: provide clear helper for struct signature_check
gpg-interface: provide access to the payload
verify-commit: scriptable commit signature verification
t7510: exit for loop with test result
t7510: test verify-commit
log: correctly identify mergetag signature verification status
Michael Naumov (1):
sideband.c: do not use ANSI control sequence on non-terminal
Michael S. Tsirkin (6):
git-send-email: two new options: to-cover, cc-cover
test/send-email: to-cover, cc-cover tests
rebase --keep-empty -i: add test
test: add test_write_lines helper
patch-id: make it stable against hunk reordering
patch-id-test: test stable and unstable behaviour
Nguyễn Thái Ngọc Duy (40):
index-pack: work around thread-unsafe pread()
ewah: fix constness of ewah_read_mmap
ewah: delete unused ewah_read_mmap_native declaration
sequencer: do not update/refresh index if the lock cannot be held
config: be strict on core.commentChar
commit: allow core.commentChar=auto for character auto selection
gc --auto: do not lock refs in the background
git potty: restore environments after alias expansion
read-cache: new API write_locked_index instead of write_index/write_cache
read-cache: relocate and unexport commit_locked_index()
read-cache: store in-memory flags in the first 12 bits of ce_flags
read-cache: be strict about "changed" in remove_marked_cache_entries()
read-cache: be specific what part of the index has changed
update-index: be specific what part of the index has changed
resolve-undo: be specific what part of the index has changed
unpack-trees: be specific what part of the index has changed
cache-tree: mark istate->cache_changed on cache tree invalidation
cache-tree: mark istate->cache_changed on cache tree update
cache-tree: mark istate->cache_changed on prime_cache_tree()
entry.c: update cache_changed if refresh_cache is set in checkout_entry()
read-cache: save index SHA-1 after reading
read-cache: split-index mode
read-cache: mark new entries for split index
read-cache: save deleted entries in split index
read-cache: mark updated entries for split index
split-index: the writing part
split-index: the reading part
split-index: do not invalidate cache-tree at read time
split-index: strip pathname of on-disk replaced entries
update-index: new options to enable/disable split index mode
update-index --split-index: do not split if $GIT_DIR is read only
rev-parse: add --shared-index-path to get shared index path
read-tree: force split-index mode off on --index-output
read-tree: note about dropping split-index mode or index version
read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
t2104: make sure split index mode is off for the version test
t1700: new tests for split-index mode
dir.c: coding style fix
dir.h: move struct exclude declaration to top level
prep_exclude: remove the artificial PATH_MAX limit
Nick Alcock (1):
t5538: move http push tests out to t5542
Pasha Bolokhov (1):
dir.c:trim_trailing_spaces(): fix for " \ " sequence
Pat Thoyts (2):
wincred: add install target
wincred: avoid overwriting configured variables
Philip Oakley (1):
doc: give some guidelines for error messages
Ramkumar Ramachandra (1):
rebase -i: handle "Nothing to do" case with autostash
Ramsay Allan Jones (2):
t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
alloc.c: remove the alloc_raw_commit_node() function
René Scharfe (28):
mailinfo: use strcmp() for string comparison
pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
Use starts_with() for C strings instead of memcmp()
blame: factor out get_next_line()
blame: simplify prepare_lines()
wt-status: use argv_array for environment
wt-status: simplify building of summary limit argument
sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()
sha1_file: avoid overrunning alternate object base string
t5000, t5003: simplify commit
diff-tree: call free_commit_list() instead of duplicating its code
line-log: use commit_list_append() instead of duplicating its code
use strbuf_addbuf for adding strbufs
use strbuf_addch for adding single characters
merge: simplify merge_trivial() by using commit_list_append()
commit: use commit_list_append() instead of duplicating its code
fsck: simplify fsck_commit_buffer() by using commit_list_count()
annotate: use argv_array
strbuf: use strbuf_addstr() for adding C strings
use commit_list_count() to count the members of commit_lists
run-command: use internal argv_array of struct child_process in run_hook_ve()
transport: simplify fetch_objs_via_rsync() using argv_array
fast-import: use hashcmp() for SHA1 hash comparison
bundle: use internal argv_array of struct child_process in create_bundle()
remote-testsvn: use internal argv_array of struct child_process in cmd_import()
unix-socket: remove stale socket before calling chdir()
use xcalloc() to allocate zero-initialized memory
use xmemdupz() to allocate copies of strings given by start and length
RomanBelinsky (1):
SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
Ronnie Sahlberg (27):
sequencer.c: check for lock failure and bail early in fast_forward_to
commit.c: check for lock error and return early
refs.c: add new functions reflog_exists and delete_reflog
checkout.c: use ref_exists instead of file_exist
refs.c: change read_ref_at to use the reflog iterators
enums: remove trailing ',' after last item in enum
enums: remove trailing ',' after last item in enum
refs.c: remove ref_transaction_rollback
refs.c: ref_transaction_commit should not free the transaction
refs.c: constify the sha arguments for ref_transaction_create|delete|update
refs.c: allow passing NULL to ref_transaction_free
refs.c: add a strbuf argument to ref_transaction_commit for error logging
lockfile.c: add a new public function unable_to_lock_message
lockfile.c: make lock_file return a meaningful errno on failurei
refs.c: add an err argument to repack_without_refs
refs.c: make sure log_ref_setup returns a meaningful errno
refs.c: verify_lock should set errno to something meaningful
refs.c: make remove_empty_directories always set errno to something sane
refs.c: commit_packed_refs to return a meaningful errno on failure
refs.c: make resolve_ref_unsafe set errno to something meaningful on error
refs.c: log_ref_write should try to return meaningful errno
refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
refs.c: make update_ref_write update a strbuf on failure
update-ref: use err argument to get error from ref_transaction_commit
refs.c: remove the onerr argument to ref_transaction_commit
refs.c: change ref_transaction_update() to do error checking and return status
refs.c: add a public is_branch function
Stefan Beller (3):
.mailmap: map different names with the same email address together
git.1: switch homepage for stats
.mailmap: combine Stefan Beller's emails
Steffen Prohaska (1):
completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
Stepan Kasal (3):
Revert "submodules: fix ambiguous absolute paths under Windows"
t5000, t5003: do not use test_cmp to compare binary files
mingw: avoid const warning
Stephen P. Smith (1):
How to keep a project's canonical history correct.
Steve Hoelzer (1):
environment.c: enable core.preloadindex by default
Tanay Abhra (4):
string-list: spell all values out that are given to a string_list initializer
imap-send: use skip_prefix instead of using magic numbers
string-list: add string_list initializer helper function
replace memset with string-list initializers
Theodore Leblond (1):
compat/poll: sleep 1 millisecond to avoid busy wait
Thorsten Glaser (1):
builtin/tag.c: show tag name to hint in the message editor
Torsten Bögershausen (7):
utf8.c: use a table for double_width
utf8: make it easier to auto-update git_wcwidth()
t5551: fix the 50,000 tag test
t9001: avoid non-portable '\n' with sed
Update of unicode_width.h to Unicode Version 7.0
t0025: rename the test files
t0027: combinations of core.autocrlf, core.eol and text
Trần Ngọc Quân (1):
l10n: Init Vietnamese translation
W. Trevor King (1):
Documentation: mention config sources for @{upstream}
William Giokas (1):
svn-fe: conform to pep8
Yi EungJun (2):
http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
http: fix charset detection of extract_content_type()
Yiannis Marangos (2):
wrapper.c: add xpread() similar to xread()
read-cache.c: verify index file before we opportunistically update it
Zoltan Klinger (1):
log: fix indentation for --graph --show-signature
brian m. carlson (3):
blame: correctly handle files regardless of autocrlf
rebase--merge: fix --skip with two conflicts in a row
Documentation: fix missing text for rev-parse --verify
Øystein Walle (1):
config: respect '~' and '~user' in mailmap.file
Øyvind A. Holm (1):
.gitignore: "git-verify-commit" is a generated file
^ permalink raw reply [relevance 3%]
* [ANNOUNCE] Git v2.0.2
@ 2014-07-16 22:02 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-07-16 22:02 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest maintenance release Git v2.0.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.0.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
Git v2.0.2 Release Notes
========================
* Documentation for "git submodule sync" forgot to say that the subcommand
can take the "--recursive" option.
* Mishandling of patterns in .gitignore that has trailing SPs quoted
with backslashes (e.g. ones that end with "\ ") have been
corrected.
* Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
* "git clone -b brefs/tags/bar" would have mistakenly thought we were
following a single tag, even though it was a name of the branch,
because it incorrectly used strstr().
* "%G" (nothing after G) is an invalid pretty format specifier, but
the parser did not notice it as garbage.
* Code to avoid adding the same alternate object store twice was
subtly broken for a long time, but nobody seems to have noticed.
* A handful of code paths had to read the commit object more than
once when showing header fields that are usually not parsed. The
internal data structure to keep track of the contents of the commit
object has been updated to reduce the need for this double-reading,
and to allow the caller find the length of the object.
* During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.
----------------------------------------------------------------
Changes since v2.0.1 are as follows:
Jeff King (27):
repack: do not accidentally pack kept objects by default
repack: respect pack.writebitmaps
repack: s/write_bitmap/&s/ in code
commit_tree: take a pointer/len pair rather than a const strbuf
replace dangerous uses of strbuf_attach
alloc: include any-object allocations in alloc_report
commit: push commit_index update into alloc_commit_node
do not create "struct commit" with xcalloc
logmsg_reencode: return const buffer
sequencer: use logmsg_reencode in get_message
provide a helper to free commit buffer
provide a helper to set the commit buffer
provide helpers to access the commit buffer
use get_cached_commit_buffer where appropriate
use get_commit_buffer to avoid duplicate code
convert logmsg_reencode to get_commit_buffer
use get_commit_buffer everywhere
commit-slab: provide a static initializer
commit: convert commit->buffer to a slab
commit: record buffer length in cache
reuse cached commit buffer when parsing signatures
t7510: stop referring to master in later tests
t7510: test a commit signed by an unknown key
t7510: check %G* pretty-format output
pretty: avoid reading past end-of-string with "%G"
move "%G" format test from t7510 to t6006
t7300: repair filesystem permissions with test_when_finished
Junio C Hamano (4):
t0008: do not depend on 'echo' handling backslashes specially
builtin/clone.c: detect a clone starting at a tag correctly
Start preparing for 2.0.2
Git 2.0.2
Matthew Chen (1):
submodule: document "sync --recursive"
Michael J Gruber (1):
t7510: use consistent &&-chains in loop
Pasha Bolokhov (1):
dir.c:trim_trailing_spaces(): fix for " \ " sequence
René Scharfe (2):
sha1_file: avoid overrunning alternate object base string
annotate: use argv_array
Ronnie Sahlberg (1):
enums: remove trailing ',' after last item in enum
brian m. carlson (1):
rebase--merge: fix --skip with two conflicts in a row
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jul 2014, #01; Tue, 8)
@ 2014-07-08 21:47 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-07-08 21:47 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 01f81f5)
+ rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
* dt/refs-check-refname-component-sse (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at d286027)
+ refs.c: SSE2 optimizations for check_refname_component
Further micro-optimization of a leaf-function.
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
* ye/http-extract-charset (2014-06-17) 1 commit
(merged to 'next' on 2014-06-20 at 9492bae)
+ http: fix charset detection of extract_content_type()
--------------------------------------------------
[New Topics]
* cc/replace-edit (2014-06-25) 3 commits
- replace: use argv_array in export_object
- avoid double close of descriptors handed to run_command
- replace: replace spaces with tabs in indentation
(this branch is used by jk/replace-edit-raw.)
Will merge to 'next'.
* ep/submodule-code-cleanup (2014-06-30) 1 commit
- submodule.c: use the ARRAY_SIZE macro
Will merge to 'next'.
* jk/replace-edit-raw (2014-06-25) 1 commit
- replace: add a --raw mode for --edit
(this branch uses cc/replace-edit.)
Will merge to 'next'.
* jk/strip-suffix (2014-06-30) 9 commits
- prepare_packed_git_one: refactor duplicate-pack check
- verify-pack: use strbuf_strip_suffix
- strbuf: implement strbuf_strip_suffix
- index-pack: use strip_suffix to avoid magic numbers
- use strip_suffix instead of ends_with in simple cases
- replace has_extension with ends_with
- implement ends_with via strip_suffix
- add strip_suffix function
- sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()
Will merge to 'next'.
* jk/tag-contains (2014-06-30) 8 commits
- perf: add tests for tag --contains
- tag: use commit_contains
- commit: provide a fast multi-tip contains function
- string-list: add pos to iterator callback
- add functions for memory-efficient bitmaps
- paint_down_to_common: use prio_queue
- tag: factor out decision to stream tags
- tag: allow --sort with -n
Expecting a reroll.
* mg/fix-log-mergetag-color (2014-06-30) 1 commit
- log: correctly identify mergetag signature verification status
Will merge to 'next'.
* mk/merge-incomplete-files (2014-06-30) 2 commits
- git-merge-file: do not add LF at EOF while applying unrelated change
- t6023-merge-file.sh: fix and mark as broken invalid tests
Will merge to 'next'.
* rs/status-code-clean-up (2014-06-29) 2 commits
(merged to 'next' on 2014-07-08 at db67965)
+ wt-status: simplify building of summary limit argument
+ wt-status: use argv_array for environment
Will merge to 'master'.
* tb/crlf-tests (2014-07-08) 2 commits
(merged to 'next' on 2014-07-08 at 40764b7)
+ t0027: combinations of core.autocrlf, core.eol and text
+ t0025: rename the test files
Will merge to 'master'.
* ak/profile-feedback-build (2014-07-08) 4 commits
- Fix profile feedback with -jN and add profile-fast
- Run the perf test suite for profile feedback too
- Don't define away __attribute__ on gcc
- Use BASIC_FLAGS for profile feedback
Will merge to 'next'.
* cb/filter-branch-prune-empty-degenerate-merges (2014-07-01) 1 commit
- filter-branch: eliminate duplicate mapped parents
Will merge to 'next'.
* cc/for-each-mergetag (2014-07-07) 1 commit
- commit: add for_each_mergetag()
(this branch is used by cc/replace-graft.)
Will merge to 'next'.
* dt/cache-tree-repair (2014-07-08) 4 commits
- cache-tree: write updated cache-tree after commit
- cache-tree: subdirectory tests
- test-dump-cache-tree: invalid trees are not errors
- cache-tree: create/update cache-tree on checkout
Reviews seen; waiting for a response.
* jl/test-lint-scripts (2014-07-07) 3 commits
- DONTMERGE: missing sign-off
- t/Makefile: always test all lint targets when running tests
- t/Makefile: check helper scripts for non-portable shell commands too
* kb/hashmap-updates (2014-07-07) 4 commits
- hashmap: add string interning API
- hashmap: add simplified hashmap_get_from_hash() API
- hashmap: improve struct hashmap member documentation
- hashmap: factor out getting a hash code from a SHA1
Reviews sent; waiting for a response.
* kb/path-max-must-go (2014-07-07) 2 commits
(merged to 'next' on 2014-07-08 at 4d41c18)
+ dir: remove PATH_MAX limitation
+ symlinks: remove PATH_MAX limitation
Will merge to 'master'.
* rs/fix-alt-odb-path-comparison (2014-07-01) 1 commit
(merged to 'next' on 2014-07-08 at f9c69e5)
+ sha1_file: avoid overrunning alternate object base string
Will merge to 'master'.
* rs/simplify-archive-tests (2014-07-07) 1 commit
(merged to 'next' on 2014-07-08 at c46cfac)
+ t5000, t5003: simplify commit
Will merge to 'master'.
* zk/log-graph-showsig (2014-07-08) 1 commit
- log: fix indentation for --graph --show-signature
The "--show-signature" option did not pay much attention to
"--graph".
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
. count-objects: report unused files in $GIT_DIR/repos/...
. gc: support prune --repos
. gc: style change -- no SP before closing bracket
. prune: strategies for linked checkouts
. checkout: detach if the branch is already checked out elsewhere
. checkout: clean up half-prepared directories in --to mode
. checkout: support checking out into a new working directory
. use new wrapper write_file() for simple file writing
. wrapper.c: wrapper to open a file, fprintf then close
. setup.c: support multi-checkout repo setup
. setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
. setup.c: convert check_repository_format_gently to use strbuf
. setup.c: detect $GIT_COMMON_DIR in is_git_directory()
. setup.c: convert is_git_directory() to use strbuf
. git-stash: avoid hardcoding $GIT_DIR/logs/....
. *.sh: avoid hardcoding $GIT_DIR/hooks/...
. git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
. $GIT_COMMON_DIR: a new environment variable
. commit: use SEQ_DIR instead of hardcoding "sequencer"
. fast-import: use git_path() for accessing .git dir instead of get_git_dir()
. reflog: avoid constructing .lock path with git_path
. *.sh: respect $GIT_INDEX_FILE
. git_path(): be aware of file relocation in $GIT_DIR
. path.c: group git_path(), git_pathdup() and strbuf_git_path() together
. path.c: rename vsnpath() to do_git_path()
. git_snpath(): retire and replace with strbuf_git_path()
. path.c: make get_pathname() call sites return const char *
. path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
--------------------------------------------------
[Cooking]
* cc/replace-graft (2014-07-07) 9 commits
- replace: add test for --graft with a mergetag
- replace: check mergetags when using --graft
- replace: add test for --graft with signed commit
- replace: remove signature when using --graft
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
- replace: cleanup redirection style in tests
(this branch uses cc/for-each-mergetag.)
"git replace" learned a "--graft" option to rewrite parents of a
commit.
* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit
(merged to 'next' on 2014-07-02 at cc0c4b1)
+ builtin/clone.c: detect a clone starting at a tag correctly
Will merge to 'master'.
* mg/verify-commit (2014-06-23) 5 commits
(merged to 'next' on 2014-07-02 at 6d77bcf)
+ t7510: test verify-commit
+ t7510: exit for loop with test result
+ verify-commit: scriptable commit signature verification
+ gpg-interface: provide access to the payload
+ gpg-interface: provide clear helper for struct signature_check
Add 'verify-commit' to be used in a way similar to 'verify-tag' is
used. Further work on verifying the mergetags might be needed.
Will merge to 'master'.
* dt/refs-check-refname-component-sse-fix (2014-07-08) 2 commits
(merged to 'next' on 2014-07-08 at 35b839c)
+ refs: fix valgrind suppression file
+ refs.c: handle REFNAME_REFSPEC_PATTERN at end of page
Fixes to a topic that is already in 'master'.
Will merge to 'master'.
* jk/skip-prefix (2014-06-20) 18 commits
(merged to 'next' on 2014-06-23 at cd387a6)
+ http-push: refactor parsing of remote object names
+ imap-send: use skip_prefix instead of using magic numbers
+ use skip_prefix to avoid repeated calculations
+ git: avoid magic number with skip_prefix
+ fetch-pack: refactor parsing in get_ack
+ fast-import: refactor parsing of spaces
+ stat_opt: check extra strlen call
+ daemon: use skip_prefix to avoid magic numbers
+ fast-import: use skip_prefix for parsing input
+ use skip_prefix to avoid repeating strings
+ use skip_prefix to avoid magic numbers
+ transport-helper: avoid reading past end-of-string
+ fast-import: fix read of uninitialized argv memory
+ apply: use skip_prefix instead of raw addition
+ refactor skip_prefix to return a boolean
+ avoid using skip_prefix as a boolean
+ daemon: mark some strings as const
+ parse_diff_color_slot: drop ofs parameter
Will merge to 'master'.
* jk/xstrfmt (2014-06-25) 11 commits
(merged to 'next' on 2014-06-25 at 5031d4e)
+ setup_git_env(): introduce git_path_from_env() helper
(merged to 'next' on 2014-06-23 at 64f2558)
+ unique_path: fix unlikely heap overflow
+ walker_fetch: fix minor memory leak
+ merge: use argv_array when spawning merge strategy
+ sequencer: use argv_array_pushf
+ setup_git_env: use git_pathdup instead of xmalloc + sprintf
+ use xstrfmt to replace xmalloc + strcpy/strcat
+ use xstrfmt to replace xmalloc + sprintf
+ use xstrdup instead of xmalloc + strcpy
+ use xstrfmt in favor of manual size calculations
+ strbuf: add xstrfmt helper
Will merge to 'master'.
* kb/perf-trace (2014-07-07) 17 commits
- progress: simplify performance measurement by using getnanotime()
- wt-status: simplify performance measurement by using getnanotime()
- git: add performance tracing for git's main() function to debug scripts
- trace: add trace_performance facility to debug performance issues
- trace: add high resolution timer function to debug performance issues
- trace: add 'file:line' to all trace output
- trace: move code around, in preparation to file:line output
- trace: add current timestamp to all trace output
- trace: disable additional trace output for unit tests
- trace: add infrastructure to augment trace output with additional info
- sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API
- Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables
- trace.h: suppress some sparse warnings and errors
- trace: improve trace performance
- trace: remove redundant printf format attribute
- trace: consistently name the format parameter
- trace: move trace declarations from cache.h to new trace.h
Will merge to 'next'.
* hv/submodule-config (2014-06-30) 4 commits
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
* jl/submodule-tests (2014-07-07) 14 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- submodules: add the lib-submodule-update.sh test library
- test-lib: add test_dir_is_empty()
Will merge to 'next'.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/ref-transaction (2014-06-20) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: add an err argument to delete_ref_loose
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories always set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
Portability workaround may be needed on top ($gmane/252496).
Updates in response to review comments from Michael ($gmane/253033)
may be needed for later parts, but the earlier parts look ready
for 'next'.
* jk/pretty-G-format-fixes (2014-06-25) 6 commits
(merged to 'next' on 2014-06-26 at 7138407)
+ move "%G" format test from t7510 to t6006
(merged to 'next' on 2014-06-20 at f504bbc)
+ pretty: avoid reading past end-of-string with "%G"
+ t7510: check %G* pretty-format output
+ t7510: test a commit signed by an unknown key
+ t7510: use consistent &&-chains in loop
+ t7510: stop referring to master in later tests
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
(merged to 'next' on 2014-07-08 at 49325ef)
+ t1700: new tests for split-index mode
+ t2104: make sure split index mode is off for the version test
+ read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
+ read-tree: note about dropping split-index mode or index version
+ read-tree: force split-index mode off on --index-output
+ rev-parse: add --shared-index-path to get shared index path
+ update-index --split-index: do not split if $GIT_DIR is read only
+ update-index: new options to enable/disable split index mode
+ split-index: strip pathname of on-disk replaced entries
+ split-index: do not invalidate cache-tree at read time
+ split-index: the reading part
+ split-index: the writing part
+ read-cache: mark updated entries for split index
+ read-cache: save deleted entries in split index
+ read-cache: mark new entries for split index
+ read-cache: split-index mode
+ read-cache: save index SHA-1 after reading
+ entry.c: update cache_changed if refresh_cache is set in checkout_entry()
+ cache-tree: mark istate->cache_changed on prime_cache_tree()
+ cache-tree: mark istate->cache_changed on cache tree update
+ cache-tree: mark istate->cache_changed on cache tree invalidation
+ unpack-trees: be specific what part of the index has changed
+ resolve-undo: be specific what part of the index has changed
+ update-index: be specific what part of the index has changed
+ read-cache: be specific what part of the index has changed
+ read-cache: be strict about "changed" in remove_marked_cache_entries()
+ read-cache: store in-memory flags in the first 12 bits of ce_flags
+ read-cache: relocate and unexport commit_locked_index()
+ read-cache: new API write_locked_index instead of write_index/write_cache
+ sequencer: do not update/refresh index if the lock cannot be held
+ ewah: delete unused ewah_read_mmap_native declaration
+ ewah: fix constness of ewah_read_mmap
An experiment to use two files (the base file and incremental
changes relative to it) to represent the index to reduce I/O cost
of rewriting a large index when only small part of the working tree
changes.
Will merge to 'master'.
* jc/test-lazy-prereq (2014-06-13) 1 commit
- tests: drop GIT_*_TIMING_TESTS environment variable support
Test-script clean-up.
Will hold.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
(merged to 'next' on 2014-06-30 at c8f79d0)
+ Win32: Unicode arguments (incoming)
+ Win32: Unicode arguments (outgoing)
+ MinGW: disable CRT command line globbing
+ Win32: fix potential multi-threading issue
+ Win32: simplify internal mingw_spawn* APIs
+ Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
Will merge to 'master'.
* sk/mingw-dirent (2014-06-09) 5 commits
(merged to 'next' on 2014-06-30 at ae9e2d6)
+ Win32 dirent: improve dirent implementation
+ Win32 dirent: clarify #include directives
+ Win32 dirent: change FILENAME_MAX to MAX_PATH
+ Win32 dirent: remove unused dirent.d_reclen member
+ Win32 dirent: remove unused dirent.d_ino member
Will merge to 'master'.
* sk/mingw-main (2014-06-10) 2 commits
(merged to 'next' on 2014-06-30 at 447cb50)
+ mingw: avoid const warning
+ Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
Will merge to 'master'.
* sk/mingw-uni-console (2014-06-16) 7 commits
(merged to 'next' on 2014-06-30 at f4fbc41)
+ Win32: reliably detect console pipe handles
+ Win32: fix broken pipe detection
+ Win32: Thread-safe windows console output
+ Win32: add Unicode conversion functions
+ Win32: warn if the console font doesn't support Unicode
+ Win32: detect console streams more reliably
+ Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Will merge to 'master'.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
Will hold.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2014, #06; Thu, 26)
@ 2014-06-26 22:02 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-26 22:02 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Fixes accumulated on the 'master' front made into 2.0.1. The topics
in flight continue to separate into two distinct layers (i.e.
stalled-and-need-to-be-rerolld vs sure-to-graduate-soon).
Four mingw series are still in limbo--are they in good enough shape
for Windows folks who wanted to upstream them?
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ep/avoid-test-a-o (2014-06-19) 20 commits
(merged to 'next' on 2014-06-20 at c47322b)
+ git-submodule.sh: avoid "echo" path-like values
+ git-submodule.sh: avoid "test <cond> -a/-o <cond>"
+ t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
+ t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
+ t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
+ t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
+ git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
+ git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
+ git-bisect.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
+ check_bindir: avoid "test <cond> -a/-o <cond>"
Update tests and scripts to avoid "test ... -a ...", which is often
more error-prone than "test ... && test ...".
Squashed misconversion fix-up into git-submodule.sh updates.
* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
(merged to 'next' on 2014-06-16 at 29734cc)
+ sequencer: signal failed ff as an aborted, not a conflicted merge
* jk/repack-pack-keep-objects (2014-06-10) 3 commits
(merged to 'next' on 2014-06-16 at 89716c9)
+ repack: s/write_bitmap/&s/ in code
+ repack: respect pack.writebitmaps
+ repack: do not accidentally pack kept objects by default
(this branch is used by jk/repack-pack-writebitmaps-config.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
(merged to 'next' on 2014-06-16 at 777005d)
+ t7700: drop explicit --no-pack-kept-objects from .keep test
+ repack: introduce repack.writeBitmaps config option
+ repack: simplify handling of --write-bitmap-index
+ pack-objects: stop respecting pack.writebitmaps
(this branch uses jk/repack-pack-keep-objects.)
* jm/dedup-name-compare (2014-06-20) 2 commits
+ cleanup duplicate name_compare() functions
+ name-hash.c: replace cache_name_compare() with memcmp(3)
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 04815e3)
+ submodule: document "sync --recursive"
* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 3c05e19)
+ git-p4: fix submit in non --prepare-p4-only mode
* nd/init-restore-env (2014-06-10) 1 commit
(merged to 'next' on 2014-06-16 at ecbbfca)
+ git potty: restore environments after alias expansion
* pb/trim-trailing-spaces (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 6985153)
+ t0008: do not depend on 'echo' handling backslashes specially
* rs/blame-refactor (2014-06-13) 2 commits
(merged to 'next' on 2014-06-20 at ddaa722)
+ blame: simplify prepare_lines()
+ blame: factor out get_next_line()
* sp/complete-ext-alias (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 399679e)
+ completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
* tb/unicode-7.0-display-width (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at 111b246)
+ Update of unicode_width.h to Unicode Version 7.0
* ye/doc-http-proto (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 24f347d)
+ http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
--------------------------------------------------
[New Topics]
* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit
- builtin/clone.c: detect a clone starting at a tag correctly
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* cc/replace-graft (2014-06-09) 5 commits
- DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
"git replace" learned a "--graft" option to rewrite parents of a
commit.
Expecting a reroll on top of jk/commit-buffer-length.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
. count-objects: report unused files in $GIT_DIR/repos/...
. gc: support prune --repos
. gc: style change -- no SP before closing bracket
. prune: strategies for linked checkouts
. checkout: detach if the branch is already checked out elsewhere
. checkout: clean up half-prepared directories in --to mode
. checkout: support checking out into a new working directory
. use new wrapper write_file() for simple file writing
. wrapper.c: wrapper to open a file, fprintf then close
. setup.c: support multi-checkout repo setup
. setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
. setup.c: convert check_repository_format_gently to use strbuf
. setup.c: detect $GIT_COMMON_DIR in is_git_directory()
. setup.c: convert is_git_directory() to use strbuf
. git-stash: avoid hardcoding $GIT_DIR/logs/....
. *.sh: avoid hardcoding $GIT_DIR/hooks/...
. git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
. $GIT_COMMON_DIR: a new environment variable
. commit: use SEQ_DIR instead of hardcoding "sequencer"
. fast-import: use git_path() for accessing .git dir instead of get_git_dir()
. reflog: avoid constructing .lock path with git_path
. *.sh: respect $GIT_INDEX_FILE
. git_path(): be aware of file relocation in $GIT_DIR
. path.c: group git_path(), git_pathdup() and strbuf_git_path() together
. path.c: rename vsnpath() to do_git_path()
. git_snpath(): retire and replace with strbuf_git_path()
. path.c: make get_pathname() call sites return const char *
. path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
--------------------------------------------------
[Cooking]
* mg/verify-commit (2014-06-23) 5 commits
- t7510: test verify-commit
- t7510: exit for loop with test result
- verify-commit: scriptable commit signature verification
- gpg-interface: provide access to the payload
- gpg-interface: provide clear helper for struct signature_check
Add 'verify-commit' to be used in a way similar to 'verify-tag' is
used. Further work on verifying the mergetags might be needed.
Will merge to 'next'.
* dt/refs-check-refname-component-sse (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at d286027)
+ refs.c: SSE2 optimizations for check_refname_component
Further micro-optimization of a leaf-function.
Will merge to 'master'.
* ye/http-extract-charset (2014-06-17) 1 commit
(merged to 'next' on 2014-06-20 at 9492bae)
+ http: fix charset detection of extract_content_type()
Will merge to 'master'.
* jk/skip-prefix (2014-06-20) 18 commits
(merged to 'next' on 2014-06-23 at cd387a6)
+ http-push: refactor parsing of remote object names
+ imap-send: use skip_prefix instead of using magic numbers
+ use skip_prefix to avoid repeated calculations
+ git: avoid magic number with skip_prefix
+ fetch-pack: refactor parsing in get_ack
+ fast-import: refactor parsing of spaces
+ stat_opt: check extra strlen call
+ daemon: use skip_prefix to avoid magic numbers
+ fast-import: use skip_prefix for parsing input
+ use skip_prefix to avoid repeating strings
+ use skip_prefix to avoid magic numbers
+ transport-helper: avoid reading past end-of-string
+ fast-import: fix read of uninitialized argv memory
+ apply: use skip_prefix instead of raw addition
+ refactor skip_prefix to return a boolean
+ avoid using skip_prefix as a boolean
+ daemon: mark some strings as const
+ parse_diff_color_slot: drop ofs parameter
Will merge to 'master'.
* jk/xstrfmt (2014-06-25) 11 commits
(merged to 'next' on 2014-06-25 at 5031d4e)
+ setup_git_env(): introduce git_path_from_env() helper
(merged to 'next' on 2014-06-23 at 64f2558)
+ unique_path: fix unlikely heap overflow
+ walker_fetch: fix minor memory leak
+ merge: use argv_array when spawning merge strategy
+ sequencer: use argv_array_pushf
+ setup_git_env: use git_pathdup instead of xmalloc + sprintf
+ use xstrfmt to replace xmalloc + strcpy/strcat
+ use xstrfmt to replace xmalloc + sprintf
+ use xstrdup instead of xmalloc + strcpy
+ use xstrfmt in favor of manual size calculations
+ strbuf: add xstrfmt helper
Will merge to 'master'.
* kb/perf-trace (2014-06-20) 11 commits
- git: add performance tracing for git's main() function to debug scripts
- trace: add trace_performance facility to debug performance issues
- trace: add high resolution timer function to debug performance issues
- trace: add 'file:line' to all trace output
- trace: move code around, in preparation to file:line output
- trace: add current timestamp to all trace output
- trace: add infrastructure to augment trace output with additional info
- trace: factor out printing to the trace file
- trace: remove redundant printf format attribute
- trace: consistently name the format parameter
- trace: move trace declarations from cache.h to new trace.h
Expecting a reroll.
* hv/submodule-config (2014-06-13) 6 commits
- SQUASH compilation fix
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
- hashmap: add enum for hashmap free_entries option
Expecting a reroll.
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 01f81f5)
+ rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
Will merge to 'master'.
* jl/submodule-tests (2014-06-20) 15 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- SQUASH???
- submodules: Add the lib-submodule-update.sh test library
- test-lib: add test_dir_is_empty()
Expecting a reroll.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/ref-transaction (2014-06-20) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: add an err argument to delete_ref_loose
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories always set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
Updated in response to review comments from Michael.
Portability workaround may be needed on top ($gmane/252496).
Will merge to 'next'.
* jk/pretty-G-format-fixes (2014-06-25) 6 commits
(merged to 'next' on 2014-06-26 at 7138407)
+ move "%G" format test from t7510 to t6006
(merged to 'next' on 2014-06-20 at f504bbc)
+ pretty: avoid reading past end-of-string with "%G"
+ t7510: check %G* pretty-format output
+ t7510: test a commit signed by an unknown key
+ t7510: use consistent &&-chains in loop
+ t7510: stop referring to master in later tests
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
- t1700: new tests for split-index mode
- t2104: make sure split index mode is off for the version test
- read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- read-tree: note about dropping split-index mode or index version
- read-tree: force split-index mode off on --index-output
- rev-parse: add --shared-index-path to get shared index path
- update-index --split-index: do not split if $GIT_DIR is read only
- update-index: new options to enable/disable split index mode
- split-index: strip pathname of on-disk replaced entries
- split-index: do not invalidate cache-tree at read time
- split-index: the reading part
- split-index: the writing part
- read-cache: mark updated entries for split index
- read-cache: save deleted entries in split index
- read-cache: mark new entries for split index
- read-cache: split-index mode
- read-cache: save index SHA-1 after reading
- entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- cache-tree: mark istate->cache_changed on prime_cache_tree()
- cache-tree: mark istate->cache_changed on cache tree update
- cache-tree: mark istate->cache_changed on cache tree invalidation
- unpack-trees: be specific what part of the index has changed
- resolve-undo: be specific what part of the index has changed
- update-index: be specific what part of the index has changed
- read-cache: be specific what part of the index has changed
- read-cache: be strict about "changed" in remove_marked_cache_entries()
- read-cache: store in-memory flags in the first 12 bits of ce_flags
- read-cache: relocate and unexport commit_locked_index()
- read-cache: new API write_locked_index instead of write_index/write_cache
- sequencer: do not update/refresh index if the lock cannot be held
- ewah: delete unused ewah_read_mmap_native declaration
- ewah: fix constness of ewah_read_mmap
What's the doneness of this one?
* jc/test-lazy-prereq (2014-06-13) 1 commit
- tests: drop GIT_*_TIMING_TESTS environment variable support
Test-script clean-up.
Will hold.
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
Will merge to 'master'.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
- Win32: Unicode arguments (incoming)
- Win32: Unicode arguments (outgoing)
- MinGW: disable CRT command line globbing
- Win32: fix potential multi-threading issue
- Win32: simplify internal mingw_spawn* APIs
- Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
Are Windows folks happy with all four mingw topics?
* sk/mingw-dirent (2014-06-09) 5 commits
- Win32 dirent: improve dirent implementation
- Win32 dirent: clarify #include directives
- Win32 dirent: change FILENAME_MAX to MAX_PATH
- Win32 dirent: remove unused dirent.d_reclen member
- Win32 dirent: remove unused dirent.d_ino member
Are Windows folks happy with all four mingw topics?
* sk/mingw-main (2014-06-10) 2 commits
- mingw: avoid const warning
- Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
Are Windows folks happy with all four mingw topics?
* sk/mingw-uni-console (2014-06-16) 7 commits
- Win32: reliably detect console pipe handles
- Win32: fix broken pipe detection
- Win32: Thread-safe windows console output
- Win32: add Unicode conversion functions
- Win32: warn if the console font doesn't support Unicode
- Win32: detect console streams more reliably
- Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Are Windows folks happy with all four mingw topics?
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
Will hold.
--------------------------------------------------
[Discarded]
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
. git-gui: show staged submodules regardless of ignore config
Merged to the upstream.
* jl/gitk-show-added-submodule-changes (2014-04-15) 1 commit
. gitk: show staged submodules regardless of ignore config
Merged to the upstream.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jun 2014, #05; Fri, 20)
@ 2014-06-20 22:26 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-20 22:26 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Many topics that have been cooking in 'next' during the previous
cycle and also some new topics since this cycle opened, totalling
slightly more than 300 individual patches are in 'master' now. We
have also accumulated some fixes we need to merge down to 'maint'
and cut a v2.0.1 sometime next week.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* jc/test-lazy-prereq (2014-06-13) 6 commits
(merged to 'next' on 2014-06-10 at 4f774f7)
+ t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: do not chdir around in the primary test process
+ t3302: coding style updates
+ test: turn USR_BIN_TIME into a lazy prerequisite
+ test: turn EXPENSIVE into a lazy prerequisite
Test-script clean-up.
* jc/revision-dash-count-parsing (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 1aeca19)
+ revision: parse "git log -<count>" more carefully
"git log -2master" is a common typo that shows two commits starting
from whichever random branch that is not 'master' that happens to
be checked out currently.
* jm/api-strbuf-doc (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 831aa30)
+ api-strbuf.txt minor typos
* mt/send-email-cover-to-cc (2014-06-10) 3 commits
(merged to 'next' on 2014-06-10 at 6bb1465)
+ t9001: avoid non-portable '\n' with sed
+ test/send-email: to-cover, cc-cover tests
+ git-send-email: two new options: to-cover, cc-cover
Originally merged to 'next' on 2014-06-10
"git send-email" learns two new options.
* rs/more-starts-with (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at efcd02e)
+ Use starts_with() for C strings instead of memcmp()
* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 374082c)
+ t5551: fix the 50,000 tag test
* jc/fetch-pull-refmap (2014-06-12) 10 commits
(merged to 'next' on 2014-06-12 at 5428530)
+ docs: Explain the purpose of fetch's and pull's <refspec> parameter.
(merged to 'next' on 2014-06-10 at 13c13ae)
+ fetch: allow explicit --refmap to override configuration
+ fetch doc: add a section on configured remote-tracking branches
+ fetch doc: remove "short-cut" section
+ fetch doc: update refspec format description
+ fetch doc: on pulling multiple refspecs
+ fetch doc: remove notes on outdated "mixed layout"
+ fetch doc: update note on '+' in front of the refspec
+ fetch doc: move FETCH_HEAD material lower and add an example
+ fetch doc: update introductory part for clarity
--------------------------------------------------
[New Topics]
* dt/refs-check-refname-component-sse (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at d286027)
+ refs.c: SSE2 optimizations for check_refname_component
Further micro-optimization of a leaf-function.
* tb/unicode-7.0-display-width (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at 111b246)
+ Update of unicode_width.h to Unicode Version 7.0
Will merge to 'master'.
* ye/http-extract-charset (2014-06-17) 1 commit
(merged to 'next' on 2014-06-20 at 9492bae)
+ http: fix charset detection of extract_content_type()
Will merge to 'master'.
* jk/skip-prefix (2014-06-20) 18 commits
- http-push: refactor parsing of remote object names
- imap-send: use skip_prefix instead of using magic numbers
- use skip_prefix to avoid repeated calculations
- git: avoid magic number with skip_prefix
- fetch-pack: refactor parsing in get_ack
- fast-import: refactor parsing of spaces
- stat_opt: check extra strlen call
- daemon: use skip_prefix to avoid magic numbers
- fast-import: use skip_prefix for parsing input
- use skip_prefix to avoid repeating strings
- use skip_prefix to avoid magic numbers
- transport-helper: avoid reading past end-of-string
- fast-import: fix read of uninitialized argv memory
- apply: use skip_prefix instead of raw addition
- refactor skip_prefix to return a boolean
- avoid using skip_prefix as a boolean
- daemon: mark some strings as const
- parse_diff_color_slot: drop ofs parameter
Will merge to 'next'.
* jk/xstrfmt (2014-06-19) 10 commits
- unique_path: fix unlikely heap overflow
- walker_fetch: fix minor memory leak
- merge: use argv_array when spawning merge strategy
- sequencer: use argv_array_pushf
- setup_git_env: use git_pathdup instead of xmalloc + sprintf
- use xstrfmt to replace xmalloc + strcpy/strcat
- use xstrfmt to replace xmalloc + sprintf
- use xstrdup instead of xmalloc + strcpy
- use xstrfmt in favor of manual size calculations
- strbuf: add xstrfmt helper
Will merge to 'next'.
* jm/dedup-name-compare (2014-06-20) 2 commits
- cleanup duplicate name_compare() functions
- name-hash.c: replace cache_name_compare() with memcmp(3)
Will merge to 'next'.
* kb/perf-trace (2014-06-17) 11 commits
. git: add performance tracing for git's main() function to debug scripts
. trace: add trace_performance facility to debug performance issues
. trace: add high resolution timer function to debug performance issues
. trace: add 'file:line' to all trace output
. trace: move code around, in preparation to file:line output
. trace: add current timestamp to all trace output
. trace: add infrastructure to augment trace output with additional info
. trace: factor out printing to the trace file
. trace: remove redundant printf format attribute
. trace: consistently name the format parameter
. trace: move trace declarations from cache.h to new trace.h
--------------------------------------------------
[Stalled]
* mg/verify-commit (2014-06-10) 3 commits
- verify-commit: scriptable commit signature verification
- gpg-interface: provide access to the payload
- pretty: free the gpg status buf
What is queued here is v1; v2 exists but I skipped it.
Expecting a reroll.
* cc/replace-graft (2014-06-09) 5 commits
- DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
"git replace" learned a "--graft" option to rewrite parents of a
commit.
Expecting a reroll on top of jk/commit-buffer-length.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
. count-objects: report unused files in $GIT_DIR/repos/...
. gc: support prune --repos
. gc: style change -- no SP before closing bracket
. prune: strategies for linked checkouts
. checkout: detach if the branch is already checked out elsewhere
. checkout: clean up half-prepared directories in --to mode
. checkout: support checking out into a new working directory
. use new wrapper write_file() for simple file writing
. wrapper.c: wrapper to open a file, fprintf then close
. setup.c: support multi-checkout repo setup
. setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
. setup.c: convert check_repository_format_gently to use strbuf
. setup.c: detect $GIT_COMMON_DIR in is_git_directory()
. setup.c: convert is_git_directory() to use strbuf
. git-stash: avoid hardcoding $GIT_DIR/logs/....
. *.sh: avoid hardcoding $GIT_DIR/hooks/...
. git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
. $GIT_COMMON_DIR: a new environment variable
. commit: use SEQ_DIR instead of hardcoding "sequencer"
. fast-import: use git_path() for accessing .git dir instead of get_git_dir()
. reflog: avoid constructing .lock path with git_path
. *.sh: respect $GIT_INDEX_FILE
. git_path(): be aware of file relocation in $GIT_DIR
. path.c: group git_path(), git_pathdup() and strbuf_git_path() together
. path.c: rename vsnpath() to do_git_path()
. git_snpath(): retire and replace with strbuf_git_path()
. path.c: make get_pathname() call sites return const char *
. path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
--------------------------------------------------
[Cooking]
* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
(merged to 'next' on 2014-06-16 at 29734cc)
+ sequencer: signal failed ff as an aborted, not a conflicted merge
Will merge to 'master'.
* hv/submodule-config (2014-06-13) 6 commits
- SQUASH compilation fix
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
- hashmap: add enum for hashmap free_entries option
* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 3c05e19)
+ git-p4: fix submit in non --prepare-p4-only mode
Will merge to 'master'.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
- Win32: Unicode arguments (incoming)
- Win32: Unicode arguments (outgoing)
- MinGW: disable CRT command line globbing
- Win32: fix potential multi-threading issue
- Win32: simplify internal mingw_spawn* APIs
- Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
* sp/complete-ext-alias (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 399679e)
+ completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
Will merge to 'master'.
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 01f81f5)
+ rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
Will merge to 'master'.
* jl/submodule-tests (2014-06-20) 15 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- SQUASH???
- submodules: Add the lib-submodule-update.sh test library
- test-lib: add test_dir_is_empty()
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 04815e3)
+ submodule: document "sync --recursive"
Will merge to 'master'.
* pb/trim-trailing-spaces (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 6985153)
+ t0008: do not depend on 'echo' handling backslashes specially
Will merge to 'master'.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/blame-refactor (2014-06-13) 2 commits
(merged to 'next' on 2014-06-20 at ddaa722)
+ blame: simplify prepare_lines()
+ blame: factor out get_next_line()
Will merge to 'master'.
* rs/ref-transaction (2014-06-20) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: add an err argument to delete_ref_loose
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories always set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
Updated in response to review comments from Michael.
Seems to be getting ready for 'next'.
* ye/doc-http-proto (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 24f347d)
+ http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
Will merge to 'master'.
* jk/pretty-G-format-fixes (2014-06-17) 5 commits
(merged to 'next' on 2014-06-20 at f504bbc)
+ pretty: avoid reading past end-of-string with "%G"
+ t7510: check %G* pretty-format output
+ t7510: test a commit signed by an unknown key
+ t7510: use consistent &&-chains in loop
+ t7510: stop referring to master in later tests
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
- t1700: new tests for split-index mode
- t2104: make sure split index mode is off for the version test
- read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- read-tree: note about dropping split-index mode or index version
- read-tree: force split-index mode off on --index-output
- rev-parse: add --shared-index-path to get shared index path
- update-index --split-index: do not split if $GIT_DIR is read only
- update-index: new options to enable/disable split index mode
- split-index: strip pathname of on-disk replaced entries
- split-index: do not invalidate cache-tree at read time
- split-index: the reading part
- split-index: the writing part
- read-cache: mark updated entries for split index
- read-cache: save deleted entries in split index
- read-cache: mark new entries for split index
- read-cache: split-index mode
- read-cache: save index SHA-1 after reading
- entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- cache-tree: mark istate->cache_changed on prime_cache_tree()
- cache-tree: mark istate->cache_changed on cache tree update
- cache-tree: mark istate->cache_changed on cache tree invalidation
- unpack-trees: be specific what part of the index has changed
- resolve-undo: be specific what part of the index has changed
- update-index: be specific what part of the index has changed
- read-cache: be specific what part of the index has changed
- read-cache: be strict about "changed" in remove_marked_cache_entries()
- read-cache: store in-memory flags in the first 12 bits of ce_flags
- read-cache: relocate and unexport commit_locked_index()
- read-cache: new API write_locked_index instead of write_index/write_cache
- sequencer: do not update/refresh index if the lock cannot be held
- ewah: delete unused ewah_read_mmap_native declaration
- ewah: fix constness of ewah_read_mmap
* ep/avoid-test-a-o (2014-06-19) 20 commits
(merged to 'next' on 2014-06-20 at c47322b)
+ git-submodule.sh: avoid "echo" path-like values
+ git-submodule.sh: avoid "test <cond> -a/-o <cond>"
+ t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
+ t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
+ t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
+ t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
+ t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
+ t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
+ git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
+ git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
+ git-bisect.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
+ contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
+ check_bindir: avoid "test <cond> -a/-o <cond>"
Update tests and scripts to avoid "test ... -a ...", which is often
more error-prone than "test ... && test ...".
Squashed misconversion fix-up into git-submodule.sh updates.
Will merge to 'master'.
* jc/test-lazy-prereq (2014-06-13) 1 commit
- tests: drop GIT_*_TIMING_TESTS environment variable support
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
Will merge to 'master'.
* sk/mingw-dirent (2014-06-09) 5 commits
- Win32 dirent: improve dirent implementation
- Win32 dirent: clarify #include directives
- Win32 dirent: change FILENAME_MAX to MAX_PATH
- Win32 dirent: remove unused dirent.d_reclen member
- Win32 dirent: remove unused dirent.d_ino member
* sk/mingw-main (2014-06-10) 2 commits
- mingw: avoid const warning
- Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
* sk/mingw-uni-console (2014-06-16) 7 commits
- Win32: reliably detect console pipe handles
- Win32: fix broken pipe detection
- Win32: Thread-safe windows console output
- Win32: add Unicode conversion functions
- Win32: warn if the console font doesn't support Unicode
- Win32: detect console streams more reliably
- Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Now, are Windows folks happy with all four mingw topics?
* jk/repack-pack-keep-objects (2014-06-10) 3 commits
(merged to 'next' on 2014-06-16 at 89716c9)
+ repack: s/write_bitmap/&s/ in code
+ repack: respect pack.writebitmaps
+ repack: do not accidentally pack kept objects by default
(this branch is used by jk/repack-pack-writebitmaps-config.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
Will merge to 'master'.
* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
(merged to 'next' on 2014-06-16 at 777005d)
+ t7700: drop explicit --no-pack-kept-objects from .keep test
+ repack: introduce repack.writeBitmaps config option
+ repack: simplify handling of --write-bitmap-index
+ pack-objects: stop respecting pack.writebitmaps
(this branch uses jk/repack-pack-keep-objects.)
Will merge to 'master'.
* nd/init-restore-env (2014-06-10) 1 commit
(merged to 'next' on 2014-06-16 at ecbbfca)
+ git potty: restore environments after alias expansion
Will merge to 'master'.
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- git-gui: show staged submodules regardless of ignore config
Tentatively queued what I expect to receive via Pat Thoyts.
* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
- gitk: show staged submodules regardless of ignore config
- gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
- l10n: Init Vietnamese translation
Will drop, as I heard from Paul that these are queued in his tree.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jun 2014, #04; Tue, 17)
@ 2014-06-18 17:25 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-18 17:25 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Many topics that have been cooking in 'next' during the previous
cycle, totalling close to 300 individual patches, are in 'master'
now. We have also accumulated some fixes we need to merge down to
'maint' and cut a v2.0.1 sometime next week.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
Teaches "git patch-id" to compute the patch ID that does not change
when the files in a single patch is reordered. As this new algorithm
is backward incompatible, the last bit to flip it to be the default
is left out of 'master' for now.
* as/pretty-truncate (2014-05-21) 5 commits
(merged to 'next' on 2014-06-10 at d8147a2)
+ pretty.c: format string with truncate respects logOutputEncoding
+ t4205, t6006: add tests that fail with i18n.logOutputEncoding set
+ t4205 (log-pretty-format): use `tformat` rather than `format`
+ t4041, t4205, t6006, t7102: don't hardcode tested encoding value
+ t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
Originally merged to 'next' on 2014-05-23
* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
(merged to 'next' on 2014-06-10 at eddb5bc)
+ transport-helper.c: rearrange xcalloc arguments
+ remote.c: rearrange xcalloc arguments
+ reflog-walk.c: rearrange xcalloc arguments
+ pack-revindex.c: rearrange xcalloc arguments
+ notes.c: rearrange xcalloc arguments
+ imap-send.c: rearrange xcalloc arguments
+ http-push.c: rearrange xcalloc arguments
+ diff.c: rearrange xcalloc arguments
+ config.c: rearrange xcalloc arguments
+ commit.c: rearrange xcalloc arguments
+ builtin/remote.c: rearrange xcalloc arguments
+ builtin/ls-remote.c: rearrange xcalloc arguments
Originally merged to 'next' on 2014-06-06
Like calloc(3), xcalloc() takes nmemb and then size.
* cb/byte-order (2014-05-30) 3 commits
(merged to 'next' on 2014-06-10 at 63db8ee)
+ compat/bswap.h: fix endianness detection
+ compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
+ compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
Originally merged to 'next' on 2014-05-30
Compatibility enhancement for Solaris.
* cc/replace-edit (2014-05-19) 10 commits
(merged to 'next' on 2014-06-10 at ff69722)
+ Documentation: replace: describe new --edit option
+ replace: add --edit to usage string
+ replace: add tests for --edit
+ replace: die early if replace ref already exists
+ replace: refactor checking ref validity
+ replace: make sure --edit results in a different object
+ replace: add --edit option
+ replace: factor object resolution out of replace_object
+ replace: use OPT_CMDMODE to handle modes
+ replace: refactor command-mode determination
(this branch is used by cc/replace-graft.)
Originally merged to 'next' on 2014-05-19
"git replace" learns a new "--edit" option.
* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
(merged to 'next' on 2014-06-10 at 4560669)
+ refs.c: optimize check_refname_component()
(this branch is used by dt/refs-check-refname-component-sse42.)
Originally merged to 'next' on 2014-06-06
* fc/remote-helper-refmap (2014-04-21) 8 commits
(merged to 'next' on 2014-06-10 at 8cd8cf8)
+ transport-helper: remove unnecessary strbuf resets
+ transport-helper: add support to delete branches
+ fast-export: add support to delete refs
+ fast-import: add support to delete refs
+ transport-helper: add support to push symbolic refs
+ transport-helper: add support for old:new refspec
+ fast-export: add new --refspec option
+ fast-export: improve argument parsing
Originally merged to 'next' on 2014-04-22
Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.
* ib/test-selectively-run (2014-06-06) 4 commits
(merged to 'next' on 2014-06-10 at 1235570)
+ t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
+ test-lib: '--run' to run only specific tests
+ test-lib: tests skipped by GIT_SKIP_TESTS say so
+ test-lib: document short options in t/README
Originally merged to 'next' on 2014-06-06
Allow specifying only certain individual test pieces to be run
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
* jk/argv-array-for-child-process (2014-05-15) 7 commits
(merged to 'next' on 2014-06-10 at 07a167b)
+ argv-array: drop "detach" code
+ get_importer: use run-command's internal argv_array
+ get_exporter: use argv_array
+ get_helper: use run-command's internal argv_array
+ git_connect: use argv_array
+ run_column_filter: use argv_array
+ run-command: store an optional argv_array
Originally merged to 'next' on 2014-05-21
* jk/complete-merge-pull (2014-05-27) 2 commits
(merged to 'next' on 2014-06-10 at d1524c5)
+ completion: add missing options for git-merge
+ completion: add a note that merge options are shared
Originally merged to 'next' on 2014-06-06
The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".
* jk/daemon-tolower (2014-05-23) 1 commit
(merged to 'next' on 2014-06-10 at f3c549d)
+ daemon/config: factor out duplicate xstrdup_tolower
Originally merged to 'next' on 2014-05-23
* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
(merged to 'next' on 2014-06-10 at 984862b)
+ run_diff_files: do not look at uninitialized stat data
Originally merged to 'next' on 2014-05-21
* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
(merged to 'next' on 2014-06-10 at 0cd28d7)
+ move "--follow needs one pathspec" rule to diff_setup_done
Originally merged to 'next' on 2014-05-23
* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
(merged to 'next' on 2014-06-10 at 745b05c)
+ t/lib-httpd: require SANITY prereq
Originally merged to 'next' on 2014-05-21
* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
(merged to 'next' on 2014-06-10 at 713ebe0)
+ error_resolve_conflict: drop quotations around operation
+ error_resolve_conflict: rewrap advice message
Originally merged to 'next' on 2014-06-06
* jk/http-errors (2014-05-27) 8 commits
(merged to 'next' on 2014-06-10 at 30e9212)
+ http: default text charset to iso-8859-1
+ remote-curl: reencode http error messages
+ strbuf: add strbuf_reencode helper
+ http: optionally extract charset parameter from content-type
+ http: extract type/subtype portion of content-type
+ t5550: test display of remote http error messages
+ t/lib-httpd: use write_script to copy CGI scripts
+ test-lib: preserve GIT_CURL_VERBOSE from the environment
Originally merged to 'next' on 2014-06-06
Propagate the error messages from the webserver better to the
client coming over the HTTP transport.
* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
(merged to 'next' on 2014-06-10 at 299ea28)
+ open_sha1_file: report "most interesting" errno
Originally merged to 'next' on 2014-05-21
* jk/strbuf-tolower (2014-05-23) 1 commit
(merged to 'next' on 2014-06-10 at 01e6983)
+ strbuf: add strbuf_tolower function
Originally merged to 'next' on 2014-05-23
* jl/remote-rm-prune (2014-05-27) 3 commits
(merged to 'next' on 2014-06-10 at 13259ff)
+ remote prune: optimize "dangling symref" check/warning
+ remote: repack packed-refs once when deleting multiple refs
+ remote rm: delete remote configuration as the last
Originally merged to 'next' on 2014-06-06
"git remote rm" and "git remote prune" can involve removing many
refs at once, which is not a very efficient thing to do when very
many refs exist in the packed-refs file.
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
(merged to 'next' on 2014-06-10 at fc63847)
+ commit -m: commit staged submodules regardless of ignore config
+ status/commit: show staged submodules regardless of ignore config
Originally merged to 'next' on 2014-06-06
submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.
This is a backward-incompatible change, but should be so in a good
way (aka bugfix).
* jm/dedup-test-config (2014-06-05) 1 commit
(merged to 'next' on 2014-06-10 at 8966f54)
+ t/t7810-grep.sh: remove duplicate test_config()
Originally merged to 'next' on 2014-06-06
* jm/doc-wording-tweaks (2014-05-28) 1 commit
(merged to 'next' on 2014-06-10 at 5f2e094)
+ Documentation: wording fixes in the user manual and glossary
Originally merged to 'next' on 2014-06-06
* jm/format-patch-mail-sig (2014-05-27) 2 commits
(merged to 'next' on 2014-06-10 at 310f59e)
+ format-patch: add "--signature-file=<file>" option
+ format-patch: make newline after signature conditional
Originally merged to 'next' on 2014-06-06
* jm/instaweb-apache-24 (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at ecf2048)
+ git-instaweb: add support for Apache 2.4
Originally merged to 'next' on 2014-06-06
* jm/t9138-style-fix (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at 034f13d)
+ t9138-git-svn-authors-prog.sh fixups
Originally merged to 'next' on 2014-06-06
* lt/log-auto-decorate (2014-05-30) 1 commit
(merged to 'next' on 2014-06-10 at f149f4a)
+ git log: support "auto" decorations
Originally merged to 'next' on 2014-06-06
* nd/daemonize-gc (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at 6fae7b0)
+ gc --auto: do not lock refs in the background
Originally merged to 'next' on 2014-06-06
"git gc --auto" was recently changed to run in the background to
give control back early to the end-user sitting in front of the
terminal, but it forgot that housekeeping involving reflogs should
be done without other processes competing for accesses to the refs.
* ow/config-mailmap-pathname (2014-05-27) 1 commit
(merged to 'next' on 2014-06-10 at aba4ca2)
+ config: respect '~' and '~user' in mailmap.file
Originally merged to 'next' on 2014-06-06
mailmap.file configuration names a pathname, hence should honor
~/path and ~user/path as its value.
* rr/rebase-autostash-fix (2014-05-20) 2 commits
(merged to 'next' on 2014-06-10 at afd0c29)
+ rebase -i: test "Nothing to do" case with autostash
+ rebase -i: handle "Nothing to do" case with autostash
Originally merged to 'next' on 2014-05-21
* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
(merged to 'next' on 2014-06-10 at abae695)
+ pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
Originally merged to 'next' on 2014-06-06
Avoid unnecessary copy of previous contents when extending the
hashtable used in pack-objects.
* rs/read-ref-at (2014-06-03) 1 commit
(merged to 'next' on 2014-06-10 at f58f2fc)
+ refs.c: change read_ref_at to use the reflog iterators
Originally merged to 'next' on 2014-06-06
* sh/enable-preloadindex (2014-06-03) 1 commit
(merged to 'next' on 2014-06-10 at 7cedf2d)
+ environment.c: enable core.preloadindex by default
Originally merged to 'next' on 2014-06-06
* sk/test-cmp-bin (2014-06-04) 1 commit
(merged to 'next' on 2014-06-10 at 020a475)
+ t5000, t5003: do not use test_cmp to compare binary files
Originally merged to 'next' on 2014-06-06
* sk/wincred (2014-05-14) 2 commits
(merged to 'next' on 2014-06-10 at 8d03e5a)
+ wincred: avoid overwriting configured variables
+ wincred: add install target
Originally merged to 'next' on 2014-05-21
* sk/windows-unc-path (2014-06-10) 1 commit
(merged to 'next' on 2014-06-10 at 3598cc6)
+ Windows: allow using UNC path for git repository
(this branch is used by sk/mingw-main, sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
Originally merged to 'next' on 2014-05-21
* ta/string-list-init (2014-06-06) 1 commit
(merged to 'next' on 2014-06-10 at bf209ff)
+ string-list: spell all values out that are given to a string_list initializer
Originally merged to 'next' on 2014-06-06
--------------------------------------------------
[New Topics]
* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
(merged to 'next' on 2014-06-16 at 29734cc)
+ sequencer: signal failed ff as an aborted, not a conflicted merge
Will merge to 'master'.
* hv/submodule-config (2014-06-13) 6 commits
- SQUASH compilation fix
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set and lookup
- implement submodule config cache for lookup of submodule names
- hashmap: add enum for hashmap free_entries option
* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 3c05e19)
+ git-p4: fix submit in non --prepare-p4-only mode
Will merge to 'master'.
* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
- Win32: Unicode arguments (incoming)
- Win32: Unicode arguments (outgoing)
- MinGW: disable CRT command line globbing
- Win32: fix potential multi-threading issue
- Win32: simplify internal mingw_spawn* APIs
- Win32: let mingw_execve() return an int
(this branch uses sk/mingw-main and sk/mingw-uni-console.)
* sp/complete-ext-alias (2014-06-13) 1 commit
(merged to 'next' on 2014-06-16 at 399679e)
+ completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
Will merge to 'master'.
* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
- rebase--merge: fix --skip with two conflicts in a row
"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.
Will merge to 'next'.
* jl/submodule-tests (2014-06-16) 16 commits
- revert: add t3513 for submodule updates
- stash: add t3906 for submodule updates
- am: add t4255 for submodule updates
- cherry-pick: add t3512 for submodule updates
- pull: add t5572 for submodule updates
- SQUASH???
- rebase: add t3426 for submodule updates
- merge: add t7613 for submodule updates
- bisect: add t6041 for submodule updates
- reset: add t7112 for submodule updates
- read-tree: add t1013 for submodule updates
- apply: add t4137 for submodule updates
- checkout: call the new submodule update test framework
- submodules: Add the lib-submodule-update.sh test library
- SQUASH???
- test-lib: add test_dir_is_empty()
Expecting a reroll.
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
- submodule: document "sync --recursive"
Will merge to 'next'.
* pb/trim-trailing-spaces (2014-06-13) 1 commit
- t0008: do not depend on 'echo' handling backslashes specially
Will merge to 'next'.
* po/error-message-style (2014-06-16) 1 commit
- doc: state coding guideline for error message punctuation
Expecting a reroll.
* rs/blame-refactor (2014-06-13) 2 commits
- blame: simplify prepare_lines()
- blame: factor out get_next_line()
Will merge to 'next'.
* rs/ref-transaction (2014-06-17) 48 commits
- refs.c: make write_ref_sha1 static
- fetch.c: change s_update_ref to use a ref transaction
- refs.c: propagate any errno==ENOTDIR from _commit back to the callers
- refs.c: pass a skip list to name_conflict_fn
- refs.c: call lock_ref_sha1_basic directly from commit
- refs.c: move the check for valid refname to lock_ref_sha1_basic
- refs.c: pass NULL as *flags to read_ref_full
- refs.c: pass the ref log message to _create/delete/update instead of _commit
- refs.c: make delete_ref use a transaction
- refs.c: make prune_ref use a transaction to delete the ref
- refs.c: remove lock_ref_sha1
- refs.c: remove the update_ref_write function
- refs.c: remove the update_ref_lock function
- refs.c: make lock_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: add transaction.status and track OPEN/CLOSED/ERROR
- refs.c: make ref_transaction_begin take an err argument
- refs.c: update ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- update-ref: use err argument to get error from ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- refs.c: add an err argument to delete_ref_loose
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: log_ref_write should try to return meaningful errno
- refs.c: make resolve_ref_unsafe set errno to something meaningful on error
- refs.c: commit_packed_refs to return a meaningful errno on failure
- refs.c: make remove_empty_directories alwasy set errno to something sane
- refs.c: verify_lock should set errno to something meaningful
- refs.c: make sure log_ref_setup returns a meaningful errno
- refs.c: add an err argument to repack_without_refs
- lockfile.c: make lock_file return a meaningful errno on failurei
- lockfile.c: add a new public function unable_to_lock_message
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: remove ref_transaction_rollback
* ye/doc-http-proto (2014-06-16) 1 commit
- http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
Will merge to 'next'.
* jk/pretty-G-format-fixes (2014-06-17) 5 commits
- pretty: avoid reading past end-of-string with "%G"
- t7510: check %G* pretty-format output
- t7510: test a commit signed by an unknown key
- t7510: use consistent &&-chains in loop
- t7510: stop referring to master in later tests
* tb/unicode-7.0 (2014-06-17) 1 commit
- Update of unicode_width.h to Unicode Version 7.0
--------------------------------------------------
[Stalled]
* cc/replace-graft (2014-06-09) 5 commits
- DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
"git replace" learned a "--graft" option to rewrite parents of a
commit.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- git-add--interactive: Preserve diff heading when splitting hunks
Waiting for a reroll.
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
$gmane/250758?
* rh/prompt-tests (2014-06-05) 11 commits
- t9904: new __git_ps1 tests for Zsh
- test-lib: make it possible to override how test code is eval'd
- lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- lib-prompt-tests.sh: put all tests inside a function
- t9903: move prompt tests to a new lib-prompt-tests.sh file
- t9903: move PS1 color code variable definitions to lib-bash.sh
- t9903: include "Bash" in test names via new $shellname var
- t9903: run pc mode tests again with PS1 expansion disabled
- t9903: move test name prefix to a separate variable
- t9903: put the Bash pc mode prompt test cases in a function
- t9903: remove Zsh test from the suite of Bash prompt tests
Expecting a reroll to limit the damage to test_eval_; also reported
to be broken with older zsh that are still in the field ($gmane/251231).
* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- userdiff: support Java try keyword
- userdiff: support C# async methods and correct C# keywords
Reviews sent; waiting for a response.
* cc/interpret-trailers (2014-05-28) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from file or stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from input message and arguments
- trailer: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
What is the status of this one? I think I saw reviews by Michael
but after that I do not recall seeing any updates.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
More or less abandoned. Will drop.
* nd/multiple-work-trees (2014-03-25) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
. FIXUP
. move LESS/LV pager environment to Makefile
. Makefile: teach scripts to include make variables
. FIXUP
. Makefile: auto-build C strings from make variables
. Makefile: drop *_SQ variables
. FIXUP
. Makefile: add c-quote helper function
. Makefile: introduce sq function for shell-quoting
. Makefile: always create files via make-var
. Makefile: store GIT-* sentinel files in MAKE/
. Makefile: prefer printf to echo for GIT-*
. Makefile: use tempfile/mv strategy for GIT-*
. Makefile: introduce make-var helper function
. Makefile: fix git-instaweb dependency on gitweb
. Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to unclutter.
* fc/publish-vs-upstream (2014-04-21) 8 commits
. sha1_name: add support for @{publish} marks
. sha1_name: simplify track finding
. sha1_name: cleanup interpret_branch_name()
. branch: display publish branch
. push: add --set-publish option
. branch: add --set-publish-to option
. Add concept of 'publish' branch
. t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. At least the tip needs to be
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jc/fetch-pull-refmap (2014-06-12) 10 commits
(merged to 'next' on 2014-06-12 at 5428530)
+ docs: Explain the purpose of fetch's and pull's <refspec> parameter.
(merged to 'next' on 2014-06-10 at 13c13ae)
+ fetch: allow explicit --refmap to override configuration
+ fetch doc: add a section on configured remote-tracking branches
+ fetch doc: remove "short-cut" section
+ fetch doc: update refspec format description
+ fetch doc: on pulling multiple refspecs
+ fetch doc: remove notes on outdated "mixed layout"
+ fetch doc: update note on '+' in front of the refspec
+ fetch doc: move FETCH_HEAD material lower and add an example
+ fetch doc: update introductory part for clarity
Will merge to 'master'.
* nd/split-index (2014-06-13) 32 commits
- t1700: new tests for split-index mode
- t2104: make sure split index mode is off for the version test
- read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- read-tree: note about dropping split-index mode or index version
- read-tree: force split-index mode off on --index-output
- rev-parse: add --shared-index-path to get shared index path
- update-index --split-index: do not split if $GIT_DIR is read only
- update-index: new options to enable/disable split index mode
- split-index: strip pathname of on-disk replaced entries
- split-index: do not invalidate cache-tree at read time
- split-index: the reading part
- split-index: the writing part
- read-cache: mark updated entries for split index
- read-cache: save deleted entries in split index
- read-cache: mark new entries for split index
- read-cache: split-index mode
- read-cache: save index SHA-1 after reading
- entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- cache-tree: mark istate->cache_changed on prime_cache_tree()
- cache-tree: mark istate->cache_changed on cache tree update
- cache-tree: mark istate->cache_changed on cache tree invalidation
- unpack-trees: be specific what part of the index has changed
- resolve-undo: be specific what part of the index has changed
- update-index: be specific what part of the index has changed
- read-cache: be specific what part of the index has changed
- read-cache: be strict about "changed" in remove_marked_cache_entries()
- read-cache: store in-memory flags in the first 12 bits of ce_flags
- read-cache: relocate and unexport commit_locked_index()
- read-cache: new API write_locked_index instead of write_index/write_cache
- sequencer: do not update/refresh index if the lock cannot be held
- ewah: delete unused ewah_read_mmap_native declaration
- ewah: fix constness of ewah_read_mmap
* ep/avoid-test-a-o (2014-06-10) 21 commits
- git-submodule.sh: avoid "echo" path-like values
- SQUASH: misconversion breakage fix
- git-submodule.sh: avoid "test <cond> -a/-o <cond>"
- t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
- t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
- t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
- t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
- t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
- t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
- t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
- t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
- t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
- git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
- git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
- git-bisect.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
- contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
- check_bindir: avoid "test <cond> -a/-o <cond>"
* jc/revision-dash-count-parsing (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 1aeca19)
+ revision: parse "git log -<count>" more carefully
"git log -2master" is a common typo that shows two commits starting
from whichever random branch that is not 'master' that happens to
be checked out currently.
Will merge to 'master'.
* jc/test-lazy-prereq (2014-06-13) 7 commits
- tests: drop GIT_*_TIMING_TESTS environment variable support
(merged to 'next' on 2014-06-10 at 4f774f7)
+ t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ t3302: do not chdir around in the primary test process
+ t3302: coding style updates
+ test: turn USR_BIN_TIME into a lazy prerequisite
+ test: turn EXPENSIVE into a lazy prerequisite
Test-script clean-up. The last step might be controversial.
Will merge to 'master' except for the last one.
* jk/commit-buffer-length (2014-06-13) 18 commits
(merged to 'next' on 2014-06-16 at b2d2d7b)
+ reuse cached commit buffer when parsing signatures
+ commit: record buffer length in cache
+ commit: convert commit->buffer to a slab
+ commit-slab: provide a static initializer
+ use get_commit_buffer everywhere
+ convert logmsg_reencode to get_commit_buffer
+ use get_commit_buffer to avoid duplicate code
+ use get_cached_commit_buffer where appropriate
+ provide helpers to access the commit buffer
+ provide a helper to set the commit buffer
+ provide a helper to free commit buffer
+ sequencer: use logmsg_reencode in get_message
+ logmsg_reencode: return const buffer
+ do not create "struct commit" with xcalloc
+ commit: push commit_index update into alloc_commit_node
+ alloc: include any-object allocations in alloc_report
+ replace dangerous uses of strbuf_attach
+ commit_tree: take a pointer/len pair rather than a const strbuf
Move "commit->buffer" out of the in-core commit object and keep
track of their lengths. Use this to optimize the code paths to
validate GPG signatures in commit objects.
Will merge to 'master'.
* jm/api-strbuf-doc (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 831aa30)
+ api-strbuf.txt minor typos
Will merge to 'master'.
* rs/more-starts-with (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at efcd02e)
+ Use starts_with() for C strings instead of memcmp()
Will merge to 'master'.
* sk/mingw-dirent (2014-06-09) 5 commits
- Win32 dirent: improve dirent implementation
- Win32 dirent: clarify #include directives
- Win32 dirent: change FILENAME_MAX to MAX_PATH
- Win32 dirent: remove unused dirent.d_reclen member
- Win32 dirent: remove unused dirent.d_ino member
* sk/mingw-main (2014-06-10) 2 commits
- mingw: avoid const warning
- Win32: move main macro to a function
(this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
* sk/mingw-uni-console (2014-06-16) 7 commits
- Win32: reliably detect console pipe handles
- Win32: fix broken pipe detection
- Win32: Thread-safe windows console output
- Win32: add Unicode conversion functions
- Win32: warn if the console font doesn't support Unicode
- Win32: detect console streams more reliably
- Win32: support Unicode console output
(this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
Now, are Windows folks happy with all four mingw topics?
* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
(merged to 'next' on 2014-06-10 at 374082c)
+ t5551: fix the 50,000 tag test
Will merge to 'master'.
* jk/repack-pack-keep-objects (2014-06-10) 3 commits
(merged to 'next' on 2014-06-16 at 89716c9)
+ repack: s/write_bitmap/&s/ in code
+ repack: respect pack.writebitmaps
+ repack: do not accidentally pack kept objects by default
(this branch is used by jk/repack-pack-writebitmaps-config.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
Will merge to 'master'.
* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
(merged to 'next' on 2014-06-16 at 777005d)
+ t7700: drop explicit --no-pack-kept-objects from .keep test
+ repack: introduce repack.writeBitmaps config option
+ repack: simplify handling of --write-bitmap-index
+ pack-objects: stop respecting pack.writebitmaps
(this branch uses jk/repack-pack-keep-objects.)
Will merge to 'master'.
* mg/verify-commit (2014-06-10) 3 commits
- verify-commit: scriptable commit signature verification
- gpg-interface: provide access to the payload
- pretty: free the gpg status buf
What is queued here is v1; v2 exists but I skipped it.
Expecting a reroll.
* nd/init-restore-env (2014-06-10) 1 commit
(merged to 'next' on 2014-06-16 at ecbbfca)
+ git potty: restore environments after alias expansion
Will merge to 'master'.
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- git-gui: show staged submodules regardless of ignore config
Tentatively queued what I expect to receive via Pat Thoyts.
* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
- gitk: show staged submodules regardless of ignore config
- gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
- l10n: Init Vietnamese translation
Will drop, as I heard from Paul that these are queued in his tree.
* mt/send-email-cover-to-cc (2014-06-10) 3 commits
(merged to 'next' on 2014-06-10 at 6bb1465)
+ t9001: avoid non-portable '\n' with sed
+ test/send-email: to-cover, cc-cover tests
+ git-send-email: two new options: to-cover, cc-cover
Originally merged to 'next' on 2014-06-10
Will merge to 'master'.
* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
--------------------------------------------------
[Discarded]
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
. Teach checkout to recursively checkout submodules
. submodule: teach unpack_trees() to update submodules
. submodule: teach unpack_trees() to repopulate submodules
. submodule: teach unpack_trees() to remove submodule contents
. submodule: prepare for recursive checkout of submodules
Dropped for now to make room for another topic ($gmane/251521)
^ permalink raw reply [relevance 2%]
* Re: [PATCH] rebase--merge: fix --skip with two conflicts in a row
2014-06-16 0:01 2% ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
@ 2014-06-16 20:31 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-06-16 20:31 UTC (permalink / raw)
To: brian m. carlson; +Cc: git, Phillip Susi, Jeff King
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> If git rebase --merge encountered a conflict, --skip would not work if the
> next commit also conflicted. The msgnum file would never be updated with
> the new patch number, so no patch would actually be skipped, resulting in an
> inescapable loop.
>
> Update the msgnum file's value as the first thing in call_merge. This also
> avoids an "Already applied" message when skipping a commit. There is no
> visible change for the other contexts in which call_merge is invoked, as the
> msgnum file's value remains unchanged in those situations.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
Sounds good to me. Thanks.
> git-rebase--merge.sh | 5 +++--
> t/t3402-rebase-merge.sh | 15 +++++++++++++++
> 2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
> index 6d77b3c..d3fb67d 100644
> --- a/git-rebase--merge.sh
> +++ b/git-rebase--merge.sh
> @@ -53,11 +53,12 @@ continue_merge () {
> }
>
> call_merge () {
> - cmt="$(cat "$state_dir/cmt.$1")"
> + msgnum="$1"
> + echo "$msgnum" >"$state_dir/msgnum"
> + cmt="$(cat "$state_dir/cmt.$msgnum")"
> echo "$cmt" > "$state_dir/current"
> hd=$(git rev-parse --verify HEAD)
> cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
> - msgnum=$(cat "$state_dir/msgnum")
> eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
> eval GITHEAD_$hd='$onto_name'
> export GITHEAD_$cmt GITHEAD_$hd
> diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
> index be8c1d5..5a27ec9 100755
> --- a/t/t3402-rebase-merge.sh
> +++ b/t/t3402-rebase-merge.sh
> @@ -33,6 +33,7 @@ test_expect_success setup '
> tr "[a-z]" "[A-Z]" <original >newfile &&
> git add newfile &&
> git commit -a -m"side edits further." &&
> + git branch second-side &&
>
> tr "[a-m]" "[A-M]" <original >newfile &&
> rm -f original &&
> @@ -41,6 +42,7 @@ test_expect_success setup '
> git branch test-rebase side &&
> git branch test-rebase-pick side &&
> git branch test-reference-pick side &&
> + git branch test-conflicts side &&
> git checkout -b test-merge side
> '
>
> @@ -138,4 +140,17 @@ test_expect_success 'rebase -s funny -Xopt' '
> test -f funny.was.run
> '
>
> +test_expect_success 'rebase --skip works with two conflicts in a row' '
> + git checkout second-side &&
> + tr "[A-Z]" "[a-z]" <newfile >tmp &&
> + mv tmp newfile &&
> + git commit -a -m"edit conflicting with side" &&
> + tr "[d-f]" "[D-F]" <newfile >tmp &&
> + mv tmp newfile &&
> + git commit -a -m"another edit conflicting with side" &&
> + test_must_fail git rebase --merge test-conflicts &&
> + test_must_fail git rebase --skip &&
> + git rebase --skip
> +'
> +
> test_done
^ permalink raw reply [relevance 2%]
* [PATCH] rebase--merge: fix --skip with two conflicts in a row
@ 2014-06-16 0:01 2% ` brian m. carlson
2014-06-16 20:31 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: brian m. carlson @ 2014-06-16 0:01 UTC (permalink / raw)
To: git; +Cc: Phillip Susi, Jeff King, Junio C Hamano
If git rebase --merge encountered a conflict, --skip would not work if the
next commit also conflicted. The msgnum file would never be updated with
the new patch number, so no patch would actually be skipped, resulting in an
inescapable loop.
Update the msgnum file's value as the first thing in call_merge. This also
avoids an "Already applied" message when skipping a commit. There is no
visible change for the other contexts in which call_merge is invoked, as the
msgnum file's value remains unchanged in those situations.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
git-rebase--merge.sh | 5 +++--
t/t3402-rebase-merge.sh | 15 +++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 6d77b3c..d3fb67d 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -53,11 +53,12 @@ continue_merge () {
}
call_merge () {
- cmt="$(cat "$state_dir/cmt.$1")"
+ msgnum="$1"
+ echo "$msgnum" >"$state_dir/msgnum"
+ cmt="$(cat "$state_dir/cmt.$msgnum")"
echo "$cmt" > "$state_dir/current"
hd=$(git rev-parse --verify HEAD)
cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
- msgnum=$(cat "$state_dir/msgnum")
eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
eval GITHEAD_$hd='$onto_name'
export GITHEAD_$cmt GITHEAD_$hd
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index be8c1d5..5a27ec9 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -33,6 +33,7 @@ test_expect_success setup '
tr "[a-z]" "[A-Z]" <original >newfile &&
git add newfile &&
git commit -a -m"side edits further." &&
+ git branch second-side &&
tr "[a-m]" "[A-M]" <original >newfile &&
rm -f original &&
@@ -41,6 +42,7 @@ test_expect_success setup '
git branch test-rebase side &&
git branch test-rebase-pick side &&
git branch test-reference-pick side &&
+ git branch test-conflicts side &&
git checkout -b test-merge side
'
@@ -138,4 +140,17 @@ test_expect_success 'rebase -s funny -Xopt' '
test -f funny.was.run
'
+test_expect_success 'rebase --skip works with two conflicts in a row' '
+ git checkout second-side &&
+ tr "[A-Z]" "[a-z]" <newfile >tmp &&
+ mv tmp newfile &&
+ git commit -a -m"edit conflicting with side" &&
+ tr "[d-f]" "[D-F]" <newfile >tmp &&
+ mv tmp newfile &&
+ git commit -a -m"another edit conflicting with side" &&
+ test_must_fail git rebase --merge test-conflicts &&
+ test_must_fail git rebase --skip &&
+ git rebase --skip
+'
+
test_done
--
2.0.0
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] How to keep a project's canonical history correct.
2014-05-09 21:05 1% ` Junio C Hamano
@ 2014-05-10 4:01 0% ` Stephen & Linda Smith
1 sibling, 0 replies; 200+ results
From: Stephen & Linda Smith @ 2014-05-10 4:01 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Friday, May 09, 2014 02:05:44 PM Junio C Hamano wrote:
> I needed a few tweaks on top while queuing. You will find the
> result on 'pu' after I push it out.
>
> In addition to one typofix ("because" lacking "c"), here are what I
> did:
>
> - Typeset concrete command e.g. `git pull` in monospace.
>
> - The second and subsequent paragraphs continued with "+" need to
> be flushed to the left; leaving them indented will format them in
> monospace (see "with `git pull --rebase` or something").
>
> - Be more explicit in describing 'trunk' being 'the first-parent
> chain' in the text.
>
> - Refer to a newer article that discusses this exact topic.
>
> - De-emphasize 'fix-bug-12345' in "Merge fix-bug-12345" log message.
>
> - Describe what the final history illustration shows.
>
>
> Unless you have objections to the below (or suggestions for better
> alternatives), there is no need to resend the patch.
>
I like the changes.
^ permalink raw reply [relevance 0%]
* Re: [PATCH] How to keep a project's canonical history correct.
@ 2014-05-09 21:05 1% ` Junio C Hamano
2014-05-10 4:01 0% ` Stephen & Linda Smith
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2014-05-09 21:05 UTC (permalink / raw)
To: Stephen P. Smith; +Cc: git
"Stephen P. Smith" <ischis2@cox.net> writes:
> During the mail thread about "Pull is mostly evil" a user asked how
> the first parent could become reversed.
>
> This howto explains how the first parent can get reversed when viewed
> by the project and then explains a method to keep the history correct.
>
> Signed-off-by: Stephen P. Smith <ischis2@cox.net>
> ---
I needed a few tweaks on top while queuing. You will find the
result on 'pu' after I push it out.
In addition to one typofix ("because" lacking "c"), here are what I
did:
- Typeset concrete command e.g. `git pull` in monospace.
- The second and subsequent paragraphs continued with "+" need to
be flushed to the left; leaving them indented will format them in
monospace (see "with `git pull --rebase` or something").
- Be more explicit in describing 'trunk' being 'the first-parent
chain' in the text.
- Refer to a newer article that discusses this exact topic.
- De-emphasize 'fix-bug-12345' in "Merge fix-bug-12345" log message.
- Describe what the final history illustration shows.
Unless you have objections to the below (or suggestions for better
alternatives), there is no need to resend the patch.
Thanks.
diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt
index 5979a79..35d48ef 100644
--- a/Documentation/howto/keep-canonical-history-correct.txt
+++ b/Documentation/howto/keep-canonical-history-correct.txt
@@ -38,12 +38,12 @@ central repository:
---o---o---A---X---Y---Z
------------
-Now, if you "git push" at this point, beause your history that leads
+Now, if you `git push` at this point, because your history that leads
to `C` lacks `X`, `Y` and `Z`, it will fail. You need to somehow make
the tip of your history a descendant of `Z`.
One suggested way to solve the problem is "fetch and then merge", aka
-"git pull". When you fetch, your repository will have a history like
+`git pull`. When you fetch, your repository will have a history like
this:
------------
@@ -65,8 +65,9 @@ you will create a merge `M` and make the history look like this:
repository. Such a merge `M` does not lose any commit in both
histories, so in that sense it may not be wrong, but when people want
to talk about "the authoritative canonical history that is shared
-among the project participants", i.e. "the trunk", the way they often
-use is to do:
+among the project participants", i.e. "the trunk", they often view
+it as "commits you see by following the first-parent chain", and use
+this command to view it:
------------
$ git log --first-parent
@@ -91,11 +92,11 @@ did `X` and then `Y` and then `Z` and merged a change that consists of
two commits `B` and `C` that achieves a single goal. You may have
worked on fixing the bug #12345 with these two patches, and the merge
`M'` with swapped parents can say in its log message "Merge
-'fix-bug-12345'". Having a way to tell "git pull" to create a merge
+fix-bug-12345". Having a way to tell `git pull` to create a merge
but record the parents in reverse order may be a way to do so.
Note that I said "achieves a single goal" above, because this is
-important. "swapping the merge order" only covers a special case
+important. "Swapping the merge order" only covers a special case
where the project does not care too much about having unrelated
things done on a single merge but cares a lot about first-parent
chain.
@@ -111,7 +112,7 @@ There are multiple schools of thought about the "trunk" management.
---o---o---A---X---Y---Z---B---C
------------
+
- with `git pull --rebase` or something.
+with `git pull --rebase` or something.
2. Some projects tolerate merges in their history, but do not worry
too much about the first-parent order, and allow fast-forward
@@ -190,7 +191,7 @@ and push it back to the central repository.
It is very much possible that while you are merging topic-b and
topic-c, somebody again advanced the history in the central repository
-to put `W` on top of `Z`, and make your "git push" fail.
+to put `W` on top of `Z`, and make your `git push` fail.
In such a case, you would rewind to discard `M` and `N`, update the
tip of your 'master' again and redo the two merges:
@@ -202,6 +203,8 @@ tip of your 'master' again and redo the two merges:
$ git merge topic-c
------------
+The procedure will result in a history that looks like this:
+
------------
C0--C1--------------C2
/ \
@@ -210,4 +213,4 @@ tip of your 'master' again and redo the two merges:
B0--B1---------B2
------------
-See http://git-blame.blogspot.com/2012/03/fun-with-first-parent.html
+See also http://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html
^ permalink raw reply related [relevance 1%]
* Re: How to keep a project's canonical history correct.
@ 2014-05-08 18:37 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-05-08 18:37 UTC (permalink / raw)
To: Stephen P. Smith; +Cc: git
"Stephen P. Smith" <ischis2@cox.net> writes:
> During the mail thread about "Pull is mostly evil" a user asked how
> the first parent could become reversed.
>
> This howto explains how the first parent can get reversed when viewed
> by the project and then explains a method to keep the history correct.
>
> Signed-off-by: Stephen P. Smith <ischis2@cox.net>
> ---
Thanks. There are a few nitpicks though, most of them what I should
have done when I wrote the original before sending it out ;-)
> Documentation/Makefile | 1 +
> .../howto/keep-canonical-history-correct.txt | 207 +++++++++++++++++++++
> 2 files changed, 208 insertions(+)
> create mode 100644 Documentation/howto/keep-canonical-history-correct.txt
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index fc6b2cf..cea0e7a 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -59,6 +59,7 @@ SP_ARTICLES += howto/recover-corrupted-blob-object
> SP_ARTICLES += howto/recover-corrupted-object-harder
> SP_ARTICLES += howto/rebuild-from-update-hook
> SP_ARTICLES += howto/rebase-from-internal-branch
> +SP_ARTICLES += howto/keep-canonical-history-correct
> SP_ARTICLES += howto/maintain-git
> API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
> SP_ARTICLES += $(API_DOCS)
> diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt
> new file mode 100644
> index 0000000..dd310ea
> --- /dev/null
> +++ b/Documentation/howto/keep-canonical-history-correct.txt
> @@ -0,0 +1,207 @@
> +From: Junio C Hamano <gitster@pobox.com>
> +Date: Wed, 07 May 2014 13:15:39 -0700
> +Subject: Beginner question on "Pull is mostly evil"
> +Abstract: This how-to explains a method for keeping a project's history correct when using git pull.
> +Content-type: text/asciidoc
Please keep the Message-ID: from the original; people can find the
original discussion more easily that way.
Also, wrap long lines of Abstract (see revert-branch-rebase.txt for
an example).
> +Keep authoritative canonical history correct with git pull
> +==========================================================
> +
We may want to have an introductory sentence before this "Suppose"
to set the scene, so that readers would be prepared to read about
the workflow that uses a central repository for everybody to meet.
> +Suppose that that central repository has this history:
> +
> +------------
> + ---o---o---A
> +------------
> +
> +which ends at commit A (time flows from left to right and each node in
> +the graph is a commit, lines between them indicating parent-child
> +relationship).
> +
> +Then you clone it and work on your own commits, which leads you to
> +have this in *your* repository:
s/this/this history/ perhaps.
> +
> +------------
> + ---o---o---A---B---C
> +------------
> +
> +Imagine your coworker did the same and built on top of A in *his*
> +repository this history in the meantime, and then pushed it to the
> +central repository:
> +
> +------------
> + ---o---o---A---X---Y---Z
> +------------
> +
> +Now, if you "git push" at this point, beause your history that leads
> +to C lack X, Y and Z, it will fail. You need to somehow make the
s/lack/lacks/
As this is no longer a plain text, you probably want `C`, `X`, etc.,
to typeset these commit markers in fixed width.
> +tip of your history a descendant of Z.
> +
> +One suggested way to solve the problem is "fetch and then merge".
s/\.$/, aka "git pull"./
> +If you fetch, your repository will have a history like this:
s/If/When/
> +------------
> + ---o---o---A---B---C
> + \
> + X---Y---Z
> +------------
> +
> +And then if you did merge after that, while still on *your* branch,
> +i.e. C, you will create a merge M and make the history look like
> +this:
s/did/run/ perhaps. The past tense there feels wrong.
> +
> +------------
> + ---o---o---A---B---C---M
> + \ /
> + X---Y---Z
> +------------
> +
> +M is a descendant of Z, so you can push to update the central
> +repository. Such a merge M does not lose any commit in both
> +histories, so in that sense it may not be wrong, but when people
> +would want to talk about "the authoritative canonical history that
s/would want/want/; I have a bad habit of overusing "would".
> +is shared among the project participants", i.e. "the trunk", the way
> +they often use is to do:
> +
> +------------
> + $ git log --first-parent
> +------------
> +
> +For all other people who observed the central repository after your
> +coworker pushed Z but before you pushed M, the commit on the trunk
> +used to be "o-o-A-X-Y-Z". But because you made M while you were on
As this is no longer a plain text, you probably want `o-o-A-X-Y-Z`
(not dq, but bq) to typeset them in fixed width in AsciiDoc. Same
for X-Y-Z below.
> +C, M's first parent is C, so by pushing M to advance the central
> +repository, you made X-Y-Z a side branch, not on the trunk.
> +
> +You would rather want to have a history of this shape:
> +
> +------------
> + ---o---o---A---X---Y---Z---M'
> + \ /
> + B-----------C
> +------------
> +
> +so that in the first-parent chain, it is clear that the project
> +first did X and then Y and then Z and merged a change that consists
> +of two commits B and C that achieves a single goal. You may have
> +worked on fixing the bug #12345 with these two patches, and the
> +merge M' with swapped parents can say in its log message "Merge
> +'fix-bug-12345'".
Add something like this at the end of that paragraph:
Having a way to tell "git pull" to create a merge but record the
parents in reverse order may be a way to do so.
It was obvious to the original questioner who did read the recent
"pull is mostly evil" thread, which is why I did not say it in the
original, but it is necessary for the readers of this document where
they lack the context. Otherwise it would not be apparent to them
what "swapping the merge order" below refers to.
> +Note that I said "achieves a single goal" above, because this is
> +important. "swapping the merge order" only covers a special case
> +where the project does not care too much about having unrelated
> +things done on a single merge but cares a lot about first-parent
> +chain.
> +
> +There are multiple schools of thought about the "trunk" management.
I have not tried to format it myself, but does the following 1. 2. 3.
(all pre-indented already) format correctly when passed to AsciiDoc?
I suspect the text may all shown in fixed width, which would not be
what we want.
> + 1. Some projects want to keep a completely linear history without
> + any merges. Obviously, swapping the merge order would not help
> + their taste. You would need to flatten your history on top of
s/help/match/ or something.
> + the updated upstream to result in a history of this shape
> + instead:
> ++
> +------------
> + ---o---o---A---X---Y---Z---B---C
> +------------
> ++
> + with "git pull --rebase" or something.
Use `git pull --rebase` (i.e. not dq but bq) here, too.
> + 2. Some projects tolerate merges in their history, but do not worry
> + too much about the first-parent order, and allows fast-forward
> + merges. To them, swapping the merge order does not hurt, but
> + it is unnecessary.
> +
> + 3. Some projects want each commit on the "trunk" to do one single
> + thing. The output of "git log --first-parent" in such a project
> + would show either a merge of a side branch that completes a
> + single theme, or a single commit that completes a single theme
> + by itself. If your two commits B and C (or they may even be two
> + groups of commits) were solving two independent issues, then the
> + merge M' we made in the earlier example by swapping the merge
> + order is still not up to the project standard. It merges two
> + unrelated efforts B and C at the same time.
Likewise for `git log --first-parent`, `B`, `C, and `M'`; they all
want to be typeset in fixed width.
> +For projects in the last category (git itself is one of them),
s/git/Git/ as we seem to prefer that spelling these days when
talking about the project.
> +individual developers would want to prepare a history more like
> +this:
> +
> +------------
> + C0--C1--C2 topic-c
> + /
> + ---o---o---A master
> + \
> + B0--B1--B2 topic-b
> +------------
> +
> +That is, keeping separate topics on separate branches, perhaps like
> +so:
> +
> +------------
> + $ git clone $URL work && cd work
> + $ git checkout -b topic-b master
> + $ ... work to create B0, B1 and B2 to complete one theme
> + $ git checkout -b topic-c master
> + $ ... same for the theme of topic-c
> +------------
> +
> +And then
> +
> +------------
> + $ git checkout master
> + $ git pull --ff-only
> +------------
> +
> +would grab X, Y and Z from the upstream and advance your master
> +branch:
> +
> +------------
> + C0--C1--C2
> + /
> + ---o---o---A---X---Y---Z
> + \
> + B0--B1--B2
> +------------
We may want to have the topic-c/master/topic-b branch labels like
the previous picture here.
> +And then you would merge these two branches separately:
> +
> +------------
> + $ git merge topic-b
> + $ git merge topic-c
> +------------
> +
> +to result in
> +
> +------------
> + C0--C1---------C2
> + / \
> + ---o---o---A---X---Y---Z---M---N
> + \ /
> + B0--B1-----B2
> +------------
> +
> +and push it back to the central repository.
> +
> +It is very much possible that while you are merging topic-b and
> +topic-c, somebody again advanced the history in the central
> +repository to put W on top of Z, and make your "git push" fail.
> +
> +In such a case, you would rewind to discard M and N, update the tip
> +of your 'master' again and redo the two merges:
> +
> +------------
> + $ git reset --hard origin/master
> + $ git pull --ff-only
> + $ git merge topic-b
> + $ git merge topic-c
> +------------
> +
> +------------
> + C0--C1--------------C2
> + / \
> + ---o---o---A---X---Y---Z---W---M'--N
> + \ /
> + B0--B1---------B2
> +------------
I failed to do so in the original, but the final merge should be
labeled as N' (with prime), just like M turned into M', to denote
that they are different commits from their counterparts in the
orignal history.
Thanks.
^ permalink raw reply [relevance 0%]
* Re: Beginner question on "Pull is mostly evil"
@ 2014-05-07 20:15 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2014-05-07 20:15 UTC (permalink / raw)
To: Jim Garrison; +Cc: git@vger.kernel.org
Jim Garrison <jim.garrison@nwea.org> writes:
> During my initial self-education I came across the maxim "don't
> pull, fetch+merge instead" and have been doing that. I think I
> followed most of the "pull is (mostly) evil" discussion but one
> facet still puzzles me: the idea that pull will do a merge "in the
> wrong direction" sometimes.
[administrivia: wrap your lines to reasonable length like ~70 cols,
please]
> Do I understand correctly that this occurs only in the presence of
> multiple remotes?
No. This is most often true for people who use a single repository
as a place for everybody to meet, in the same way as SVN.
Suppose that that central repository has this history:
---o---o---A
which ends at commit A (time flows from left to right and each node
in the graph is a commit, lines between them indicating parent-child
relationship).
Then you clone it and work on your own commits, which leads you to
have this in *your* repository:
---o---o---A---B---C
Imagine your coworker did the same and built on top of A in *his*
repository this history in the meantime, and then pushed it to the
central repository:
---o---o---A---X---Y---Z
Now, if you "git push" at this point, beause your history that leads
to C lack X, Y and Z, it will fail. You need to somehow make the
tip of your history a descendant of Z.
One way that "mostly evil" thread discusses is to "pull", which is
"fetch and then merge" (note that I am saying "don't pull, instead
fetch and merge" is not an advice to solve "pull is mostly evil"
issue at all). If you fetch, your repository will have a history
like this:
---o---o---A---B---C
\
X---Y---Z
And then if you did merge after that, while still on *your* branch,
i.e. C, you will create a merge M and make the history look like
this:
---o---o---A---B---C---M
\ /
X---Y---Z
M is a descendant of Z, so you can push to update the central
repository. Such a merge M does not lose any commit in both
histories, so in that sense it may not be wrong, but when people
would want to talk about "the authoritative canonical history that
is shared among the project participants", i.e. "the trunk", the way
they often use is to do:
$ git log --first-parent
For all other people who observed the central repository after your
coworker pushed Z but before you pushed M, the commit on the trunk
used to be "o-o-A-X-Y-Z". But because you made M while you were on
C, M's first parent is C, so by pushing M to advance the central
repository, you made X-Y-Z a side branch, not on the trunk.
You would rather want to have a history of this shape:
---o---o---A---X---Y---Z---M'
\ /
B-----------C
so that in the first-parent chain, it is clear that the project
first did X and then Y and then Z and merged a change that consists
of two commits B and C that achieves a single goal. You may have
worked on fixing the bug #12345 with these two patches, and the
merge M' with swapped parents can say in its log message "Merge
'fix-bug-12345'".
Note that I said "achieves a single goal" above, because this is
important. "swapping the merge order" only covers a special case
where the project does not care too much about having unrelated
things done on a single merge but cares a lot about first-parent
chain.
There are multiple schools of thought about the "trunk" management.
1. Some projects want to keep a completely linear history without
any merges. Obviously, swapping the merge order would not help
their taste. You would need to flatten your history on top of
the updated upstream to result in a history of this shape
instead:
---o---o---A---X---Y---Z---B---C
with "git pull --rebase" or something.
2. Some projects tolerate merges in their history, but do not worry
too much about the first-parent order, and allows fast-forward
merges. To them, swapping the merge order does not hurt, but
it is unnecessary.
3. Some projects want each commit on the "trunk" to do one single
thing. The output of "git log --first-parent" in such a project
would show either a merge of a side branch that completes a
single theme, or a single commit that completes a single theme
by itself. If your two commits B and C (or they may even be two
groups of commits) were solving two independent issues, then the
merge M' we made in the earlier example by swapping the merge
order is still not up to the project standard. It merges two
unrelated efforts B and C at the same time.
For projects in the last category (git itself is one of them),
individual developers would want to prepare a history more like
this:
C0--C1--C2 topic-c
/
---o---o---A master
\
B0--B1--B2 topic-b
That is, keeping separate topics on separate branches, perhaps like
so:
$ git clone $URL work && cd work
$ git checkout -b topic-b master
$ ... work to create B0, B1 and B2 to complete one theme
$ git checkout -b topic-c master
$ ... same for the theme of topic-c
And then
$ git checkout master
$ git pull --ff-only
would grab X, Y and Z from the upstream and advance your master
branch:
C0--C1--C2
/
---o---o---A---X---Y---Z
\
B0--B1--B2
And then you would merge these two branches separately:
$ git merge topic-b
$ git merge topic-c
to result in
C0--C1---------C2
/ \
---o---o---A---X---Y---Z---M---N
\ /
B0--B1-----B2
and push it back to the central repository.
It is very much possible that while you are merging topic-b and
topic-c, somebody again advanced the history in the central
repository to put W on top of Z, and make your "git push" fail.
In such a case, you would rewind to discard M and N, update the tip
of your 'master' again and redo the two merges:
$ git reset --hard origin/master
$ git pull --ff-only
$ git merge topic-b
$ git merge topic-c
C0--C1--------------C2
/ \
---o---o---A---X---Y---Z---W---M'--N
\ /
B0--B1---------B2
So one part of the solution to "pull is mostly evil" has to involve
making this "recreating your work on top of the updated upstream"
easier for users. Otherwise, even if people *know* that rewinding
and rebuilding is the right thing to do, they will find it too
cumbersome and end up pushing merges in random order.
For another way to put this, see
http://git-blame.blogspot.com/2012/03/fun-with-first-parent.html
HTH.
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Git v1.9.2
@ 2014-04-09 21:59 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-04-09 21:59 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest maintenance release Git v1.9.2 is now available at
the usual places.
The release tarballs are found at:
http://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the v1.9.2
tag and the maint branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
The http://code.google.com/p/git-core/downloads/ site no longer
accepts new tarballs for download; while the older release tarballs
are still there, this one (and future ones) will not be.
Git v1.9.2 Release Notes
========================
Fixes since v1.9.1
------------------
* Documentation and in-code comments had many instances of mistaken
use of "nor", which have been corrected.
* "git fetch --prune", when the right-hand-side of multiple fetch
refspecs overlap (e.g. storing "refs/heads/*" to
"refs/remotes/origin/*", while storing "refs/frotz/*" to
"refs/remotes/origin/fr/*"), aggressively thought that lack of
"refs/heads/fr/otz" on the origin site meant we should remove
"refs/remotes/origin/fr/otz" from us, without checking their
"refs/frotz/otz" first.
Note that such a configuration is inherently unsafe (think what
should happen when "refs/heads/fr/otz" does appear on the origin
site), but that is not a reason not to be extra careful.
* "git update-ref --stdin" did not fail a request to create a ref
when the ref already existed.
* "git diff --no-index -Mq a b" fell into an infinite loop.
* When it is not necessary to edit a commit log message (e.g. "git
commit -m" is given a message without specifying "-e"), we used to
disable the spawning of the editor by overriding GIT_EDITOR, but
this means all the uses of the editor, other than to edit the
commit log message, are also affected.
* "git status --porcelain --branch" showed its output with labels
"ahead/behind/gone" translated to the user's locale.
* "git mv" that moves a submodule forgot to adjust the array that
uses to keep track of which submodules were to be moved to update
its configuration.
* Length limit for the pathname used when removing a path in a deep
subdirectory has been removed to avoid buffer overflows.
* The test helper lib-terminal always run an actual test_expect_*
when included, which screwed up with the use of skil-all that may
have to be done later.
* "git index-pack" used a wrong variable to name the keep-file in an
error message when the file cannot be written or closed.
* "rebase -i" produced a broken insn sheet when the title of a commit
happened to contain '\n' (or ended with '\c') due to a careless use
of 'echo'.
* There were a few instances of 'git-foo' remaining in the
documentation that should have been spelled 'git foo'.
* Serving objects from a shallow repository needs to write a
new file to hold the temporary shallow boundaries but it was not
cleaned when we exit due to die() or a signal.
* When "git stash pop" stops after failing to apply the stash
(e.g. due to conflicting changes), the stash is not dropped. State
that explicitly in the output to let the users know.
* The labels in "git status" output that describe the nature of
conflicts (e.g. "both deleted") were limited to 20 bytes, which was
too short for some l10n (e.g. fr).
----------------------------------------------------------------
Changes since v1.9.1 are as follows:
Aman Gupta (1):
update-ref: fail create operation over stdin if ref already exists
Benoit Pierre (7):
merge hook tests: fix missing '&&' in test
merge hook tests: use 'test_must_fail' instead of '!'
test patch hunk editing with "commit -p -m"
commit: fix patch hunk editing with "commit -p -m"
merge: fix GIT_EDITOR override for commit hook
merge hook tests: fix and update tests
run-command: mark run_hook_with_custom_index as deprecated
Carlos Martín Nieto (2):
fetch: add a failing test for prunning with overlapping refspecs
fetch: handle overlaping refspecs on --prune
Jeff King (6):
shallow: use stat_validity to check for up-to-date file
shallow: automatically clean up shallow tempfiles
t/lib-terminal: make TTY a lazy prerequisite
shallow: verify shallow file after taking lock
date: recognize bogus FreeBSD gmtime output
t4212: loosen far-in-future test for AIX
John Keeping (1):
builtin/mv: fix out of bounds write
Jonathan Nieder (2):
wt-status: extract the code to compute width for labels
wt-status: i18n of section labels
Junio C Hamano (8):
stash pop: mention we did not drop the stash upon failing to apply
wt-status: make full label string to be subject to l10n
wt-status: lift the artificual "at least 20 columns" floor
index-pack: report error using the correct variable
diff-no-index: correctly diagnose error return from diff_opt_parse()
Start preparing for 1.9.1
Update draft release notes to 1.9.2
Git 1.9.2
Justin Lebar (4):
Documentation: fix misuses of "nor"
contrib: fix misuses of "nor"
comments: fix misuses of "nor"
code and test: fix misuses of "nor"
Matthieu Moy (1):
status: disable translation when --porcelain is used
Michael Haggerty (2):
checkout_entry(): use the strbuf throughout the function
entry.c: fix possible buffer overflow in remove_subtree()
Ramkumar Ramachandra (1):
Documentation/merge-strategies: avoid hyphenated commands
Thomas Ackermann (1):
doc/http-backend: missing accent grave in literal mark-up
Uwe Storbeck (2):
rebase -i: do not "echo" random user-supplied strings
test-lib.sh: do not "echo" caller-supplied strings
brian m. carlson (1):
mv: prevent mismatched data when ignoring errors.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2014, #07; Fri, 28)
@ 2014-03-28 22:21 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-03-28 22:21 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
More topics merged to 'master', many of which are fallouts from GSoC
microprojects.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ah/doc-gitk-config (2014-03-20) 1 commit
(merged to 'next' on 2014-03-20 at d671b60)
+ Documentation/gitk: document the location of the configulation file
* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
(merged to 'next' on 2014-03-21 at 916b759)
+ rebase: allow "-" short-hand for the previous branch
"git rebase" learned to interpret a lone "-" as "@{-1}", the
branch that we were previously on.
* bp/commit-p-editor (2014-03-18) 7 commits
(merged to 'next' on 2014-03-21 at 23b6b06)
+ run-command: mark run_hook_with_custom_index as deprecated
+ merge hook tests: fix and update tests
+ merge: fix GIT_EDITOR override for commit hook
+ commit: fix patch hunk editing with "commit -p -m"
+ test patch hunk editing with "commit -p -m"
+ merge hook tests: use 'test_must_fail' instead of '!'
+ merge hook tests: fix missing '&&' in test
When it is not necessary to edit a commit log message (e.g. "git
commit -m" is given a message without specifying "-e"), we used to
disable the spawning of the editor by overriding GIT_EDITOR, but
this means all the uses of the editor, other than to edit the
commit log message, are also affected.
* fr/add-interactive-argv-array (2014-03-18) 1 commit
(merged to 'next' on 2014-03-20 at 9d65f3d)
+ add: use struct argv_array in run_add_interactive()
* jk/pack-bitmap (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at bba6246)
+ pack-objects: turn off bitmaps when skipping objects
Instead of dying when asked to (re)pack with the reachability
bitmap when a bitmap cannot be built, just (re)pack without
producing a bitmap in such a case, with a warning.
* jk/pack-bitmap-progress (2014-03-17) 2 commits
(merged to 'next' on 2014-03-20 at c7a83f9)
+ pack-objects: show reused packfile objects in "Counting objects"
+ pack-objects: show progress for reused packfiles
The progress output while repacking and transferring objects showed
an apparent large silence while writing the objects out of existing
packfiles, when the reachability bitmap was in use.
* jk/subtree-prefix (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 81367fa)
+ subtree: initialize "prefix" variable
A stray environment variable $prefix could have leaked into and
affected the behaviour of the "subtree" script.
* ys/fsck-commit-parsing (2014-03-19) 2 commits
(merged to 'next' on 2014-03-21 at 2728983)
+ fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
+ fsck.c:fsck_ident(): ident points at a const string
--------------------------------------------------
[New Topics]
* jc/apply-ignore-whitespace (2014-03-26) 1 commit
- apply --ignore-space-change: lines with and without leading whitespaces do not match
An RFC. "--ignore-space-change" option of "git apply" ignored the
spaces at the beginning of line too aggressively, which is
inconsistent with the option of the same name "diff" and "git diff"
have.
Will hold.
* jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits
- parse-options: make sure argh string does not have SP or _
- update-index: teach --cacheinfo a new syntax "mode,sha1,path"
- parse-options: multi-word argh should use dash to separate words
(this branch uses ib/rev-parse-parseopt-argh.)
Make sure that the help text given to describe the "<param>" part
of the "git cmd --option=<param>" does not contain SP or _,
e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
as "--gpg-sign=<key id>".
Will merge to 'next'.
* jk/commit-dates-parsing-fix (2014-03-26) 1 commit
- t4212: loosen far-in-future test for AIX
I think we agreed that a simpler test would be a better way
forward.
* mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit
- MSVC: link in invalidcontinue.obj for better POSIX compatibility
Will merge to 'next'.
* mr/msvc-link-with-lcurl (2014-03-27) 1 commit
(merged to 'next' on 2014-03-28 at 3281dab)
+ MSVC: allow linking with the cURL library
Will merge to 'master'.
* wt/doc-submodule-name-path-confusion-1 (2014-03-27) 1 commit
(merged to 'next' on 2014-03-28 at 225f241)
+ doc: submodule.* config are keyed by submodule names
Will merge to 'master'.
* wt/doc-submodule-name-path-confusion-2 (2014-03-27) 1 commit
(merged to 'next' on 2014-03-28 at ec5bcf3)
+ doc: submodule.*.branch config is keyed by name
Will merge to 'master'.
* ep/shell-command-substitution (2014-03-25) 2 commits
(merged to 'next' on 2014-03-28 at 99a512a)
+ git-am.sh: use the $(...) construct for command substitution
+ check-builtins.sh: use the $(...) construct for command substitution
Will merge to 'master'.
--------------------------------------------------
[Stalled]
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
RFC. This latest round clashes with the kb/fast-hashmap topic in
'master'.
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit.
Still under discussion among Windows folks. A failure report
exists ($gmane/245170).
* bc/blame-crlf-test (2014-02-18) 1 commit
- blame: add a failing test for a CRLF issue.
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying attention to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
- hashmap.h: make sure map entries are tightly packed
I am inclined to drop this; an alternative is to replace it with
the "more portable" one that uses #pragma, which I am willing to
try doing so on 'pu', though.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* hv/submodule-ignore-fix (2013-12-06) 4 commits
- disable complete ignorance of submodules for index <-> HEAD diff
- always show committed submodules in summary after commit
- teach add -f option for ignored submodules
- fix 'git add' to skip submodules configured as ignored
Teach "git add" to be consistent with "git status" when changes to
submodules are set to be ignored, to avoid surprises after checking
with "git status" to see there isn't any change to be further added
and then see that "git add ." adds changes to them.
I think a reroll is coming, so this may need to be replaced, but I
needed some practice with heavy conflict resolution. It conflicts
with two changes to "git add" that have been scheduled for Git 2.0
quite badly, and I think I got the resolution right this time.
Waiting for a reroll.
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
this topic conflicts with.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/format-patch (2013-04-22) 2 commits
- format-patch: --inline-single
- format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jk/tests-cleanup (2014-03-21) 12 commits
(merged to 'next' on 2014-03-26 at 4a72b49)
+ t0001: drop subshells just for "cd"
+ t0001: drop useless subshells
+ t0001: use test_must_fail
+ t0001: use test_config_global
+ t0001: use test_path_is_*
+ t0001: make symlink reinit test more careful
+ t: prefer "git config --file" to GIT_CONFIG
+ t: prefer "git config --file" to GIT_CONFIG with test_must_fail
+ t: stop using GIT_CONFIG to cross repo boundaries
+ t: drop useless sane_unset GIT_* calls
+ t/test-lib: drop redundant unset of GIT_CONFIG
+ t/Makefile: stop setting GIT_CONFIG
(this branch uses dt/tests-with-env-not-subshell.)
Will merge to 'master'.
* ca/doc-config-third-party (2014-03-21) 1 commit
(merged to 'next' on 2014-03-25 at 731e011)
+ config.txt: third-party tools may and do use their own variables
Will merge to 'master'.
* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit
(merged to 'next' on 2014-03-25 at 2683eb6)
+ doc: status, remove leftover statement about '#' prefix
Will merge to 'master'.
* js/userdiff-cc (2014-03-21) 10 commits
(merged to 'next' on 2014-03-25 at 8c0e585)
+ userdiff: have 'cpp' hunk header pattern catch more C++ anchor points
+ t4018: test cases showing that the cpp pattern misses many anchor points
+ t4018: test cases for the built-in cpp pattern
+ t4018: reduce test files for pattern compilation tests
+ t4018: convert custom pattern test to the new infrastructure
+ t4018: convert java pattern test to the new infrastructure
+ t4018: convert perl pattern tests to the new infrastructure
+ t4018: an infrastructure to test hunk headers
+ userdiff: support unsigned and long long suffixes of integer constants
+ userdiff: support C++ ->* and .* operators in the word regexp
Improves the pattern to match the hunk-header for C/C++.
Will merge to 'master'.
* dp/makefile-charset-lib-doc (2014-03-23) 1 commit
(merged to 'next' on 2014-03-25 at b32e3ad)
+ Makefile: describe CHARSET_LIB better
Will merge to 'master'.
* ib/rev-parse-parseopt-argh (2014-03-23) 2 commits
(merged to 'next' on 2014-03-25 at d9083ed)
+ t1502: protect runs of SPs used in the indentation
+ rev-parse --parseopt: option argument name hints
(this branch is used by jc/rev-parse-argh-dashed-multi-words.)
Teaches the "rev-parse --parseopt" mechanism used by scripted
Porcelains to parse command line options and give help text how to
supply argv-help (the placeholder string for an option parameter,
e.g. "key-id" in "--gpg-sign=<key-id>").
Will merge to 'master'.
* rs/pickaxe-i (2014-03-24) 10 commits
(merged to 'next' on 2014-03-25 at 3b6f21f)
+ pickaxe: simplify kwset loop in contains()
+ pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
+ pickaxe: move pickaxe() after pickaxe_match()
+ pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
+ pickaxe: honor -i when used with -S and --pickaxe-regex
+ t4209: use helper functions to test --author
+ t4209: use helper functions to test --grep
+ t4209: factor out helper function test_log_icase()
+ t4209: factor out helper function test_log()
+ t4209: set up expectations up front
Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
to be used together and work as expected to perform a pickaxe
search using case-insensitive regular expression matching.
Will merge to 'master'.
* an/branch-config-message (2014-03-24) 1 commit
(merged to 'next' on 2014-03-26 at 26f9741)
+ branch.c: install_branch_config: simplify if chain
Will merge to 'master'.
* as/grep-fullname-config (2014-03-20) 1 commit
(merged to 'next' on 2014-03-28 at 810a076)
+ grep: add grep.fullName config variable
Add a configuration variable to force --full-name to be default for
"git grep".
This may cause regressions on scripted users that do not expect
this new behaviour.
Will hold.
* nd/gc-aggressive (2014-03-17) 4 commits
- gc --aggressive: three phase repacking
- gc --aggressive: make --depth configurable
- pack-objects: support --keep
- environment.c: fix constness for odb_pack_keep()
* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
(merged to 'next' on 2014-03-25 at 19fe25f)
+ tests: use "env" to run commands with temporary env-var settings
(this branch is used by jk/tests-cleanup.)
Will merge to 'master'.
* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
(merged to 'next' on 2014-03-25 at 08efd68)
+ fsck: use bitwise-or assignment operator to set flag
Will merge to 'master'.
* mm/status-porcelain-format-i18n-fix (2014-03-26) 1 commit
(merged to 'next' on 2014-03-26 at 41680fc)
+ status: disable translation when --porcelain is used
Will merge to 'master'.
* ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit
(merged to 'next' on 2014-03-25 at a8cd922)
+ remote-hg: do not fail on invalid bookmarks
Will merge to 'master'.
* cn/fetch-prune-overlapping-destination (2014-03-26) 2 commits
(merged to 'next' on 2014-03-28 at 954513a)
+ fetch: handle overlaping refspecs on --prune
+ fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
Since I didn't get any responses to my earlier "Comments?", I ended
up reading it myself again and found a small leak, whose fix has
been squashed in to the tip commit.
Will merge to 'master'.
* nd/multiple-work-trees (2014-03-25) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
* ks/tree-diff-nway (2014-03-27) 19 commits
- combine-diff: speed it up, by using multiparent diff tree-walker directly
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
- Portable alloca for Git
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: diff_tree() should now be static
- tree-diff: remove special-case diff-emitting code for empty-tree cases
(merged to 'next' on 2014-03-25 at cfcbdac)
+ tree-diff: simplify tree_entry_pathcmp
+ tree-diff: show_path prototype is not needed anymore
+ tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
+ tree-diff: move all action-taking code out of compare_tree_entry()
+ tree-diff: don't assume compare_tree_entry() returns -1,0,1
(merged to 'next' on 2014-03-21 at d872679)
+ tree-diff: consolidate code for emitting diffs and recursion in one place
+ tree-diff: show_tree() is not needed
+ tree-diff: no need to pass match to skip_uninteresting()
+ tree-diff: no need to manually verify that there is no mode change for a path
+ combine-diff: move changed-paths scanning logic into its own function
+ combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* nd/log-show-linear-break (2014-03-25) 2 commits
(merged to 'next' on 2014-03-28 at ea4a8db)
+ log: add --show-linear-break to help see non-linear history
+ object.h: centralize object flag allocation
Attempts to show where a single-strand-of-pearls break in "git log"
output.
Will merge to 'master'.
* cc/interpret-trailers (2014-03-26) 12 commits
- trailers: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- Move lower case functions into wrapper.c
- trailer: process trailers from stdin and arguments
- trailers: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Mar 2014, #06; Tue, 25)
@ 2014-03-25 20:18 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-03-25 20:18 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
More topics merged to 'master', many of which are fallouts from GSoC
microprojects.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* bb/diff-no-index-dotdot (2014-03-19) 2 commits
(merged to 'next' on 2014-03-20 at 352f48c)
+ diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
+ diff-no-index: rename read_directory()
* cp/am-patch-format-doc (2014-03-17) 2 commits
(merged to 'next' on 2014-03-17 at 7437c77)
+ Documentation/git-am: typofix
(merged to 'next' on 2014-03-12 at 17c3ada)
+ Documentation/git-am: Document supported --patch-format options
* dm/configure-iconv-locale-charset (2014-03-11) 1 commit
(merged to 'next' on 2014-03-20 at 4443bfd)
+ configure.ac: link with -liconv for locale_charset()
* jk/lib-terminal-lazy (2014-03-14) 1 commit
(merged to 'next' on 2014-03-20 at 5de832f)
+ t/lib-terminal: make TTY a lazy prerequisite
The test helper lib-terminal always run an actual test_expect_* when
included, which screwed up with the use of skil-all that may have to
be done later.
* jk/mv-submodules-fix (2014-03-17) 2 commits
(merged to 'next' on 2014-03-17 at 7cae3b1)
+ mv: prevent mismatched data when ignoring errors.
+ builtin/mv: fix out of bounds write
"git mv" that moves a submodule forgot to adjust the array that
uses to keep track of which submodules were to be moved to update
its configuration.
* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits
(merged to 'next' on 2014-03-17 at 3f8e98e)
+ rev-list: disable object/refname ambiguity check with --stdin
+ cat-file: restore warn_on_object_refname_ambiguity flag
+ cat-file: fix a minor memory leak in batch_objects
+ cat-file: refactor error handling of batch_objects
* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits
(merged to 'next' on 2014-03-17 at 68cc994)
+ entry.c: fix possible buffer overflow in remove_subtree()
+ checkout_entry(): use the strbuf throughout the function
Length limit for the pathname used when removing a path in a deep
subdirectory has been removed to avoid buffer overflows.
* nd/commit-editor-cleanup (2014-02-25) 3 commits
(merged to 'next' on 2014-03-17 at 986605d)
+ commit: add --cleanup=scissors
+ wt-status.c: move cut-line print code out to wt_status_add_cut_line
+ wt-status.c: make cut_line[] const to shrink .data section a bit
"git commit --cleanup=<mode>" learned a new mode, scissors.
* nd/indent-fix-connect-c (2014-03-13) 1 commit
(merged to 'next' on 2014-03-17 at a109efc)
+ connect.c: SP after "}", not TAB
* nd/index-pack-error-message (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 4d722ac)
+ index-pack: report error using the correct variable
"git index-pack" used a wrong variable to name the keep-file in an
error message when the file cannot be written or closed.
* rr/doc-merge-strategies (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at d31f415)
+ Documentation/merge-strategies: avoid hyphenated commands
There were a few instances of 'git-foo' remaining in the
documentation that should have been spelled 'git foo'.
* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit
(merged to 'next' on 2014-03-20 at 2b7b95d)
+ t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync
* us/printf-not-echo (2014-03-18) 2 commits
(merged to 'next' on 2014-03-20 at 41205c8)
+ test-lib.sh: do not "echo" caller-supplied strings
+ rebase -i: do not "echo" random user-supplied strings
"rebase -i" produced a broken insn sheet when the title of a commit
happened to contain '\n' (or ended with '\c') due to a careless use
of 'echo'.
--------------------------------------------------
[New Topics]
* jk/tests-cleanup (2014-03-21) 12 commits
- t0001: drop subshells just for "cd"
- t0001: drop useless subshells
- t0001: use test_must_fail
- t0001: use test_config_global
- t0001: use test_path_is_*
- t0001: make symlink reinit test more careful
- t: prefer "git config --file" to GIT_CONFIG
- t: prefer "git config --file" to GIT_CONFIG with test_must_fail
- t: stop using GIT_CONFIG to cross repo boundaries
- t: drop useless sane_unset GIT_* calls
- t/test-lib: drop redundant unset of GIT_CONFIG
- t/Makefile: stop setting GIT_CONFIG
(this branch uses dt/tests-with-env-not-subshell.)
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
RFC. This latest round clashes with the kb/fast-hashmap topic in
'master'.
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit.
Still under discussion among Windows folks
* bc/blame-crlf-test (2014-02-18) 1 commit
- blame: add a failing test for a CRLF issue.
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying attention to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
- hashmap.h: make sure map entries are tightly packed
I am inclined to drop this; an alternative is to replace it with
the "more portable" one that uses #pragma, which I am willing to
try doing so on 'pu', though.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* hv/submodule-ignore-fix (2013-12-06) 4 commits
- disable complete ignorance of submodules for index <-> HEAD diff
- always show committed submodules in summary after commit
- teach add -f option for ignored submodules
- fix 'git add' to skip submodules configured as ignored
Teach "git add" to be consistent with "git status" when changes to
submodules are set to be ignored, to avoid surprises after checking
with "git status" to see there isn't any change to be further added
and then see that "git add ." adds changes to them.
I think a reroll is coming, so this may need to be replaced, but I
needed some practice with heavy conflict resolution. It conflicts
with two changes to "git add" that have been scheduled for Git 2.0
quite badly, and I think I got the resolution right this time.
Waiting for a reroll.
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
this topic conflicts with.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/format-patch (2013-04-22) 2 commits
- format-patch: --inline-single
- format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* ca/doc-config-third-party (2014-03-21) 1 commit
(merged to 'next' on 2014-03-25 at 731e011)
+ config.txt: third-party tools may and do use their own variables
Will merge to 'master'.
* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit
(merged to 'next' on 2014-03-25 at 2683eb6)
+ doc: status, remove leftover statement about '#' prefix
Will merge to 'master'.
* js/userdiff-cc (2014-03-21) 10 commits
(merged to 'next' on 2014-03-25 at 8c0e585)
+ userdiff: have 'cpp' hunk header pattern catch more C++ anchor points
+ t4018: test cases showing that the cpp pattern misses many anchor points
+ t4018: test cases for the built-in cpp pattern
+ t4018: reduce test files for pattern compilation tests
+ t4018: convert custom pattern test to the new infrastructure
+ t4018: convert java pattern test to the new infrastructure
+ t4018: convert perl pattern tests to the new infrastructure
+ t4018: an infrastructure to test hunk headers
+ userdiff: support unsigned and long long suffixes of integer constants
+ userdiff: support C++ ->* and .* operators in the word regexp
Improves the pattern to match the hunk-header for C/C++.
Will merge to 'master'.
* dp/makefile-charset-lib-doc (2014-03-23) 1 commit
(merged to 'next' on 2014-03-25 at b32e3ad)
+ Makefile: describe CHARSET_LIB better
Will merge to 'master'.
* ib/rev-parse-parseopt-argh (2014-03-24) 5 commits
- parse-options: make sure argh string does not have SP or _
- update-index: teach --cacheinfo a new syntax "mode,sha1,path"
- parse-options: multi-word argh should use dash to separate words
(merged to 'next' on 2014-03-25 at d9083ed)
+ t1502: protect runs of SPs used in the indentation
+ rev-parse --parseopt: option argument name hints
Teaches the "rev-parse --parseopt" mechanism used by scripted
Porcelains to parse command line options and give help text how to
supply argv-help (the placeholder string for an option parameter,
e.g. "key-id" in "--gpg-sign=<key-id>").
Will merge the bottom part to 'master'.
* rs/pickaxe-i (2014-03-24) 10 commits
(merged to 'next' on 2014-03-25 at 3b6f21f)
+ pickaxe: simplify kwset loop in contains()
+ pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
+ pickaxe: move pickaxe() after pickaxe_match()
+ pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
+ pickaxe: honor -i when used with -S and --pickaxe-regex
+ t4209: use helper functions to test --author
+ t4209: use helper functions to test --grep
+ t4209: factor out helper function test_log_icase()
+ t4209: factor out helper function test_log()
+ t4209: set up expectations up front
Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
to be used together and work as expected to perform a pickaxe
search using case-insensitive regular expression matching.
Will merge to 'master'.
* an/branch-config-message (2014-03-24) 1 commit
- branch.c: install_branch_config: simplify if chain
Will merge to 'next'.
* ah/doc-gitk-config (2014-03-20) 1 commit
(merged to 'next' on 2014-03-20 at d671b60)
+ Documentation/gitk: document the location of the configulation file
Will merge to 'master'.
* as/grep-fullname-config (2014-03-20) 1 commit
- grep: add grep.fullName config variable
Will merge to 'next'.
* fr/add-interactive-argv-array (2014-03-18) 1 commit
(merged to 'next' on 2014-03-20 at 9d65f3d)
+ add: use struct argv_array in run_add_interactive()
Will merge to 'master'.
* jk/pack-bitmap (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at bba6246)
+ pack-objects: turn off bitmaps when skipping objects
Instead of dying when asked to (re)pack with the reachability
bitmap when a bitmap cannot be built, just (re)pack without
producing a bitmap in such a case, with a warning.
Will merge to 'master', and probably to 'maint' later.
* jk/pack-bitmap-progress (2014-03-17) 2 commits
(merged to 'next' on 2014-03-20 at c7a83f9)
+ pack-objects: show reused packfile objects in "Counting objects"
+ pack-objects: show progress for reused packfiles
The progress output while repacking and transferring objects showed
an apparent large silence while writing the objects out of existing
packfiles, when the reachability bitmap was in use.
Will merge to 'master', and probably to 'maint' later.
* jk/subtree-prefix (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 81367fa)
+ subtree: initialize "prefix" variable
A stray environment variable $prefix could have leaked into and
affected the behaviour of the "subtree" script.
Will merge to 'master'.
* nd/gc-aggressive (2014-03-17) 4 commits
- gc --aggressive: three phase repacking
- gc --aggressive: make --depth configurable
- pack-objects: support --keep
- environment.c: fix constness for odb_pack_keep()
* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
(merged to 'next' on 2014-03-21 at 916b759)
+ rebase: allow "-" short-hand for the previous branch
Will merge to 'master'.
* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
(merged to 'next' on 2014-03-25 at 19fe25f)
+ tests: use "env" to run commands with temporary env-var settings
(this branch is used by jk/tests-cleanup.)
Will merge to 'master'.
* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
(merged to 'next' on 2014-03-25 at 08efd68)
+ fsck: use bitwise-or assignment operator to set flag
Will merge to 'master'.
* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits
- SQUASH??? fix decl-after-stmt and simplify
- status: disable translation when --porcelain is used
Will merge to 'next' after squashing in the fixup.
* ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit
(merged to 'next' on 2014-03-25 at a8cd922)
+ remote-hg: do not fail on invalid bookmarks
Will merge to 'master'.
* ys/fsck-commit-parsing (2014-03-19) 2 commits
(merged to 'next' on 2014-03-21 at 2728983)
+ fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
+ fsck.c:fsck_ident(): ident points at a const string
Will merge to 'master'.
* bp/commit-p-editor (2014-03-18) 7 commits
(merged to 'next' on 2014-03-21 at 23b6b06)
+ run-command: mark run_hook_with_custom_index as deprecated
+ merge hook tests: fix and update tests
+ merge: fix GIT_EDITOR override for commit hook
+ commit: fix patch hunk editing with "commit -p -m"
+ test patch hunk editing with "commit -p -m"
+ merge hook tests: use 'test_must_fail' instead of '!'
+ merge hook tests: fix missing '&&' in test
When it is not necessary to edit a commit log message (e.g. "git
commit -m" is given a message without specifying "-e"), we used to
disable the spawning of the editor by overriding GIT_EDITOR, but
this means all the uses of the editor, other than to edit the
commit log message, are also affected.
Will merge to 'master'.
* cn/fetch-prune-overlapping-destination (2014-03-24) 3 commits
- SQUASH??? style and leak fix
- fetch: handle overlaping refspecs on --prune
- fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
Since I didn't get any responses to my earlier "Comments?", I ended
up reading it myself again and found a small leak.
Hoping to be able to merge a fix for this issue soonish.
* nd/multiple-work-trees (2014-03-25) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
* ks/tree-diff-nway (2014-03-20) 19 commits
- combine-diff: speed it up, by using multiparent diff tree-walker directly
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
- Portable alloca for Git
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: diff_tree() should now be static
- tree-diff: remove special-case diff-emitting code for empty-tree cases
(merged to 'next' on 2014-03-25 at cfcbdac)
+ tree-diff: simplify tree_entry_pathcmp
+ tree-diff: show_path prototype is not needed anymore
+ tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
+ tree-diff: move all action-taking code out of compare_tree_entry()
+ tree-diff: don't assume compare_tree_entry() returns -1,0,1
(merged to 'next' on 2014-03-21 at d872679)
+ tree-diff: consolidate code for emitting diffs and recursion in one place
+ tree-diff: show_tree() is not needed
+ tree-diff: no need to pass match to skip_uninteresting()
+ tree-diff: no need to manually verify that there is no mode change for a path
+ combine-diff: move changed-paths scanning logic into its own function
+ combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* nd/log-show-linear-break (2014-03-20) 2 commits
- log: add --show-linear-break to help see non-linear history
- object.h: centralize object flag allocation
Attempts to show where a single-strand-of-pearls break in "git log"
output.
The implementation seems to have got worse compared to the previous
round. Will hold.
* cc/interpret-trailers (2014-03-07) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from stdin and arguments
- trailers: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
Will merge to 'next'.
--------------------------------------------------
[Discarded]
* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
. diff: simplify cpp funcname regex
Superceded.
* pw/branch-config-message (2014-03-13) 1 commit
. install_branch_config(): simplify verbose messages logic
Among the many attempts to microproject #8, this seemed to be the
most "done" among the table based ones; I however tend to think
that the original with minimum refactoring would be easier to read.
an/branch-config-message supersedes this topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Mar 2014, #05; Mon, 24)
@ 2014-03-24 20:27 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-03-24 20:27 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
More topics merged to 'master', some of which have been cooking
before the v1.9.0 final release, many of them fallouts from GSoC
microprojects. Many topics that have been marked to be discarded
are finally discarded.
There seems to be a crasher somewhere in the new pack bitmap
codepath that was introduced recently. I am hoping that the root
cause is found and fixed soonish. Other than that, things look more
or less calm on the 'next' and up.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
(merged to 'next' on 2014-03-14 at ff375fc)
+ skip_prefix(): scan prefix only once
Update implementation of skip_prefix() to scan only once; given
that most "prefix" arguments to the inline function are constant
strings whose strlen() can be determined at the compile time, this
might actually make things worse with a compiler with sufficient
intelligence.
* es/sh-i18n-envsubst (2014-03-12) 1 commit
(merged to 'next' on 2014-03-14 at e4d5603)
+ sh-i18n--envsubst: retire unused string_list_member()
* jc/stash-pop-not-popped (2014-02-26) 1 commit
(merged to 'next' on 2014-03-14 at 9ba1de8)
+ stash pop: mention we did not drop the stash upon failing to apply
"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss. Be more explicit
in the error message.
The wording may want to get a bit more bikeshedding.
* jk/shallow-update-fix (2014-03-17) 3 commits
(merged to 'next' on 2014-03-17 at 011942e)
+ shallow: verify shallow file after taking lock
(merged to 'next' on 2014-03-12 at ce5abbf)
+ shallow: automatically clean up shallow tempfiles
+ shallow: use stat_validity to check for up-to-date file
Serving objects from a shallow repository needs to write a new file
to hold the temporary shallow boundaries but it was not cleaned
when we exit due to die() or a signal.
* jn/wt-status (2014-03-12) 4 commits
(merged to 'next' on 2014-03-14 at 8ac862c)
+ wt-status: lift the artificual "at least 20 columns" floor
+ wt-status: i18n of section labels
+ wt-status: extract the code to compute width for labels
+ wt-status: make full label string to be subject to l10n
Unify the codepaths that format new/modified/changed sections and
conflicted paths in the "git status" output and make it possible to
properly internationalize their output.
* lt/request-pull (2014-03-13) 6 commits
(merged to 'next' on 2014-03-17 at 21a598d)
+ request-pull: documentation updates
+ request-pull: resurrect "pretty refname" feature
+ request-pull: test updates
+ request-pull: pick up tag message as before
+ request-pull: allow "local:remote" to specify names on both ends
+ request-pull: more strictly match local/remote branches
Discard the accumulated "heuristics" to guess from which branch the
result wants to be pulled from and make sure what the end user
specified is not second-guessed by "git request-pull", to avoid
mistakes.
* nd/tag-version-sort (2014-02-27) 1 commit
(merged to 'next' on 2014-03-14 at 4e7f714)
+ tag: support --sort=<spec>
Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
* nd/upload-pack-shallow (2014-03-11) 1 commit
(merged to 'next' on 2014-03-14 at d40b8c3)
+ upload-pack: send shallow info over stdin to pack-objects
Serving objects from a shallow repository needs to write a
temporary file to be used, but the serving upload-pack may not have
write access to the repository which is meant to be read-only.
Instead feed these temporary shallow bounds from the standard input
of pack-objects so that we do not have to use a temporary file.
* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at b839886)
+ demonstrate git-commit --dry-run exit code behaviour
--------------------------------------------------
[New Topics]
* ca/doc-config-third-party (2014-03-21) 1 commit
- config.txt: third-party tools may and do use their own variables
Will merge to 'next'.
* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit
- doc: status, remove leftover statement about '#' prefix
Will merge to 'next'.
* js/userdiff-cc (2014-03-21) 10 commits
- userdiff: have 'cpp' hunk header pattern catch more C++ anchor points
- t4018: test cases showing that the cpp pattern misses many anchor points
- t4018: test cases for the built-in cpp pattern
- t4018: reduce test files for pattern compilation tests
- t4018: convert custom pattern test to the new infrastructure
- t4018: convert java pattern test to the new infrastructure
- t4018: convert perl pattern tests to the new infrastructure
- t4018: an infrastructure to test hunk headers
- userdiff: support unsigned and long long suffixes of integer constants
- userdiff: support C++ ->* and .* operators in the word regexp
Improves the pattern to match the hunk-header for C/C++.
Will merge to 'next'.
* dp/makefile-charset-lib-doc (2014-03-23) 1 commit
- Makefile: describe CHARSET_LIB better
Will merge to 'next'.
* ib/rev-parse-parseopt-argh (2014-03-24) 5 commits
- parse-options: make sure argh string does not have SP or _
- update-index: teach --cacheinfo a new syntax "mode,sha1,path"
- parse-options: multi-word argh should use dash to separate words
- t1502: protect runs of SPs used in the indentation
- rev-parse --parseopt: option argument name hints
Teaches the "rev-parse --parseopt" mechanism used by scripted
Porcelains to parse command line options and give help text how to
supply argv-help (the placeholder string for an option parameter,
e.g. "key-id" in "--gpg-sign=<key-id>").
Will merge to 'next'.
* rs/pickaxe-i (2014-03-24) 10 commits
- pickaxe: simplify kwset loop in contains()
- pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
- pickaxe: move pickaxe() after pickaxe_match()
- pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
- pickaxe: honor -i when used with -S and --pickaxe-regex
- t4209: use helper functions to test --author
- t4209: use helper functions to test --grep
- t4209: factor out helper function test_log_icase()
- t4209: factor out helper function test_log()
- t4209: set up expectations up front
Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
to be used together and work as expected to perform a pickaxe
search using case-insensitive regular expression matching.
Will merge to 'next'.
* an/branch-config-message (2014-03-24) 1 commit
- branch.c: install_branch_config: simplify if chain
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit.
Still under discussion among Windows folks
* bc/blame-crlf-test (2014-02-18) 1 commit
- blame: add a failing test for a CRLF issue.
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying attention to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
- hashmap.h: make sure map entries are tightly packed
I am inclined to drop this; an alternative is to replace it with
the "more portable" one that uses #pragma, which I am willing to
try doing so on 'pu', though.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* hv/submodule-ignore-fix (2013-12-06) 4 commits
- disable complete ignorance of submodules for index <-> HEAD diff
- always show committed submodules in summary after commit
- teach add -f option for ignored submodules
- fix 'git add' to skip submodules configured as ignored
Teach "git add" to be consistent with "git status" when changes to
submodules are set to be ignored, to avoid surprises after checking
with "git status" to see there isn't any change to be further added
and then see that "git add ." adds changes to them.
I think a reroll is coming, so this may need to be replaced, but I
needed some practice with heavy conflict resolution. It conflicts
with two changes to "git add" that have been scheduled for Git 2.0
quite badly, and I think I got the resolution right this time.
Waiting for a reroll.
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
this topic conflicts with.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/format-patch (2013-04-22) 2 commits
- format-patch: --inline-single
- format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
* jc/show-branch (2013-06-07) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jk/lib-terminal-lazy (2014-03-14) 1 commit
(merged to 'next' on 2014-03-20 at 5de832f)
+ t/lib-terminal: make TTY a lazy prerequisite
The test helper lib-terminal always run an actual test_expect_* when
included, which screwed up with the use of skil-all that may have to
be done later.
Will merge to 'master'.
* ah/doc-gitk-config (2014-03-20) 1 commit
(merged to 'next' on 2014-03-20 at d671b60)
+ Documentation/gitk: document the location of the configulation file
Will merge to 'master'.
* as/grep-fullname-config (2014-03-20) 1 commit
- grep: add grep.fullName config variable
Will merge to 'next'.
* fr/add-interactive-argv-array (2014-03-18) 1 commit
(merged to 'next' on 2014-03-20 at 9d65f3d)
+ add: use struct argv_array in run_add_interactive()
Will merge to 'master'.
* jk/pack-bitmap (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at bba6246)
+ pack-objects: turn off bitmaps when skipping objects
Instead of dying when asked to (re)pack with the reachability
bitmap when a bitmap cannot be built, just (re)pack without
producing a bitmap in such a case, with a warning.
Will merge to 'master', and probably to 'maint' later.
* jk/pack-bitmap-progress (2014-03-17) 2 commits
(merged to 'next' on 2014-03-20 at c7a83f9)
+ pack-objects: show reused packfile objects in "Counting objects"
+ pack-objects: show progress for reused packfiles
The progress output while repacking and transferring objects showed
an apparent large silence while writing the objects out of existing
packfiles, when the reachability bitmap was in use.
Will merge to 'master', and probably to 'maint' later.
* jk/subtree-prefix (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 81367fa)
+ subtree: initialize "prefix" variable
A stray environment variable $prefix could have leaked into and
affected the behaviour of the "subtree" script.
Will merge to 'master'.
* nd/gc-aggressive (2014-03-17) 4 commits
- gc --aggressive: three phase repacking
- gc --aggressive: make --depth configurable
- pack-objects: support --keep
- environment.c: fix constness for odb_pack_keep()
* nd/index-pack-error-message (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 4d722ac)
+ index-pack: report error using the correct variable
Will merge to 'master'.
* rr/doc-merge-strategies (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at d31f415)
+ Documentation/merge-strategies: avoid hyphenated commands
Will merge to 'master'.
* us/printf-not-echo (2014-03-18) 2 commits
(merged to 'next' on 2014-03-20 at 41205c8)
+ test-lib.sh: do not "echo" caller-supplied strings
+ rebase -i: do not "echo" random user-supplied strings
Will merge to 'master'.
* bb/diff-no-index-dotdot (2014-03-19) 2 commits
(merged to 'next' on 2014-03-20 at 352f48c)
+ diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
+ diff-no-index: rename read_directory()
Will merge to 'master'.
* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
(merged to 'next' on 2014-03-21 at 916b759)
+ rebase: allow "-" short-hand for the previous branch
Will merge to 'master'.
* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
- tests: use "env" to run commands with temporary env-var settings
(this branch is used by jk/tests-cleanup.)
Will merge to 'next'.
* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
- fsck: use bitwise-or assignment operator to set flag
Will merge to 'next'.
* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits
- SQUASH??? fix decl-after-stmt and simplify
- status: disable translation when --porcelain is used
Will merge to 'next' after squashing in the fixup.
* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit
(merged to 'next' on 2014-03-20 at 2b7b95d)
+ t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync
Will merge to 'master'.
* ap/remote-hg-skip-null-bookmarks (2014-03-21) 2 commits
- SQUASH???
- remote-hg: do not fail on invalid bookmarks
Will merge to 'next' after squashing in the fix.
Thanks Torsten for testing.
* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits
(merged to 'next' on 2014-03-17 at 68cc994)
+ entry.c: fix possible buffer overflow in remove_subtree()
+ checkout_entry(): use the strbuf throughout the function
Will merge to 'master'.
* nd/indent-fix-connect-c (2014-03-13) 1 commit
(merged to 'next' on 2014-03-17 at a109efc)
+ connect.c: SP after "}", not TAB
Will merge to 'master'.
* ys/fsck-commit-parsing (2014-03-19) 2 commits
(merged to 'next' on 2014-03-21 at 2728983)
+ fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
+ fsck.c:fsck_ident(): ident points at a const string
Will merge to 'master'.
* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits
(merged to 'next' on 2014-03-17 at 3f8e98e)
+ rev-list: disable object/refname ambiguity check with --stdin
+ cat-file: restore warn_on_object_refname_ambiguity flag
+ cat-file: fix a minor memory leak in batch_objects
+ cat-file: refactor error handling of batch_objects
Will merge to 'master'.
* bp/commit-p-editor (2014-03-18) 7 commits
(merged to 'next' on 2014-03-21 at 23b6b06)
+ run-command: mark run_hook_with_custom_index as deprecated
+ merge hook tests: fix and update tests
+ merge: fix GIT_EDITOR override for commit hook
+ commit: fix patch hunk editing with "commit -p -m"
+ test patch hunk editing with "commit -p -m"
+ merge hook tests: use 'test_must_fail' instead of '!'
+ merge hook tests: fix missing '&&' in test
When it is not necessary to edit a commit log message (e.g. "git
commit -m" is given a message without specifying "-e"), we used to
disable the spawning of the editor by overriding GIT_EDITOR, but
this means all the uses of the editor, other than to edit the
commit log message, are also affected.
Will merge to 'master'.
* cp/am-patch-format-doc (2014-03-17) 2 commits
(merged to 'next' on 2014-03-17 at 7437c77)
+ Documentation/git-am: typofix
(merged to 'next' on 2014-03-12 at 17c3ada)
+ Documentation/git-am: Document supported --patch-format options
Will merge to 'master'.
* dm/configure-iconv-locale-charset (2014-03-11) 1 commit
(merged to 'next' on 2014-03-20 at 4443bfd)
+ configure.ac: link with -liconv for locale_charset()
Will merge to 'master'.
* jk/mv-submodules-fix (2014-03-17) 2 commits
(merged to 'next' on 2014-03-17 at 7cae3b1)
+ mv: prevent mismatched data when ignoring errors.
+ builtin/mv: fix out of bounds write
Will merge to 'master'.
* cn/fetch-prune-overlapping-destination (2014-03-24) 3 commits
- SQUASH??? style and leak fix
- fetch: handle overlaping refspecs on --prune
- fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
Since I didn't get any responses to my earlier "Comments?", I ended
up reading it myself again and found a small leak.
Hoping to be able to merge a fix for this issue soonish.
* nd/commit-editor-cleanup (2014-02-25) 3 commits
(merged to 'next' on 2014-03-17 at 986605d)
+ commit: add --cleanup=scissors
+ wt-status.c: move cut-line print code out to wt_status_add_cut_line
+ wt-status.c: make cut_line[] const to shrink .data section a bit
"git commit --cleanup=<mode>" learned a new mode, scissors.
Will merge to 'master'.
* nd/multiple-work-trees (2014-03-17) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
Reported to break on a worktree whose leading path component has a
symbolic link in it ($gmane/244822).
* ks/tree-diff-nway (2014-03-20) 19 commits
- combine-diff: speed it up, by using multiparent diff tree-walker directly
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
- Portable alloca for Git
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: diff_tree() should now be static
- tree-diff: remove special-case diff-emitting code for empty-tree cases
- tree-diff: simplify tree_entry_pathcmp
- tree-diff: show_path prototype is not needed anymore
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
- tree-diff: move all action-taking code out of compare_tree_entry()
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
(merged to 'next' on 2014-03-21 at d872679)
+ tree-diff: consolidate code for emitting diffs and recursion in one place
+ tree-diff: show_tree() is not needed
+ tree-diff: no need to pass match to skip_uninteresting()
+ tree-diff: no need to manually verify that there is no mode change for a path
+ combine-diff: move changed-paths scanning logic into its own function
+ combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* nd/log-show-linear-break (2014-03-20) 2 commits
- log: add --show-linear-break to help see non-linear history
- object.h: centralize object flag allocation
Attempts to show where a single-strand-of-pearls break in "git log"
output.
The implementation seems to have got worse compared to the previous
round. Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
RFC. This latest round clashes with the kb/fast-hashmap topic in
'master'.
* cc/interpret-trailers (2014-03-07) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from stdin and arguments
- trailers: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
--------------------------------------------------
[Discarded]
* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
. diff: simplify cpp funcname regex
Superceded.
* pw/branch-config-message (2014-03-13) 1 commit
. install_branch_config(): simplify verbose messages logic
Among the many attempts to microproject #8, this seemed to be the
most "done" among the table based ones; I however tend to think
that the original with minimum refactoring would be easier to read.
an/branch-config-message supersedes this topic.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Mar 2014, #04; Thu, 20)
@ 2014-03-20 21:09 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-03-20 21:09 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
More topics merged to 'master', some of which have been cooking
before the v1.9.0 final release, many of them fallouts from GSoC
microprojects. Many topics that have been marked to be discarded
are finally discarded.
Quite a few topics are still outside 'pu' and I suspect some of the
larger ones deserve deeper reviews to help moving them to 'next'.
In principle, I'd prefer to keep any large topic that touch core
part of the system cooking in 'next' for at least a full cycle, and
the sooner they get merged to 'next', the better. Help is greatly
appreciated.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits
(merged to 'next' on 2014-03-12 at 9d04564)
+ branch: use skip_prefix() in install_branch_config()
+ t3200-branch: test setting branch as own upstream
* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit
(merged to 'next' on 2014-03-12 at 0383d59)
+ commit.c: use the generic "sha1_pos" function for lookup
Replace a hand-rolled binary search with a call to our generic
binary search helper function.
* dd/use-alloc-grow (2014-03-03) 14 commits
(merged to 'next' on 2014-03-12 at ed82259)
+ sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
+ read-cache.c: use ALLOC_GROW() in add_index_entry()
+ builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
+ attr.c: use ALLOC_GROW() in handle_attr_line()
+ dir.c: use ALLOC_GROW() in create_simplify()
+ reflog-walk.c: use ALLOC_GROW()
+ replace_object.c: use ALLOC_GROW() in register_replace_object()
+ patch-ids.c: use ALLOC_GROW() in add_commit()
+ diffcore-rename.c: use ALLOC_GROW()
+ diff.c: use ALLOC_GROW()
+ commit.c: use ALLOC_GROW() in register_commit_graft()
+ cache-tree.c: use ALLOC_GROW() in find_subtree()
+ bundle.c: use ALLOC_GROW() in add_to_ref_list()
+ builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
Replace open-coded reallocation with ALLOC_GROW() macro.
* fc/transport-helper-fixes (2014-02-24) 7 commits
(merged to 'next' on 2014-03-12 at 5d7c69a)
+ remote-bzr: support the new 'force' option
+ test-hg.sh: tests are now expected to pass
+ transport-helper.c: do not overwrite forced bit
+ transport-helper: check for 'forced update' message
+ transport-helper: add 'force' to 'export' helpers
+ transport-helper: don't update refs in dry-run
+ transport-helper: mismerge fix
Updates transport-helper, fast-import and fast-export to allow the
ref mapping and ref deletion in a way similar to the natively
supported transports.
* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit
(merged to 'next' on 2014-03-12 at dfd3234)
+ *.sh: drop useless use of "env"
* jc/tag-contains-with (2014-03-07) 1 commit
(merged to 'next' on 2014-03-12 at e120644)
+ tag: grok "--with" as synonym to "--contains"
* jk/clean-d-pathspec (2014-03-11) 2 commits
(merged to 'next' on 2014-03-12 at aaae6ee)
+ clean: simplify dir/not-dir logic
+ clean: respect pathspecs with "-d"
"git clean -d pathspec" did not use the given pathspec correctly
and ended up cleaning too much.
* jk/detect-push-typo-early (2014-03-05) 3 commits
(merged to 'next' on 2014-03-12 at da522e7)
+ push: detect local refspec errors early
+ match_explicit_lhs: allow a "verify only" mode
+ match_explicit: hoist refspec lhs checks into their own function
Catch "git push $there no-such-branch" early.
* jk/diff-filespec-cleanup (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at 184c2aa)
+ diffcore.h: be explicit about the signedness of is_binary
Portability fix to a topic already in v1.9
* jk/doc-deprecate-grafts (2014-03-05) 1 commit
(merged to 'next' on 2014-03-12 at 8d34916)
+ docs: mark info/grafts as outdated
* jk/repack-pack-keep-objects (2014-03-03) 1 commit
(merged to 'next' on 2014-03-12 at 3fd2335)
+ repack: add `repack.packKeptObjects` config var
* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit
(merged to 'next' on 2014-03-12 at bd0fb0e)
+ branch.c: delete size check of newly tracked branch names
* mh/simplify-cache-tree-find (2014-03-05) 6 commits
(merged to 'next' on 2014-03-12 at c29aa24)
+ cache_tree_find(): use path variable when passing over slashes
+ cache_tree_find(): remove early return
+ cache_tree_find(): remove redundant check
+ cache_tree_find(): fix comment formatting
+ cache_tree_find(): find the end of path component using strchrnul()
+ cache_tree_find(): remove redundant checks
* nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at 9d1a621)
+ sha1_file: fix delta_stack memory leak in unpack_entry
Fix a small leak in the delta stack used when resolving a long
delta chain at runtime.
* rm/strchrnul-not-strlen (2014-03-10) 1 commit
(merged to 'next' on 2014-03-12 at fad8f12)
+ use strchrnul() in place of strchr() and strlen()
* rs/grep-h-c (2014-03-11) 2 commits
(merged to 'next' on 2014-03-12 at 0341bd8)
+ grep: support -h (no header) with --count
+ t7810: add missing variables to tests in loop
"git grep" learns to handle combination of "-h (no header)" and "-c
(counts)".
* sh/finish-tmp-packfile (2014-03-03) 2 commits
(merged to 'next' on 2014-03-12 at 410d45d)
+ finish_tmp_packfile():use strbuf for pathname construction
+ Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
* sh/use-hashcpy (2014-03-06) 1 commit
(merged to 'next' on 2014-03-12 at cf2735a)
+ Use hashcpy() when copying object names
--------------------------------------------------
[New Topics]
* jk/lib-terminal-lazy (2014-03-14) 1 commit
(merged to 'next' on 2014-03-20 at 5de832f)
+ t/lib-terminal: make TTY a lazy prerequisite
The test helper lib-terminal always run an actual test_expect_* when
included, which screwed up with the use of skil-all that may have to
be done later.
Will merge to 'master'.
* ah/doc-gitk-config (2014-03-20) 1 commit
(merged to 'next' on 2014-03-20 at d671b60)
+ Documentation/gitk: document the location of the configulation file
Will merge to 'master'.
* as/grep-fullname-config (2014-03-20) 1 commit
- grep: add grep.fullName config variable
* fr/add-interactive-argv-array (2014-03-18) 1 commit
(merged to 'next' on 2014-03-20 at 9d65f3d)
+ add: use struct argv_array in run_add_interactive()
Will merge to 'master'.
* jk/pack-bitmap (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at bba6246)
+ pack-objects: turn off bitmaps when skipping objects
Instead of dying when asked to (re)pack with the reachability
bitmap when a bitmap cannot be built, just (re)pack without
producing a bitmap in such a case, with a warning.
Will merge to 'master', and probably to 'maint' later.
* jk/pack-bitmap-progress (2014-03-17) 2 commits
(merged to 'next' on 2014-03-20 at c7a83f9)
+ pack-objects: show reused packfile objects in "Counting objects"
+ pack-objects: show progress for reused packfiles
The progress output while repacking and transferring objects showed
an apparent large silence while writing the objects out of existing
packfiles, when the reachability bitmap was in use.
Will merge to 'master', and probably to 'maint' later.
* jk/subtree-prefix (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 81367fa)
+ subtree: initialize "prefix" variable
A stray environment variable $prefix could have leaked into and
affected the behaviour of the "subtree" script.
Will merge to 'master'.
* nd/gc-aggressive (2014-03-17) 4 commits
- gc --aggressive: three phase repacking
- gc --aggressive: make --depth configurable
- pack-objects: support --keep
- environment.c: fix constness for odb_pack_keep()
* nd/index-pack-error-message (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at 4d722ac)
+ index-pack: report error using the correct variable
Will merge to 'master'.
* rr/doc-merge-strategies (2014-03-17) 1 commit
(merged to 'next' on 2014-03-20 at d31f415)
+ Documentation/merge-strategies: avoid hyphenated commands
Will merge to 'master'.
* us/printf-not-echo (2014-03-18) 2 commits
(merged to 'next' on 2014-03-20 at 41205c8)
+ test-lib.sh: do not "echo" caller-supplied strings
+ rebase -i: do not "echo" random user-supplied strings
Will merge to 'master'.
* bb/diff-no-index-dotdot (2014-03-19) 2 commits
(merged to 'next' on 2014-03-20 at 352f48c)
+ diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
+ diff-no-index: rename read_directory()
Will merge to 'master'.
* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
- rebase: allow "-" short-hand for the previous branch
Will merge to 'next'.
* dt/tests-with-env-not-subshell (2014-03-19) 1 commit
- tests: use "env" to run commands with temporary env-var settings
* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
- fsck: use bitwise-or assignment operator to set flag
* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits
- SQUASH??? fix decl-after-stmt and simplify
- status: disable translation when --porcelain is used
* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit
(merged to 'next' on 2014-03-20 at 2b7b95d)
+ t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync
Will merge to 'master'.
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit.
Still under discussion among Windows folks
--------------------------------------------------
[Stalled]
* bc/blame-crlf-test (2014-02-18) 1 commit
- blame: add a failing test for a CRLF issue.
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying attention to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
- hashmap.h: make sure map entries are tightly packed
I am inclined to drop this; an alternative is to replace it with
the "more portable" one that uses #pragma, which I am willing to
try doing so on 'pu', though.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* hv/submodule-ignore-fix (2013-12-06) 4 commits
- disable complete ignorance of submodules for index <-> HEAD diff
- always show committed submodules in summary after commit
- teach add -f option for ignored submodules
- fix 'git add' to skip submodules configured as ignored
Teach "git add" to be consistent with "git status" when changes to
submodules are set to be ignored, to avoid surprises after checking
with "git status" to see there isn't any change to be further added
and then see that "git add ." adds changes to them.
I think a reroll is coming, so this may need to be replaced, but I
needed some practice with heavy conflict resolution. It conflicts
with two changes to "git add" that have been scheduled for Git 2.0
quite badly, and I think I got the resolution right this time.
Waiting for a reroll.
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
this topic conflicts with.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/format-patch (2013-04-22) 2 commits
- format-patch: --inline-single
- format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
* jc/show-branch (2013-06-07) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit
- remote-hg: do not fail on invalid bookmarks
Will merge to 'next'.
* jn/wt-status (2014-03-12) 4 commits
(merged to 'next' on 2014-03-14 at 8ac862c)
+ wt-status: lift the artificual "at least 20 columns" floor
+ wt-status: i18n of section labels
+ wt-status: extract the code to compute width for labels
+ wt-status: make full label string to be subject to l10n
Unify the codepaths that format new/modified/changed sections and
conflicted paths in the "git status" output and make it possible to
properly internationalize their output.
Will merge to 'master'.
* es/sh-i18n-envsubst (2014-03-12) 1 commit
(merged to 'next' on 2014-03-14 at e4d5603)
+ sh-i18n--envsubst: retire unused string_list_member()
Will merge to 'master'.
* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits
(merged to 'next' on 2014-03-17 at 68cc994)
+ entry.c: fix possible buffer overflow in remove_subtree()
+ checkout_entry(): use the strbuf throughout the function
Will merge to 'master'.
* nd/indent-fix-connect-c (2014-03-13) 1 commit
(merged to 'next' on 2014-03-17 at a109efc)
+ connect.c: SP after "}", not TAB
Will merge to 'master'.
* pw/branch-config-message (2014-03-13) 1 commit
- install_branch_config(): simplify verbose messages logic
Among the many attempts to microproject #8, this seemed to be the
most "done" among the table based ones; I however tend to think
that the original with minimum refactoring would be easier to read.
* ys/fsck-commit-parsing (2014-03-19) 2 commits
- fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
- fsck.c:fsck_ident(): ident points at a const string
Will merge to 'next'.
* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits
(merged to 'next' on 2014-03-17 at 3f8e98e)
+ rev-list: disable object/refname ambiguity check with --stdin
+ cat-file: restore warn_on_object_refname_ambiguity flag
+ cat-file: fix a minor memory leak in batch_objects
+ cat-file: refactor error handling of batch_objects
Will merge to 'master'.
* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
- diff: simplify cpp funcname regex
It appears that Peff and Hannes agreed to base the final version
not on this one, but Hannes's version.
* bp/commit-p-editor (2014-03-18) 7 commits
- run-command: mark run_hook_with_custom_index as deprecated
- merge hook tests: fix and update tests
- merge: fix GIT_EDITOR override for commit hook
- commit: fix patch hunk editing with "commit -p -m"
- test patch hunk editing with "commit -p -m"
- merge hook tests: use 'test_must_fail' instead of '!'
- merge hook tests: fix missing '&&' in test
Will merge to 'next'.
* cp/am-patch-format-doc (2014-03-17) 2 commits
(merged to 'next' on 2014-03-17 at 7437c77)
+ Documentation/git-am: typofix
(merged to 'next' on 2014-03-12 at 17c3ada)
+ Documentation/git-am: Document supported --patch-format options
Will merge to 'master'.
* dm/configure-iconv-locale-charset (2014-03-11) 1 commit
(merged to 'next' on 2014-03-20 at 4443bfd)
+ configure.ac: link with -liconv for locale_charset()
Will merge to 'master'.
* jk/mv-submodules-fix (2014-03-17) 2 commits
(merged to 'next' on 2014-03-17 at 7cae3b1)
+ mv: prevent mismatched data when ignoring errors.
+ builtin/mv: fix out of bounds write
Will merge to 'master'.
* nd/upload-pack-shallow (2014-03-11) 1 commit
(merged to 'next' on 2014-03-14 at d40b8c3)
+ upload-pack: send shallow info over stdin to pack-objects
Will merge to 'master'.
* jc/stash-pop-not-popped (2014-02-26) 1 commit
(merged to 'next' on 2014-03-14 at 9ba1de8)
+ stash pop: mention we did not drop the stash upon failing to apply
"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss. Be more explicit
in the error message.
The wording may want to get a bit more bikeshedding.
Will merge to 'master'.
* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits
- fetch: handle overlaping refspecs on --prune
- fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
Comments?
* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
(merged to 'next' on 2014-03-14 at ff375fc)
+ skip_prefix(): scan prefix only once
Update implementation of skip_prefix() to scan only once; given
that most "prefix" arguments to the inline function are constant
strings whose strlen() can be determined at the compile time, this
might actually make things worse with a compiler with sufficient
intelligence.
Will merge to 'master'.
* jk/shallow-update-fix (2014-03-17) 3 commits
(merged to 'next' on 2014-03-17 at 011942e)
+ shallow: verify shallow file after taking lock
(merged to 'next' on 2014-03-12 at ce5abbf)
+ shallow: automatically clean up shallow tempfiles
+ shallow: use stat_validity to check for up-to-date file
Serving objects from a shallow repository needs to write a
temporary file to be used, but the serving upload-pack may not have
write access to the repository which is meant to be read-only.
Will merge to 'master'.
* nd/tag-version-sort (2014-02-27) 1 commit
(merged to 'next' on 2014-03-14 at 4e7f714)
+ tag: support --sort=<spec>
Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
Will merge to 'master'.
* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at b839886)
+ demonstrate git-commit --dry-run exit code behaviour
* nd/commit-editor-cleanup (2014-02-25) 3 commits
(merged to 'next' on 2014-03-17 at 986605d)
+ commit: add --cleanup=scissors
+ wt-status.c: move cut-line print code out to wt_status_add_cut_line
+ wt-status.c: make cut_line[] const to shrink .data section a bit
"git commit --cleanup=<mode>" learned a new mode, scissors.
* nd/multiple-work-trees (2014-03-17) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
Replaced with v5 (with minor fixes already squashed in).
* ks/tree-diff-nway (2014-03-04) 19 commits
- combine-diff: speed it up, by using multiparent diff tree-walker directly
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
- Portable alloca for Git
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: diff_tree() should now be static
- tree-diff: remove special-case diff-emitting code for empty-tree cases
- tree-diff: simplify tree_entry_pathcmp
- tree-diff: show_path prototype is not needed anymore
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
- tree-diff: move all action-taking code out of compare_tree_entry()
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
- tree-diff: consolidate code for emitting diffs and recursion in one place
- tree-diff: show_tree() is not needed
- tree-diff: no need to pass match to skip_uninteresting()
- tree-diff: no need to manually verify that there is no mode change for a path
- combine-diff: move changed-paths scanning logic into its own function
- combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* nd/log-show-linear-break (2014-03-20) 2 commits
- log: add --show-linear-break to help see non-linear history
- object.h: centralize object flag allocation
Attempts to show where a single-strand-of-pearls break in "git log"
output.
The implementation seems to have got worse compared to the previous
round. Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
RFC. This latest round clashes with the kb/fast-hashmap topic in
'master'.
* lt/request-pull (2014-03-13) 6 commits
(merged to 'next' on 2014-03-17 at 21a598d)
+ request-pull: documentation updates
+ request-pull: resurrect "pretty refname" feature
+ request-pull: test updates
+ request-pull: pick up tag message as before
+ request-pull: allow "local:remote" to specify names on both ends
+ request-pull: more strictly match local/remote branches
Discard the accumulated "heuristics" to guess from which branch the
result wants to be pulled from and make sure what the end user
specified is not second-guessed by "git request-pull", to avoid
mistakes.
Will merge to 'master'.
* cc/interpret-trailers (2014-03-07) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from stdin and arguments
- trailers: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
^ permalink raw reply [relevance 3%]
* [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook
@ 2014-03-18 10:00 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-18 10:00 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index bdf6655..e15d0e1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -824,7 +824,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook
@ 2014-03-15 21:42 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-15 21:42 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index bdf6655..e15d0e1 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -824,7 +824,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* Re: [PATCH 0/6] Fix misuses of "nor"
2014-03-15 8:56 2% ` Duy Nguyen
@ 2014-03-15 16:56 0% ` Justin Lebar
0 siblings, 0 replies; 200+ results
From: Justin Lebar @ 2014-03-15 16:56 UTC (permalink / raw)
To: Duy Nguyen; +Cc: Git Mailing List, Richard Hansen, Jiang Xin
> I guess I'm cc'd because I made a few of those or/nor mistakes.
I actually didn't look that closely at the blame; I cc'ed you because
you were a top contributor in a few of the directories I was touching.
> I suggest that you merge "Fix misuses of "nor" outside comments"
> and "Tests: Fix muses of "nor"" into one. Otherwise you break the test
> suite at 5/6
Sure thing, will do.
There's a similar incompatibility with the l10n change and "Fix
misuses of "nor" outside comments": The former references strings
changed in the latter. Should I merge these, or should I enforce a
particular ordering between these patches? (Right now the l10n patch
comes before the string changes in the code, but that's probably wrong
now that I think about it.)
> Being a non-native English speaker I'm not really qualified to review this.
FWIW even being a native English speaker I was unsure about a few of
the changes myself. This caused me to finally break down and order
Garner's Modern American Usage, which I hope will reveal all. :)
-Justin
On Sat, Mar 15, 2014 at 1:56 AM, Duy Nguyen <pclouds@gmail.com> wrote:
> On Sat, Mar 15, 2014 at 3:41 PM, Justin Lebar <jlebar@google.com> wrote:
>> I got annoyed by git's awkward use of "nor" in man pages and in git add -p, so
>> I went ahead and audited all uses of "nor" in the tree. One might be able to
>> argue that some of the uses I've changed are technically acceptable, but that's
>> a pretty low bar to set for ourselves. I aimed to make everything both correct
>> and idiomatic.
>
> I guess I'm cc'd because I made a few of those or/nor mistakes. Being
> a non-native English speaker I'm not really qualified to review this.
> But I suggest that you merge "Fix misuses of "nor" outside comments"
> and "Tests: Fix muses of "nor"" into one. Otherwise you break the test
> suite at 5/6 (and 6/6 fixes it, but breaking the test suite at any
> commit is not very bisect-friendly).
> --
> Duy
^ permalink raw reply [relevance 0%]
* Re: [PATCH 0/6] Fix misuses of "nor"
@ 2014-03-15 8:56 2% ` Duy Nguyen
2014-03-15 16:56 0% ` Justin Lebar
0 siblings, 1 reply; 200+ results
From: Duy Nguyen @ 2014-03-15 8:56 UTC (permalink / raw)
To: Justin Lebar; +Cc: Git Mailing List, Richard Hansen, Jiang Xin
On Sat, Mar 15, 2014 at 3:41 PM, Justin Lebar <jlebar@google.com> wrote:
> I got annoyed by git's awkward use of "nor" in man pages and in git add -p, so
> I went ahead and audited all uses of "nor" in the tree. One might be able to
> argue that some of the uses I've changed are technically acceptable, but that's
> a pretty low bar to set for ourselves. I aimed to make everything both correct
> and idiomatic.
I guess I'm cc'd because I made a few of those or/nor mistakes. Being
a non-native English speaker I'm not really qualified to review this.
But I suggest that you merge "Fix misuses of "nor" outside comments"
and "Tests: Fix muses of "nor"" into one. Otherwise you break the test
suite at 5/6 (and 6/6 fixes it, but breaking the test suite at any
commit is not very bisect-friendly).
--
Duy
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Mar 2014, #03; Fri, 14)
@ 2014-03-14 22:09 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-03-14 22:09 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
More topics merged to 'master', some of which have been cooking
before the v1.9.0 final release.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* ak/gitweb-fit-image (2014-02-20) 1 commit
(merged to 'next' on 2014-03-06 at ba8cb50)
+ gitweb: Avoid overflowing page body frame with large images
Instead of allowing an <img> to be shown in whatever size, force
scaling it to fit on the page with max-height/max-width css style
attributes.
* da/difftool-git-files (2014-03-05) 2 commits
(merged to 'next' on 2014-03-06 at a563ec1)
+ t7800: add a difftool test for .git-files
+ difftool: support repositories with .git-files
"git difftool" misbehaved when the repository is bound to the
working tree with the ".git file" mechanism, where a textual
file ".git" tells us where it is.
* jc/check-attr-honor-working-tree (2014-02-06) 2 commits
(merged to 'next' on 2014-03-06 at 960d679)
+ check-attr: move to the top of working tree when in non-bare repository
+ t0003: do not chdir the whole test process
"git check-attr" when (trying to) work on a repository with a
working tree did not work well when the working tree was specified
via --work-tree (and obviously with --git-dir).
The command also works in a bare repository but it reads from the
(possibly stale, irrelevant and/or nonexistent) index, which may
need to be fixed to read from HEAD, but that is a completely
separate issue. As a related tangent to this separate issue, we
may want to also fix "check-ignore", which refuses to work in a
bare repository, to also operate in a bare one.
* jh/note-trees-record-blobs (2014-02-20) 1 commit
(merged to 'next' on 2014-03-06 at f46852d)
+ notes: disallow reusing non-blob as a note object
"git notes -C <blob>" should not take an object that is not a blob.
* jk/commit-dates-parsing-fix (2014-03-07) 6 commits
(merged to 'next' on 2014-03-07 at 01e9d92)
+ show_ident_date: fix tz range check
(merged to 'next' on 2014-03-06 at dd641e2)
+ log: do not segfault on gmtime errors
+ log: handle integer overflow in timestamps
+ date: check date overflow against time_t
+ fsck: report integer overflow in author timestamps
+ t4212: test bogus timestamps with git-log
Codepaths that parse timestamps in commit objects have been
tightened.
* jk/doc-coding-guideline (2014-02-28) 1 commit
(merged to 'next' on 2014-03-06 at c33101d)
+ CodingGuidelines: mention C whitespace rules
Elaborate on a style niggle that has been part of "mimic existing
code".
* jk/http-no-curl-easy (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at 56d3f6f)
+ http: never use curl_easy_perform
Uses of curl's "multi" interface and "easy" interface do not mix
well when we attempt to reuse outgoing connections. Teach the RPC
over http code, used in the smart HTTP transport, not to use the
"easy" interface.
* jk/janitorial-fixes (2014-02-18) 5 commits
(merged to 'next' on 2014-03-06 at dac2de6)
+ open_istream(): do not dereference NULL in the error case
+ builtin/mv: don't use memory after free
+ utf8: use correct type for values in interval table
+ utf8: fix iconv error detection
+ notes-utils: handle boolean notes.rewritemode correctly
* jk/remote-pushremote-config-reading (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at 9e71ecb)
+ remote: handle pushremote config in any order
"git push" did not pay attention to branch.*.pushremote if it is
defined earlier than remote.pushdefault; the order of these two
variables in the configuration file should not matter, but it did
by mistake.
* jl/doc-submodule-update-checkout (2014-02-28) 1 commit
(merged to 'next' on 2014-03-06 at 8cdf5cb)
+ submodule update: consistently document the '--checkout' option
Add missing documentation for "submodule update --checkout".
* jm/stash-doc-k-for-keep (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at ddd8e48)
+ stash doc: mention short form -k in save description
* jn/am-doc-hooks (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at 5c1c372)
+ am doc: add a pointer to relevant hooks
* jn/bisect-coding-style (2014-03-03) 1 commit
(merged to 'next' on 2014-03-06 at e1de2a5)
+ git-bisect.sh: fix a few style issues
* ks/config-file-stdin (2014-02-18) 4 commits
(merged to 'next' on 2014-03-06 at 3e77313)
+ config: teach "git config --file -" to read from the standard input
+ config: change git_config_with_options() interface
+ builtin/config.c: rename check_blob_write() -> check_write()
+ config: disallow relative include paths from blobs
"git config" learned to read from the standard input when "-" is
given as the value to its "--file" parameter (attempting an
operation to update the configuration in the standard input of
course is rejected).
* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at 1cc4ffe)
+ git-contacts: do not fail parsing of good diffs
* mh/object-code-cleanup (2014-02-24) 4 commits
(merged to 'next' on 2014-03-06 at d6b3867)
+ sha1_file.c: document a bunch of functions defined in the file
+ sha1_file_name(): declare to return a const string
+ find_pack_entry(): document last_found_pack
+ replace_object: use struct members instead of an array
* mh/replace-refs-variable-rename (2014-02-28) 3 commits
(merged to 'next' on 2014-03-06 at 70bf89b)
+ Document some functions defined in object.c
+ Add docstrings for lookup_replace_object() and do_lookup_replace_object()
+ rename read_replace_refs to check_replace_refs
* nd/gitignore-trailing-whitespace (2014-03-11) 3 commits
(merged to 'next' on 2014-03-11 at ccdba51)
+ t0008: skip trailing space test on Windows
(merged to 'next' on 2014-03-06 at f649a34)
+ dir: ignore trailing spaces in exclude patterns
+ dir: warn about trailing spaces in exclude patterns
Trailing whitespaces in .gitignore files, unless they are quoted
for fnmatch(3), e.g. "path\ ", are warned and ignored. Strictly
speaking, this is a backward incompatible change, but very unlikely
to bite any sane user and adjusting should be obvious and easy.
* nd/i18n-progress (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at 600fd3e)
+ i18n: mark all progress lines for translation
The progress indicators from various time-consuming commands have
been marked for i18n/l10n.
* nd/no-more-fnmatch (2014-02-20) 4 commits
(merged to 'next' on 2014-03-06 at f0b8f12)
+ actually remove compat fnmatch source code
+ stop using fnmatch (either native or compat)
+ Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
+ use wildmatch() directly without fnmatch() wrapper
We started using wildmatch() in place of fnmatch(3); complete the
process and stop using fnmatch(3).
* nd/reset-setup-worktree (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at d93f20a)
+ reset: optionally setup worktree and refresh index on --mixed
"git reset" needs to refresh the index when working in a working
tree (it can also be used to match the index to the HEAD in an
otherwise bare repository), but it failed to set up the working
tree properly, causing GIT_WORK_TREE to be ignored.
* nd/strbuf-inline-styles (2014-03-03) 1 commit
(merged to 'next' on 2014-03-06 at 70b5e56)
+ strbuf: style fix -- top opening bracket on a separate line
* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit
(merged to 'next' on 2014-03-06 at fc607dc)
+ help.c: rename function "pretty_print_string_list"
* rt/links-for-asciidoctor (2014-02-20) 1 commit
(merged to 'next' on 2014-03-06 at 547f13d)
+ Documentation: fix documentation AsciiDoc links for external urls
* sg/archive-restrict-remote (2014-02-28) 2 commits
(merged to 'next' on 2014-03-06 at 5fe8998)
+ add uploadarchive.allowUnreachable option
+ docs: clarify remote restrictions for git-upload-archive
Allow loosening remote "git archive" invocation security check that
refuses to serve tree-ish not at the tip of any ref.
* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit
(merged to 'next' on 2014-03-06 at 1470b0a)
+ write_pack_file: use correct variable in diagnostic
(this branch is used by sh/finish-tmp-packfile.)
A warning from "git pack-objects" were generated by referring to an
incorrect variable when forming the filename that we had trouble
with.
* sr/add--interactive-term-readkey (2014-03-03) 2 commits
(merged to 'next' on 2014-03-06 at 9ca7af8)
+ git-add--interactive: warn if module for interactive.singlekey is missing
+ git-config: document interactive.singlekey requires Term::ReadKey
* ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit
(merged to 'next' on 2014-03-06 at b5bf463)
+ completion: teach --recurse-submodules to fetch, pull and push
* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit
(merged to 'next' on 2014-03-06 at 0244988)
+ commit.c: use skip_prefix() instead of starts_with()
* tg/index-v4-format (2014-02-24) 3 commits
(merged to 'next' on 2014-03-06 at d4ca5a8)
+ read-cache: add index.version config variable
+ test-lib: allow setting the index format version
+ introduce GIT_INDEX_VERSION environment variable
* tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at ac8008f)
+ diff: do not reuse_worktree_file for submodules
"git diff --external-diff" incorrectly fed the submodule directory
in the working tree to the external diff driver when it knew it is
the same as one of the versions being compared.
--------------------------------------------------
[New Topics]
* jn/wt-status (2014-03-12) 4 commits
(merged to 'next' on 2014-03-14 at 8ac862c)
+ wt-status: lift the artificual "at least 20 columns" floor
+ wt-status: i18n of section labels
+ wt-status: extract the code to compute width for labels
+ wt-status: make full label string to be subject to l10n
Unify the codepaths that format new/modified/changed sections and
conflicted paths in the "git status" output and make it possible to
properly internationalize their output.
Will merge to 'master'.
* es/sh-i18n-envsubst (2014-03-12) 1 commit
(merged to 'next' on 2014-03-14 at e4d5603)
+ sh-i18n--envsubst: retire unused string_list_member()
Will merge to 'master'.
* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits
- entry.c: fix possible buffer overflow in remove_subtree()
- checkout_entry(): use the strbuf throughout the function
Will merge to 'next'.
* nd/indent-fix-connect-c (2014-03-13) 1 commit
- connect.c: SP after "}", not TAB
Will merge to 'next'.
* pw/branch-config-message (2014-03-13) 1 commit
- install_branch_config(): simplify verbose messages logic
Among the many attempts to microproject #8, this seemed to be the
most "done" among the table based ones; I however tend to think
that the original with minimum refactoring would be easier to read.
* ys/fsck-commit-parsing (2014-03-13) 2 commits
- fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
- fsck.c:fsck_ident(): ident points at a const string
* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits
- rev-list: disable object/refname ambiguity check with --stdin
- cat-file: restore warn_on_object_refname_ambiguity flag
- cat-file: fix a minor memory leak in batch_objects
- cat-file: refactor error handling of batch_objects
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* bc/blame-crlf-test (2014-02-18) 1 commit
- blame: add a failing test for a CRLF issue.
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying attention to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit
- remote-hg: do not fail on invalid bookmarks
Reported to break tests ($gmane/240005)
Expecting a reroll.
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
- hashmap.h: make sure map entries are tightly packed
I am inclined to drop this; an alternative is to replace it with
the "more portable" one that uses #pragma, which I am willing to
try doing so on 'pu', though.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* fc/completion (2013-12-09) 1 commit
- completion: fix completion of certain aliases
SZEDER Gábor noticed that this breaks "git -c var=val alias" and
also suggested a better description of the change.
Has been stalled for a while without much comments from anybody
interested.
Will discard.
* mo/subtree-split-updates (2013-12-10) 3 commits
- subtree: add --edit option
- subtree: allow --squash and --message with push
- subtree: support split --rejoin --squash
Has been stalled for a while without much comments from anybody
interested.
Will discard.
* hv/submodule-ignore-fix (2013-12-06) 4 commits
- disable complete ignorance of submodules for index <-> HEAD diff
- always show committed submodules in summary after commit
- teach add -f option for ignored submodules
- fix 'git add' to skip submodules configured as ignored
Teach "git add" to be consistent with "git status" when changes to
submodules are set to be ignored, to avoid surprises after checking
with "git status" to see there isn't any change to be further added
and then see that "git add ." adds changes to them.
I think a reroll is coming, so this may need to be replaced, but I
needed some practice with heavy conflict resolution. It conflicts
with two changes to "git add" that have been scheduled for Git 2.0
quite badly, and I think I got the resolution right this time.
Waiting for a reroll.
* jc/create-directories-microopt (2013-11-11) 1 commit
- checkout: most of the time we have good leading directories
Of unknown value until tested on non-Linux platforms (especially
Windows).
Will discard.
* jt/commit-fixes-footer (2013-10-30) 1 commit
- commit: Add -f, --fixes <commit> option to add Fixes: line
There is an ongoing discussion around this topic; in general I am
fairly negative on a new feature that is too narrow and prefer a
more generic solution that can be tailored for specific needs, as
many people stated in the thread.
cc/interpret-trailers could be such a generic solution (although
there don't seem to be much concensus yet).
Will discard.
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
this topic conflicts with.
* mf/graph-show-root (2013-10-25) 1 commit
. graph.c: mark root commit differently
In a repository with multiple-roots, "log --graph", especially with
"--oneline", does not give the reader enough visual cue to see
where one line of history ended and a separate history began.
This is the version that marks the roots 'x' when they would have
been marked as '*'; Keshav Kini suggested an alternative of giving
an extra blank line after every root, which I tend to think is a
better approach to the problem.
Will discard.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* yt/shortened-rename (2013-10-18) 2 commits
- SQUASH??? style fixes and s/omit/shorten/ where appropriate
- diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible
Attempts to give more weight on the fact that a filepair represents
a rename than showing substring of the actual path when diffstat
lines are not wide enough.
I am not sure if that is solving a right problem, though.
Will discard.
* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
- git-send-email: Cache generated message-ids, use them when prompting
- git-send-email: add optional 'choices' parameter to the ask sub
Will discard.
* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
- ### DONTMERGE: needs better explanation on what config they need
- pack-refs.c: Add missing call to git_config()
- show-ref.c: Add missing call to git_config()
The changes themselves are probably good, but it is unclear what
basic setting needs to be read for which exact operation.
Will discard, tired of waiting for clarification.
$gmane/228294
* jc/format-patch (2013-04-22) 2 commits
- format-patch: --inline-single
- format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
* jk/gitweb-utf8 (2013-04-08) 4 commits
- gitweb: Fix broken blob action parameters on blob/commitdiff pages
- gitweb: Don't append ';js=(0|1)' to external links
- gitweb: Make feed title valid utf8
- gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
Various fixes to gitweb.
Drew Northup volunteered to take a look into this ($gmane/226216)
but nothing seems to have happened since then.
Will discard.
* jc/show-branch (2013-06-07) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jk/detect-push-typo-early (2014-03-05) 3 commits
(merged to 'next' on 2014-03-12 at da522e7)
+ push: detect local refspec errors early
+ match_explicit_lhs: allow a "verify only" mode
+ match_explicit: hoist refspec lhs checks into their own function
Catch "git push $there no-such-branch" early.
Will merge to 'master'.
* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
- diff: simplify cpp funcname regex
Has the discussion settled on this?
* jk/doc-deprecate-grafts (2014-03-05) 1 commit
(merged to 'next' on 2014-03-12 at 8d34916)
+ docs: mark info/grafts as outdated
Will merge to 'master'.
* rm/strchrnul-not-strlen (2014-03-10) 1 commit
(merged to 'next' on 2014-03-12 at fad8f12)
+ use strchrnul() in place of strchr() and strlen()
Will merge to 'master'.
* sh/use-hashcpy (2014-03-06) 1 commit
(merged to 'next' on 2014-03-12 at cf2735a)
+ Use hashcpy() when copying object names
Will merge to 'master'.
* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit
(merged to 'next' on 2014-03-12 at dfd3234)
+ *.sh: drop useless use of "env"
Will merge to 'master'.
* jc/tag-contains-with (2014-03-07) 1 commit
(merged to 'next' on 2014-03-12 at e120644)
+ tag: grok "--with" as synonym to "--contains"
Will merge to 'master'.
* bp/commit-p-editor (2014-03-11) 8 commits
- run-command: mark run_hook_with_custom_index as deprecated
- merge hook tests: fix and update tests
- merge: fix GIT_EDITOR override for commit hook
- commit: fix patch hunk editing with "commit -p -m"
- SQUASH???
- test patch hunk editing with "commit -p -m"
- merge hook tests: use 'test_must_fail' instead of '!'
- merge hook tests: fix missing '&&' in test
* cp/am-patch-format-doc (2014-03-11) 1 commit
(merged to 'next' on 2014-03-12 at 17c3ada)
+ Documentation/git-am: Document supported --patch-format options
Will merge to 'master'.
* dm/configure-iconv-locale-charset (2014-03-11) 1 commit
- configure.ac: link with -liconv for locale_charset()
* jk/clean-d-pathspec (2014-03-11) 2 commits
(merged to 'next' on 2014-03-12 at aaae6ee)
+ clean: simplify dir/not-dir logic
+ clean: respect pathspecs with "-d"
"git clean -d pathspec" did not use the given pathspec correctly
and ended up cleaning too much.
Will merge to 'master' and then later to 'maint'.
* jk/mv-submodules-fix (2014-03-11) 2 commits
- mv: prevent mismatched data when ignoring errors.
- builtin/mv: fix out of bounds write
Needs tests.
* nd/upload-pack-shallow (2014-03-11) 1 commit
(merged to 'next' on 2014-03-14 at d40b8c3)
+ upload-pack: send shallow info over stdin to pack-objects
Will merge to 'master'.
* rs/grep-h-c (2014-03-11) 2 commits
(merged to 'next' on 2014-03-12 at 0341bd8)
+ grep: support -h (no header) with --count
+ t7810: add missing variables to tests in loop
"git grep" learns to handle combination of "-h (no header)" and "-c
(counts)".
Will merge to 'master'.
* jc/stash-pop-not-popped (2014-02-26) 1 commit
(merged to 'next' on 2014-03-14 at 9ba1de8)
+ stash pop: mention we did not drop the stash upon failing to apply
"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss. Be more explicit
in the error message.
The wording may want to get a bit more bikeshedding.
Will merge to 'master'.
* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits
(merged to 'next' on 2014-03-12 at 9d04564)
+ branch: use skip_prefix() in install_branch_config()
+ t3200-branch: test setting branch as own upstream
Will merge to 'master'.
* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits
- fetch: handle overlaping refspecs on --prune
- fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
Comments?
* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit
(merged to 'next' on 2014-03-12 at 0383d59)
+ commit.c: use the generic "sha1_pos" function for lookup
Replace a hand-rolled binary search with a call to our generic
binary search helper function.
Will merge to 'master'.
* dd/use-alloc-grow (2014-03-03) 14 commits
(merged to 'next' on 2014-03-12 at ed82259)
+ sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
+ read-cache.c: use ALLOC_GROW() in add_index_entry()
+ builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
+ attr.c: use ALLOC_GROW() in handle_attr_line()
+ dir.c: use ALLOC_GROW() in create_simplify()
+ reflog-walk.c: use ALLOC_GROW()
+ replace_object.c: use ALLOC_GROW() in register_replace_object()
+ patch-ids.c: use ALLOC_GROW() in add_commit()
+ diffcore-rename.c: use ALLOC_GROW()
+ diff.c: use ALLOC_GROW()
+ commit.c: use ALLOC_GROW() in register_commit_graft()
+ cache-tree.c: use ALLOC_GROW() in find_subtree()
+ bundle.c: use ALLOC_GROW() in add_to_ref_list()
+ builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
Replace open-coded reallocation with ALLOC_GROW() macro.
Will merge to 'master'.
* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
(merged to 'next' on 2014-03-14 at ff375fc)
+ skip_prefix(): scan prefix only once
Update implementation of skip_prefix() to scan only once; given
that most "prefix" arguments to the inline function are constant
strings whose strlen() can be determined at the compile time, this
might actually make things worse with a compiler with sufficient
intelligence.
Will merge to 'master'.
* jk/shallow-update-fix (2014-02-27) 2 commits
(merged to 'next' on 2014-03-12 at ce5abbf)
+ shallow: automatically clean up shallow tempfiles
+ shallow: use stat_validity to check for up-to-date file
Serving objects from a shallow repository needs to write a
temporary file to be used, but the serving upload-pack may not have
write access to the repository which is meant to be read-only.
Will merge to 'master'.
* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit
(merged to 'next' on 2014-03-12 at bd0fb0e)
+ branch.c: delete size check of newly tracked branch names
Will merge to 'master'.
* mh/simplify-cache-tree-find (2014-03-05) 6 commits
(merged to 'next' on 2014-03-12 at c29aa24)
+ cache_tree_find(): use path variable when passing over slashes
+ cache_tree_find(): remove early return
+ cache_tree_find(): remove redundant check
+ cache_tree_find(): fix comment formatting
+ cache_tree_find(): find the end of path component using strchrnul()
+ cache_tree_find(): remove redundant checks
Will merge to 'master'.
* nd/tag-version-sort (2014-02-27) 1 commit
(merged to 'next' on 2014-03-14 at 4e7f714)
+ tag: support --sort=<spec>
Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
Will merge to 'master'.
* sh/finish-tmp-packfile (2014-03-03) 2 commits
(merged to 'next' on 2014-03-12 at 410d45d)
+ finish_tmp_packfile():use strbuf for pathname construction
+ Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
Will merge to 'master'.
* jk/diff-filespec-cleanup (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at 184c2aa)
+ diffcore.h: be explicit about the signedness of is_binary
Portability fix to a topic already in v1.9
Will merge to 'master' and then later to 'maint'.
* jk/repack-pack-keep-objects (2014-03-03) 1 commit
(merged to 'next' on 2014-03-12 at 3fd2335)
+ repack: add `repack.packKeptObjects` config var
Will merge to 'master'.
* nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at 9d1a621)
+ sha1_file: fix delta_stack memory leak in unpack_entry
Fix a small leak in the delta stack used when resolving a long
delta chain at runtime.
Will merge to 'master' and then later to 'maint'.
* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
(merged to 'next' on 2014-03-12 at b839886)
+ demonstrate git-commit --dry-run exit code behaviour
* fc/transport-helper-fixes (2014-02-24) 7 commits
(merged to 'next' on 2014-03-12 at 5d7c69a)
+ remote-bzr: support the new 'force' option
+ test-hg.sh: tests are now expected to pass
+ transport-helper.c: do not overwrite forced bit
+ transport-helper: check for 'forced update' message
+ transport-helper: add 'force' to 'export' helpers
+ transport-helper: don't update refs in dry-run
+ transport-helper: mismerge fix
Updates transport-helper, fast-import and fast-export to allow the
ref mapping and ref deletion in a way similar to the natively
supported transports.
Will merge to 'master'.
* nd/commit-editor-cleanup (2014-02-25) 3 commits
- commit: add --cleanup=scissors
- wt-status.c: move cut-line print code out to wt_status_add_cut_line
- wt-status.c: make cut_line[] const to shrink .data section a bit
"git commit --cleanup=<mode>" learned a new mode, scissors.
Will merge to 'next'.
* po/git-help-user-manual (2014-02-18) 1 commit
- Provide a 'git help user-manual' route to the docbook
I am not sure if this is even needed.
Will discard.
* nd/multiple-work-trees (2014-03-06) 28 commits
- FIXUP: minimum compilation fix
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- Add new environment variable $GIT_COMMON_DIR
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- Make git_path() aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- Convert git_snpath() to strbuf_git_path()
- path.c: make get_pathname() return strbuf instead of static buffer
The series needs a serious review.
* ks/tree-diff-nway (2014-03-04) 19 commits
- combine-diff: speed it up, by using multiparent diff tree-walker directly
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
- Portable alloca for Git
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: diff_tree() should now be static
- tree-diff: remove special-case diff-emitting code for empty-tree cases
- tree-diff: simplify tree_entry_pathcmp
- tree-diff: show_path prototype is not needed anymore
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
- tree-diff: move all action-taking code out of compare_tree_entry()
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
- tree-diff: consolidate code for emitting diffs and recursion in one place
- tree-diff: show_tree() is not needed
- tree-diff: no need to pass match to skip_uninteresting()
- tree-diff: no need to manually verify that there is no mode change for a path
- combine-diff: move changed-paths scanning logic into its own function
- combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* nd/log-show-linear-break (2014-02-10) 1 commit
- log: add --show-linear-break to help see non-linear history
Attempts to show where a single-strand-of-pearls break in "git log"
output.
Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
RFC. This latest round clashes with the kb/fast-hashmap topic in
'master'.
* lt/request-pull (2014-03-13) 6 commits
- request-pull: documentation updates
- request-pull: resurrect "pretty refname" feature
- request-pull: test updates
- request-pull: pick up tag message as before
- request-pull: allow "local:remote" to specify names on both ends
- request-pull: more strictly match local/remote branches
Will merge to 'next'.
* cc/interpret-trailers (2014-03-07) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from stdin and arguments
- trailers: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
* bl/blame-full-history (2014-01-14) 1 commit
- blame: new option --prefer-first to better handle merged cherry-picks
By disabling the tree-same optimization (which is consistent with
the default behaviour of "git log"-family of commands), make "git
blame" sometimes produce different result from the original code.
Because the "git blame" output can give result for each line from
only one lineage of the history, however, this can be only useful
when you are lucky---unlike "--full-history" of "git log"-family,
where we can show commits from both lineages of histories with an
equal weight. See $gmane/240392 for more detailed discussion.
Will discard.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
--------------------------------------------------
[Discarded]
* tb/repack-fix-renames (2014-02-05) 1 commit
. repack.c: rename a few variables
Perhaps unneeded, as the longer-term plan is to drop the codeblock
this change touches.
* ks/diff-c-with-diff-order (2014-02-03) 5 commits
. combine-diff: simplify intersect_paths() further
. combine-diff: combine_diff_path.len is not needed anymore
. combine-diff: optimize combine_diff_path sets intersection
. diff test: add tests for combine-diff with orderfile
. diffcore-order: export generic ordering interface
Now part of ks/combine-diff topic.
* ks/tree-diff-more (2014-02-24) 15 commits
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: remove special-case diff-emitting code for empty-tree cases
- tree-diff: simplify tree_entry_pathcmp
- tree-diff: show_path prototype is not needed anymore
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
- tree-diff: move all action-taking code out of compare_tree_entry()
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
- tree-diff: consolidate code for emitting diffs and recursion in one place
- tree-diff: show_tree() is not needed
- tree-diff: no need to pass match to skip_uninteresting()
- tree-diff: no need to manually verify that there is no mode change for a path
- combine-diff: move changed-paths scanning logic into its own function
- combine-diff: move show_log_first logic/action out of paths scanning
(this branch is used by ks/tree-diff-nway; uses ks/combine-diff.)
Code refactoring.
Now part of ks/tree-diff-nway.
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Mar 2014, #02; Tue, 11)
@ 2014-03-11 22:12 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2014-03-11 22:12 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Topics that have been cooking in 'next' for 2.0 have been merged to
'master', which means we are committed to make the next one a big
release. Kind of scary, isn't it?
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit
(merged to 'next' on 2014-02-25 at 473e143)
+ strbuf: remove prefixcmp() and suffixcmp()
Originally merged to 'next' on 2014-01-07
Endgame for the cc/starts-n-ends-with topic; this needs to be
evil-merged with other topics that introduce new uses of
prefix/suffix-cmp functions.
* gj/push-more-verbose-advice (2013-11-13) 1 commit
(merged to 'next' on 2014-02-25 at 1cd10b0)
+ push: switch default from "matching" to "simple"
Originally merged to 'next' on 2013-11-21
Explain 'simple' and 'matching' in "git push" advice message; the
topmost patch is a rebase of jc/push-2.0-default-to-simple on top
of it.
* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
(merged to 'next' on 2014-02-25 at a0d018a)
+ git add <pathspec>... defaults to "-A"
Originally merged to 'next' on 2013-12-06
Updated endgame for "git add <pathspec>" that defaults to "--all"
aka "--no-ignore-removal".
* jc/core-checkstat-2.0 (2013-05-06) 1 commit
(merged to 'next' on 2014-02-25 at 62f6aeb)
+ core.statinfo: remove as promised in Git 2.0
Originally merged to 'next' on 2013-12-06
* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit
(merged to 'next' on 2014-02-25 at ccfff88)
+ diff: remove "diff-files -q" in a version of Git in a distant future
Originally merged to 'next' on 2013-12-06
Remove deprecated "-q" option "git diff-files".
* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
(merged to 'next' on 2014-02-25 at 1f0e178)
+ push: switch default from "matching" to "simple"
Originally merged to 'next' on 2013-12-06
* jk/run-network-tests-by-default (2014-02-14) 1 commit
(merged to 'next' on 2014-02-25 at 62a8ad0)
+ tests: turn on network daemon tests by default
Originally merged to 'next' on 2014-02-20
Teach "make test" to run networking tests when possible by default.
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
(merged to 'next' on 2014-02-25 at 9e5c0d2)
+ git add: -u/-A now affects the entire working tree
Originally merged to 'next' on 2013-12-06
* ks/combine-diff (2014-02-24) 6 commits
(merged to 'next' on 2014-02-25 at 69e5a87)
+ tests: add checking that combine-diff emits only correct paths
+ combine-diff: simplify intersect_paths() further
+ combine-diff: combine_diff_path.len is not needed anymore
+ combine-diff: optimize combine_diff_path sets intersection
+ diff test: add tests for combine-diff with orderfile
+ diffcore-order: export generic ordering interface
(this branch is used by ks/tree-diff-nway.)
Originally merged to 'next' on 2014-02-20
Teach combine-diff to honour the path-output-order imposed by
diffcore-order, and optimize how matching paths are found in
the N-way diffs made with parents.
* nd/daemonize-gc (2014-02-10) 2 commits
(merged to 'next' on 2014-02-25 at f592335)
+ gc: config option for running --auto in background
+ daemon: move daemonize() to libgit.a
Originally merged to 'next' on 2014-02-20
Allow running "gc --auto" in the background.
--------------------------------------------------
[New Topics]
* jk/detect-push-typo-early (2014-03-05) 3 commits
- push: detect local refspec errors early
- match_explicit_lhs: allow a "verify only" mode
- match_explicit: hoist refspec lhs checks into their own function
Catch "git push $there no-such-branch" early.
Will merge to 'next'.
* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
- diff: simplify cpp funcname regex
Has the discussion settled on this?
* jk/doc-deprecate-grafts (2014-03-05) 1 commit
- docs: mark info/grafts as outdated
Will merge to 'next'.
* rm/strchrnul-not-strlen (2014-03-10) 1 commit
- use strchrnul() in place of strchr() and strlen()
Will merge to 'next'.
* sh/use-hashcpy (2014-03-06) 1 commit
- Use hashcpy() when copying object names
Will merge to 'next'.
* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit
- *.sh: drop useless use of "env"
Will merge to 'next'.
* jc/tag-contains-with (2014-03-07) 1 commit
- tag: grok "--with" as synonym to "--contains"
Will merge to 'next'.
* bp/commit-p-editor (2014-03-11) 8 commits
- run-command: mark run_hook_with_custom_index as deprecated
- merge hook tests: fix and update tests
- merge: fix GIT_EDITOR override for commit hook
- commit: fix patch hunk editing with "commit -p -m"
- SQUASH???
- test patch hunk editing with "commit -p -m"
- merge hook tests: use 'test_must_fail' instead of '!'
- merge hook tests: fix missing '&&' in test
* cp/am-patch-format-doc (2014-03-11) 1 commit
- Documentation/git-am: Document supported --patch-format options
Will merge to 'next'.
* dm/configure-iconv-locale-charset (2014-03-11) 1 commit
- configure.ac: link with -liconv for locale_charset()
* jk/clean-d-pathspec (2014-03-11) 2 commits
- clean: simplify dir/not-dir logic
- clean: respect pathspecs with "-d"
"git clean -d pathspec" did not use pathspec correctly.
Will merge to 'next' and later down to 'maint'.
* jk/mv-submodules-fix (2014-03-11) 2 commits
- mv: prevent mismatched data when ignoring errors.
- builtin/mv: fix out of bounds write
Needs tests.
* nd/upload-pack-shallow (2014-03-11) 1 commit
- upload-pack: send shallow info over stdin to pack-objects
Will merge to 'next'.
* rs/grep-h-c (2014-03-11) 2 commits
- grep: support -h (no header) with --count
- t7810: add missing variables to tests in loop
"git grep" learns to handle combination of "-h (no header)" and "-c
(counts)".
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit
- remote-hg: do not fail on invalid bookmarks
Reported to break tests ($gmane/240005)
Expecting a reroll.
* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits
- get_sha1: drop object/refname ambiguity flag
- get_sha1: speed up ambiguous 40-hex test
- FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir()
- refs: teach for_each_ref a flag to avoid recursion
- cat-file: fix a minor memory leak in batch_objects
- cat-file: refactor error handling of batch_objects
Expecting a reroll.
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
- hashmap.h: make sure map entries are tightly packed
I am inclined to drop this; an alternative is to replace it with
the "more portable" one that uses #pragma, which I am willing to
try doing so on 'pu', though.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* fc/completion (2013-12-09) 1 commit
- completion: fix completion of certain aliases
SZEDER Gábor noticed that this breaks "git -c var=val alias" and
also suggested a better description of the change.
Has been stalled for a while without much comments from anybody
interested.
Will discard.
* mo/subtree-split-updates (2013-12-10) 3 commits
- subtree: add --edit option
- subtree: allow --squash and --message with push
- subtree: support split --rejoin --squash
Has been stalled for a while without much comments from anybody
interested.
Will discard.
* hv/submodule-ignore-fix (2013-12-06) 4 commits
- disable complete ignorance of submodules for index <-> HEAD diff
- always show committed submodules in summary after commit
- teach add -f option for ignored submodules
- fix 'git add' to skip submodules configured as ignored
Teach "git add" to be consistent with "git status" when changes to
submodules are set to be ignored, to avoid surprises after checking
with "git status" to see there isn't any change to be further added
and then see that "git add ." adds changes to them.
I think a reroll is coming, so this may need to be replaced, but I
needed some practice with heavy conflict resolution. It conflicts
with two changes to "git add" that have been scheduled for Git 2.0
quite badly, and I think I got the resolution right this time.
Waiting for a reroll.
* jc/create-directories-microopt (2013-11-11) 1 commit
- checkout: most of the time we have good leading directories
Of unknown value until tested on non-Linux platforms (especially
Windows).
Will discard.
* jt/commit-fixes-footer (2013-10-30) 1 commit
- commit: Add -f, --fixes <commit> option to add Fixes: line
There is an ongoing discussion around this topic; in general I am
fairly negative on a new feature that is too narrow and prefer a
more generic solution that can be tailored for specific needs, as
many people stated in the thread.
cc/interpret-trailers could be such a generic solution (although
there don't seem to be much concensus yet).
Will discard.
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
this topic conflicts with.
* mf/graph-show-root (2013-10-25) 1 commit
. graph.c: mark root commit differently
In a repository with multiple-roots, "log --graph", especially with
"--oneline", does not give the reader enough visual cue to see
where one line of history ended and a separate history began.
This is the version that marks the roots 'x' when they would have
been marked as '*'; Keshav Kini suggested an alternative of giving
an extra blank line after every root, which I tend to think is a
better approach to the problem.
Will discard.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* yt/shortened-rename (2013-10-18) 2 commits
- SQUASH??? style fixes and s/omit/shorten/ where appropriate
- diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible
Attempts to give more weight on the fact that a filepair represents
a rename than showing substring of the actual path when diffstat
lines are not wide enough.
I am not sure if that is solving a right problem, though.
Will discard.
* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
- git-send-email: Cache generated message-ids, use them when prompting
- git-send-email: add optional 'choices' parameter to the ask sub
Will discard.
* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
- ### DONTMERGE: needs better explanation on what config they need
- pack-refs.c: Add missing call to git_config()
- show-ref.c: Add missing call to git_config()
The changes themselves are probably good, but it is unclear what
basic setting needs to be read for which exact operation.
Will discard, tired of waiting for clarification.
$gmane/228294
* jc/format-patch (2013-04-22) 2 commits
- format-patch: --inline-single
- format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
* jk/gitweb-utf8 (2013-04-08) 4 commits
- gitweb: Fix broken blob action parameters on blob/commitdiff pages
- gitweb: Don't append ';js=(0|1)' to external links
- gitweb: Make feed title valid utf8
- gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
Various fixes to gitweb.
Drew Northup volunteered to take a look into this ($gmane/226216)
but nothing seems to have happened since then.
Will discard.
* jc/show-branch (2013-06-07) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* jc/stash-pop-not-popped (2014-02-26) 1 commit
- stash pop: mention we did not drop the stash upon failing to apply
"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss. Be more explicit
in the error message.
The wording may want to get a bit more bikeshedding, but otherwise
it should be OK for 'next'.
* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits
- branch: use skip_prefix() in install_branch_config()
- t3200-branch: test setting branch as own upstream
Will merge to 'next'.
* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits
- fetch: handle overlaping refspecs on --prune
- fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
Comments?
* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit
- commit.c: use the generic "sha1_pos" function for lookup
Replace a hand-rolled binary search with a call to our generic
binary search helper function.
Will merge to 'next'.
* dd/use-alloc-grow (2014-03-03) 14 commits
- sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
- read-cache.c: use ALLOC_GROW() in add_index_entry()
- builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
- attr.c: use ALLOC_GROW() in handle_attr_line()
- dir.c: use ALLOC_GROW() in create_simplify()
- reflog-walk.c: use ALLOC_GROW()
- replace_object.c: use ALLOC_GROW() in register_replace_object()
- patch-ids.c: use ALLOC_GROW() in add_commit()
- diffcore-rename.c: use ALLOC_GROW()
- diff.c: use ALLOC_GROW()
- commit.c: use ALLOC_GROW() in register_commit_graft()
- cache-tree.c: use ALLOC_GROW() in find_subtree()
- bundle.c: use ALLOC_GROW() in add_to_ref_list()
- builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
Replace open-coded reallocation with ALLOC_GROW() macro.
Will merge to 'next'.
* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
- skip_prefix(): scan prefix only once
Updaste implementation of skip_prefix() to scan only once; given
that most "prefix" arguments to the inline function are constant
strings whose strlen() can be determined at the compile time, this
might actually make things worse with a compiler with sufficient
intelligence.
* jk/doc-coding-guideline (2014-02-28) 1 commit
(merged to 'next' on 2014-03-06 at c33101d)
+ CodingGuidelines: mention C whitespace rules
Elaborate on a style niggle that has been part of "mimic existing
code".
Will merge to 'master'.
* jk/shallow-update-fix (2014-02-27) 2 commits
- shallow: automatically clean up shallow tempfiles
- shallow: use stat_validity to check for up-to-date file
Serving objects from a shallow repository needs to write a
temporary file to be used, but the serving upload-pack may not have
write access to the repository which is meant to be read-only.
Will merge to 'next'.
* jl/doc-submodule-update-checkout (2014-02-28) 1 commit
(merged to 'next' on 2014-03-06 at 8cdf5cb)
+ submodule update: consistently document the '--checkout' option
Add missing documentation for "submodule update --checkout".
Will merge to 'master'.
* jn/bisect-coding-style (2014-03-03) 1 commit
(merged to 'next' on 2014-03-06 at e1de2a5)
+ git-bisect.sh: fix a few style issues
Will merge to 'master'.
* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit
- branch.c: delete size check of newly tracked branch names
Will merge to 'next'.
* mh/simplify-cache-tree-find (2014-03-05) 6 commits
- cache_tree_find(): use path variable when passing over slashes
- cache_tree_find(): remove early return
- cache_tree_find(): remove redundant check
- cache_tree_find(): fix comment formatting
- cache_tree_find(): find the end of path component using strchrnul()
- cache_tree_find(): remove redundant checks
Will merge to 'next'.
* nd/strbuf-inline-styles (2014-03-03) 1 commit
(merged to 'next' on 2014-03-06 at 70b5e56)
+ strbuf: style fix -- top opening bracket on a separate line
Will merge to 'master'.
* nd/tag-version-sort (2014-02-27) 1 commit
- tag: support --sort=<spec>
Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
Will merge to 'next'.
* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit
(merged to 'next' on 2014-03-06 at fc607dc)
+ help.c: rename function "pretty_print_string_list"
Will merge to 'master'.
* sg/archive-restrict-remote (2014-02-28) 2 commits
(merged to 'next' on 2014-03-06 at 5fe8998)
+ add uploadarchive.allowUnreachable option
+ docs: clarify remote restrictions for git-upload-archive
Allow loosening remote "git archive" invocation security check that
refuses to serve tree-ish not at the tip of any ref.
Will merge to 'master'.
* sh/finish-tmp-packfile (2014-03-03) 2 commits
- finish_tmp_packfile():use strbuf for pathname construction
- Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
(this branch uses sh/write-pack-file-warning-message-fix.)
Will merge to 'next'.
* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit
(merged to 'next' on 2014-03-06 at 1470b0a)
+ write_pack_file: use correct variable in diagnostic
(this branch is used by sh/finish-tmp-packfile.)
A warning from "git pack-objects" were generated by referring to an
incorrect variable when forming the filename that we had trouble
with.
Will merge to 'master'.
* sr/add--interactive-term-readkey (2014-03-03) 2 commits
(merged to 'next' on 2014-03-06 at 9ca7af8)
+ git-add--interactive: warn if module for interactive.singlekey is missing
+ git-config: document interactive.singlekey requires Term::ReadKey
Will merge to 'master'.
* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit
(merged to 'next' on 2014-03-06 at 0244988)
+ commit.c: use skip_prefix() instead of starts_with()
Will merge to 'master'.
* ak/gitweb-fit-image (2014-02-20) 1 commit
(merged to 'next' on 2014-03-06 at ba8cb50)
+ gitweb: Avoid overflowing page body frame with large images
Instead of allowing an <img> to be shown in whatever size, force
scaling it to fit on the page with max-height/max-width css style
attributes.
Will merge to 'master'.
* da/difftool-git-files (2014-03-05) 2 commits
(merged to 'next' on 2014-03-06 at a563ec1)
+ t7800: add a difftool test for .git-files
+ difftool: support repositories with .git-files
"git difftool" misbehaved when the repository is bound to the
working tree with the ".git file" mechanism, where a textual
file ".git" tells us where it is.
Will merge to 'master'.
* jk/commit-dates-parsing-fix (2014-03-07) 6 commits
(merged to 'next' on 2014-03-07 at 01e9d92)
+ show_ident_date: fix tz range check
(merged to 'next' on 2014-03-06 at dd641e2)
+ log: do not segfault on gmtime errors
+ log: handle integer overflow in timestamps
+ date: check date overflow against time_t
+ fsck: report integer overflow in author timestamps
+ t4212: test bogus timestamps with git-log
Will merge to 'master'.
* jk/diff-filespec-cleanup (2014-02-24) 1 commit
- diffcore.h: be explicit about the signedness of is_binary
Will merge to 'next' and then to 'master' and 'maint'.
* jk/remote-pushremote-config-reading (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at 9e71ecb)
+ remote: handle pushremote config in any order
Will merge to 'master'.
* jk/repack-pack-keep-objects (2014-03-03) 1 commit
- repack: add `repack.packKeptObjects` config var
Will merge to 'next'.
* jm/stash-doc-k-for-keep (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at ddd8e48)
+ stash doc: mention short form -k in save description
Will merge to 'master'.
* jn/am-doc-hooks (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at 5c1c372)
+ am doc: add a pointer to relevant hooks
Will merge to 'master'.
* mh/object-code-cleanup (2014-02-24) 4 commits
(merged to 'next' on 2014-03-06 at d6b3867)
+ sha1_file.c: document a bunch of functions defined in the file
+ sha1_file_name(): declare to return a const string
+ find_pack_entry(): document last_found_pack
+ replace_object: use struct members instead of an array
Will merge to 'master'.
* nd/i18n-progress (2014-02-24) 1 commit
(merged to 'next' on 2014-03-06 at 600fd3e)
+ i18n: mark all progress lines for translation
Will merge to 'master'.
* nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit
- sha1_file: fix delta_stack memory leak in unpack_entry
Will merge to 'next' and then to 'master' and 'maint'.
* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
- demonstrate git-commit --dry-run exit code behaviour
Will merge to 'next'.
* fc/transport-helper-fixes (2014-02-24) 7 commits
- remote-bzr: support the new 'force' option
- test-hg.sh: tests are now expected to pass
- transport-helper.c: do not overwrite forced bit
- transport-helper: check for 'forced update' message
- transport-helper: add 'force' to 'export' helpers
- transport-helper: don't update refs in dry-run
- transport-helper: mismerge fix
Updates transport-helper, fast-import and fast-export to allow the
ref mapping and ref deletion in a way similar to the natively
supported transports.
Will merge to 'next'.
* bc/blame-crlf-test (2014-02-18) 1 commit
- blame: add a failing test for a CRLF issue.
I have a feeling that a fix for this should be fairly isolated and
trivial (it should be just the matter of paying attention to the
crlf settings when synthesizing the fake commit)---perhaps somebody
can squash in a fix to this?
* jk/http-no-curl-easy (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at 56d3f6f)
+ http: never use curl_easy_perform
Avoid use of the curl-easy family of functions, which interferes
with connection reuse in a negative way.
Will merge to 'master' and then to 'maint'.
* jk/janitorial-fixes (2014-02-18) 5 commits
(merged to 'next' on 2014-03-06 at dac2de6)
+ open_istream(): do not dereference NULL in the error case
+ builtin/mv: don't use memory after free
+ utf8: use correct type for values in interval table
+ utf8: fix iconv error detection
+ notes-utils: handle boolean notes.rewritemode correctly
Will merge to 'master'.
* ks/config-file-stdin (2014-02-18) 4 commits
(merged to 'next' on 2014-03-06 at 3e77313)
+ config: teach "git config --file -" to read from the standard input
+ config: change git_config_with_options() interface
+ builtin/config.c: rename check_blob_write() -> check_write()
+ config: disallow relative include paths from blobs
Will merge to 'master'.
* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at 1cc4ffe)
+ git-contacts: do not fail parsing of good diffs
Will merge to 'master'.
* mh/replace-refs-variable-rename (2014-02-28) 3 commits
(merged to 'next' on 2014-03-06 at 70bf89b)
+ Document some functions defined in object.c
+ Add docstrings for lookup_replace_object() and do_lookup_replace_object()
+ rename read_replace_refs to check_replace_refs
Will merge to 'master'.
* nd/commit-editor-cleanup (2014-02-25) 3 commits
- commit: add --cleanup=scissors
- wt-status.c: move cut-line print code out to wt_status_add_cut_line
- wt-status.c: make cut_line[] const to shrink .data section a bit
"git commit --cleanup=<mode>" learned a new mode, scissors.
Will merge to 'next'.
* nd/no-more-fnmatch (2014-02-20) 4 commits
(merged to 'next' on 2014-03-06 at f0b8f12)
+ actually remove compat fnmatch source code
+ stop using fnmatch (either native or compat)
+ Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
+ use wildmatch() directly without fnmatch() wrapper
We started using wildmatch() in place of fnmatch(3); complete the
process and stop using fnmatch(3).
Will merge to 'master'.
* nd/reset-setup-worktree (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at d93f20a)
+ reset: optionally setup worktree and refresh index on --mixed
"git reset" needs to refresh the index when working in a working
tree (it can also be used to match the index to the HEAD in an
otherwise bare repository), but it failed to set up the working
tree properly, causing GIT_WORK_TREE to be ignored.
Will merge to 'master'.
* po/git-help-user-manual (2014-02-18) 1 commit
- Provide a 'git help user-manual' route to the docbook
I am not sure if this is even needed.
Will discard.
* rt/links-for-asciidoctor (2014-02-20) 1 commit
(merged to 'next' on 2014-03-06 at 547f13d)
+ Documentation: fix documentation AsciiDoc links for external urls
Will merge to 'master'.
* tg/index-v4-format (2014-02-24) 3 commits
(merged to 'next' on 2014-03-06 at d4ca5a8)
+ read-cache: add index.version config variable
+ test-lib: allow setting the index format version
+ introduce GIT_INDEX_VERSION environment variable
Will merge to 'master'.
* tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit
(merged to 'next' on 2014-03-06 at ac8008f)
+ diff: do not reuse_worktree_file for submodules
"git diff --external-diff" incorrectly fed the submodule directory
in the working tree to the external diff driver when it knew it is
the same as one of the versions being compared.
Will merge to 'master'.
* nd/multiple-work-trees (2014-03-06) 28 commits
- FIXUP: minimum compilation fix
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- Add new environment variable $GIT_COMMON_DIR
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- Make git_path() aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- Convert git_snpath() to strbuf_git_path()
- path.c: make get_pathname() return strbuf instead of static buffer
The series needs a serious review.
* ks/tree-diff-nway (2014-03-04) 19 commits
- combine-diff: speed it up, by using multiparent diff tree-walker directly
- tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
- Portable alloca for Git
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: diff_tree() should now be static
- tree-diff: remove special-case diff-emitting code for empty-tree cases
- tree-diff: simplify tree_entry_pathcmp
- tree-diff: show_path prototype is not needed anymore
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
- tree-diff: move all action-taking code out of compare_tree_entry()
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
- tree-diff: consolidate code for emitting diffs and recursion in one place
- tree-diff: show_tree() is not needed
- tree-diff: no need to pass match to skip_uninteresting()
- tree-diff: no need to manually verify that there is no mode change for a path
- combine-diff: move changed-paths scanning logic into its own function
- combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* nd/gitignore-trailing-whitespace (2014-03-11) 3 commits
(merged to 'next' on 2014-03-11 at ccdba51)
+ t0008: skip trailing space test on Windows
(merged to 'next' on 2014-03-06 at f649a34)
+ dir: ignore trailing spaces in exclude patterns
+ dir: warn about trailing spaces in exclude patterns
Warn and then ignore trailing whitespaces in .gitignore files,
unless they are quoted for fnmatch(3), e.g. "path\ ".
Will merge to 'master'.
* nd/log-show-linear-break (2014-02-10) 1 commit
- log: add --show-linear-break to help see non-linear history
Attempts to show where a single-strand-of-pearls break in "git log"
output.
Will merge to 'next'.
* ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit
(merged to 'next' on 2014-03-06 at b5bf463)
+ completion: teach --recurse-submodules to fetch, pull and push
Will merge to 'master'.
* jh/note-trees-record-blobs (2014-02-20) 1 commit
(merged to 'next' on 2014-03-06 at f46852d)
+ notes: disallow reusing non-blob as a note object
"git notes -C <blob>" should not take an object that is not a blob.
Will merge to 'master'.
* jc/check-attr-honor-working-tree (2014-02-06) 2 commits
(merged to 'next' on 2014-03-06 at 960d679)
+ check-attr: move to the top of working tree when in non-bare repository
+ t0003: do not chdir the whole test process
"git check-attr" when (trying to) work on a repository with a
working tree did not work well when the working tree was specified
via --work-tree (and obviously with --git-dir).
The command also works in a bare repository but it reads from the
(possibly stale, irrelevant and/or nonexistent) index, which may
need to be fixed to read from HEAD, but that is a completely
separate issue. As a related tangent to this separate issue, we
may want to also fix "check-ignore", which refuses to work in a
bare repository, to also operate in a bare one.
Will merge to 'master'.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
RFC. This latest round clashes with the kb/fast-hashmap topic in
'master'.
* lt/request-pull (2014-02-25) 5 commits
- request-pull: resurrect "pretty refname" feature
- request-pull: test updates
- request-pull: pick up tag message as before
- request-pull: allow "local:remote" to specify names on both ends
- request-pull: more strictly match local/remote branches
Needs doc update but otherwise it should be ready for 'next'.
* cc/interpret-trailers (2014-03-07) 11 commits
- Documentation: add documentation for 'git interpret-trailers'
- trailer: add tests for commands in config file
- trailer: execute command from 'trailer.<name>.command'
- trailer: add tests for "git interpret-trailers"
- trailer: add interpret-trailers command
- trailer: put all the processing together and print
- trailer: parse trailers from stdin
- trailer: process command line trailer arguments
- trailer: read and process config information
- trailer: process trailers from stdin and arguments
- trailers: add data structures and basic functions
A new filter to programatically edit the tail end of the commit log
messages.
* bl/blame-full-history (2014-01-14) 1 commit
- blame: new option --prefer-first to better handle merged cherry-picks
By disabling the tree-same optimization (which is consistent with
the default behaviour of "git log"-family of commands), make "git
blame" sometimes produce different result from the original code.
Because the "git blame" output can give result for each line from
only one lineage of the history, however, this can be only useful
when you are lucky---unlike "--full-history" of "git log"-family,
where we can show commits from both lineages of histories with an
equal weight. See $gmane/240392 for more detailed discussion.
Will discard.
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
--------------------------------------------------
[Discarded]
* tb/repack-fix-renames (2014-02-05) 1 commit
. repack.c: rename a few variables
Perhaps unneeded, as the longer-term plan is to drop the codeblock
this change touches.
* ks/diff-c-with-diff-order (2014-02-03) 5 commits
. combine-diff: simplify intersect_paths() further
. combine-diff: combine_diff_path.len is not needed anymore
. combine-diff: optimize combine_diff_path sets intersection
. diff test: add tests for combine-diff with orderfile
. diffcore-order: export generic ordering interface
Now part of ks/combine-diff topic.
* ks/tree-diff-more (2014-02-24) 15 commits
- tree-diff: reuse base str(buf) memory on sub-tree recursion
- tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- tree-diff: rework diff_tree interface to be sha1 based
- tree-diff: remove special-case diff-emitting code for empty-tree cases
- tree-diff: simplify tree_entry_pathcmp
- tree-diff: show_path prototype is not needed anymore
- tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
- tree-diff: move all action-taking code out of compare_tree_entry()
- tree-diff: don't assume compare_tree_entry() returns -1,0,1
- tree-diff: consolidate code for emitting diffs and recursion in one place
- tree-diff: show_tree() is not needed
- tree-diff: no need to pass match to skip_uninteresting()
- tree-diff: no need to manually verify that there is no mode change for a path
- combine-diff: move changed-paths scanning logic into its own function
- combine-diff: move show_log_first logic/action out of paths scanning
(this branch is used by ks/tree-diff-nway; uses ks/combine-diff.)
Code refactoring.
Now part of ks/tree-diff-nway.
^ permalink raw reply [relevance 3%]
* [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook
2014-03-10 18:49 3% [PATCH V2 0/7] fix hunk editing with 'commit -p -m' Benoit Pierre
@ 2014-03-10 18:49 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-10 18:49 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 67f312d..b11a528 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -821,7 +821,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* [PATCH V2 0/7] fix hunk editing with 'commit -p -m'
@ 2014-03-10 18:49 3% Benoit Pierre
2014-03-10 18:49 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
0 siblings, 1 reply; 200+ results
From: Benoit Pierre @ 2014-03-10 18:49 UTC (permalink / raw)
To: git
This patch fixes the fact that hunk editing with 'commit -p -m' does not work:
GIT_EDITOR is set to ':' to indicate to hooks that no editor will be launched,
which result in the 'hunk edit' option not launching the editor (and selecting
the whole hunk).
The fix consists in deferring the GIT_EDITOR override to the hook subprocess,
like it's already done for GIT_INDEX_FILE:
- rename 'run_hook' to 'run_hook_le' and change the first parameter to the environment to set
- add a 'run_hook_ve' variant that take a va_list
- add a new 'run_commit_hook' helper (to set both GIT_EDITOR and GIT_INDEX_FILE)
- the old 'run_hook' functionality is available as 'run_hook_with_custom_index'
(and marked as deprecated in the last optional patch of this series)
N.B.: the merge builtin 'prepare-commit-msg' hook handling has also been updated
to be consistent; i.e. GIT_EDITOR will not be set to ':' if the '--edit' option
is used.
Benoit Pierre (7):
merge hook tests: fix missing '&&' in test
merge hook tests: use 'test_must_fail' instead of '!'
test patch hunk editing with "commit -p -m"
commit: fix patch hunk editing with "commit -p -m"
merge: fix GIT_EDITOR override for commit hook
merge hook tests: fix and update tests
run-command: mark run_hook_with_custom_index as deprecated
builtin/checkout.c | 8 +++----
builtin/clone.c | 4 ++--
builtin/commit.c | 35 ++++++++++++++++++++++++------
builtin/gc.c | 2 +-
builtin/merge.c | 6 +++---
commit.h | 3 +++
run-command.c | 44 +++++++++++++++++++++++++++-----------
run-command.h | 7 +++++-
t/t7505-prepare-commit-msg-hook.sh | 33 ++++++++++++++++++++--------
t/t7513-commit_-p_-m_hunk_edit.sh | 34 +++++++++++++++++++++++++++++
10 files changed, 137 insertions(+), 39 deletions(-)
create mode 100755 t/t7513-commit_-p_-m_hunk_edit.sh
--
1.9.0
^ permalink raw reply [relevance 3%]
* [PATCH 0/6] fix hunk editing with 'commit -p -m'
@ 2014-03-06 14:50 3% Benoit Pierre
2014-03-06 14:50 2% ` [PATCH 3/6] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
0 siblings, 1 reply; 200+ results
From: Benoit Pierre @ 2014-03-06 14:50 UTC (permalink / raw)
To: git
This patch fixes the fact that hunk editing with 'commit -p -m' does not work:
GIT_EDITOR is set to ':' to indicate to hooks that no editor will be launched,
which result in the 'hunk edit' option not launching the editor (and selecting
the whole hunk).
The fix consists in deferring the GIT_EDITOR override to the hook subprocess,
like it's already done for GIT_INDEX_FILE:
- modify 'run_hook' so the first parameter is the environment to set
- add a 'run_hook_v' variant that take a va_list
- add a new 'run_commit_hook' helper (to set both GIT_EDITOR and GIT_INDEX_FILE)
N.B.: the merge builtin 'prepare-commit-msg' hook handling has also been updated
to be consistent; i.e. GIT_EDITOR will not be set to ':' if the '--edit' option
is used.
Benoit Pierre (6):
test patch hunk editing with "commit -p -m"
commit: fix patch hunk editing with "commit -p -m"
merge: fix GIT_EDITOR override for commit hook
merge hook tests: fix and update tests
merge hook tests: fix missing '&&' in test
merge hook tests: use 'test_must_fail' instead of '!'
builtin/commit.c | 35 ++++++++++++++++++++++++++++-------
builtin/merge.c | 4 ++--
commit.h | 3 +++
run-command.c | 27 +++++++++++++++------------
run-command.h | 3 ++-
t/t7505-prepare-commit-msg-hook.sh | 23 +++++++++++++++++++----
t/t7513-commit_-p_-m_hunk_edit.sh | 37 +++++++++++++++++++++++++++++++++++++
7 files changed, 106 insertions(+), 26 deletions(-)
create mode 100755 t/t7513-commit_-p_-m_hunk_edit.sh
--
1.9.0
^ permalink raw reply [relevance 3%]
* [PATCH 3/6] merge: fix GIT_EDITOR override for commit hook
2014-03-06 14:50 3% [PATCH 0/6] fix hunk editing with 'commit -p -m' Benoit Pierre
@ 2014-03-06 14:50 2% ` Benoit Pierre
0 siblings, 0 replies; 200+ results
From: Benoit Pierre @ 2014-03-06 14:50 UTC (permalink / raw)
To: git
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index d2a1bfe..da7cafe 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -821,7 +821,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
write_merge_msg(&msg);
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
--
1.9.0
^ permalink raw reply related [relevance 2%]
* Re: Branching workflow
@ 2013-12-03 19:12 3% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-12-03 19:12 UTC (permalink / raw)
To: Javier Domingo; +Cc: git@vger.kernel.org
Javier Domingo <javierdo1@gmail.com> writes:
> Hi,
>
> I have been using a very basic workflow for branching, features each
> in a branch.
>
> My branches would be:
> - develop <= Main upstream branch
> - feature/* fix/* <= Feature and fix branches
> - master <= Integration of the whole feature and fix branches
>
> So I have now came up with a very difficult task. I just discovered
> that one of those branches, lest call it feature/bad, is evil and is
> making the integration branch (master) fail horribly.
>
> In my workflow, I tend to merge develop (official updates) into my
> feature branches, and them into master.
I think the standard advice is not to contaminate feature branches
with unrelated changes, whether from an upstream updates or from
other unrelated feature breanches.
You would still want to make sure that your feature branches in
work-in-progress state would work with updated upstream from time to
time, but that is much better done by having a test integration
branch you maintain with:
: always start from the tip of upstream
$ git fetch upstream
$ git checkout -B develop remotes/upstream/master
: merge everything you want
$ git merge feature/A
$ git merge feature/B
...
$ git merge fix/Z
And you will never merge 'develop' into 'master'. Only after you
are satisfied with a single feature (or fix), you merge that to
'master', while your other features may still be suspect.
^ permalink raw reply [relevance 3%]
* [PATCH 1/3] unpack-trees: fix "read-tree -u --reset A B" with conflicted index
@ 2013-11-01 22:44 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-11-01 22:44 UTC (permalink / raw)
To: git; +Cc: Jeff King
From: Jeff King <peff@peff.net>
When we call "read-tree --reset -u HEAD ORIG_HEAD", the first thing we
do with the index is to call read_cache_unmerged. Originally that
would read the index, leaving aside any unmerged entries. However, as
of d1a43f2 (reset --hard/read-tree --reset -u: remove unmerged new
paths, 2008-10-15), it actually creates a new cache entry to serve as
a placeholder, so that we later know to update the working tree.
However, we later noticed that the sha1 of that unmerged entry was
just copied from some higher stage, leaving you with random content in
the index. That was fixed by e11d7b5 ("reset --merge": fix unmerged
case, 2009-12-31), which instead puts the null sha1 into the newly
created entry, and sets a CE_CONFLICTED flag. At the same time, it
teaches the unpack-trees machinery to pay attention to this flag, so
that oneway_merge throws away the current value.
However, it did not update the code paths for twoway_merge, which is
where we end up in the two-way read-tree with --reset. We notice that
the HEAD and ORIG_HEAD versions are the same, and say "oh, we can just
reuse the current version". But that's not true. The current version
is bogus.
Notice this case and make sure we do not keep the bogus entry; either
we do not have that path in the tree we are moving to (i.e. remove
it), or we want to have the cache entry we created for the tree we are
moving to (i.e. resolve by explicitly saying the "newtree" version is
what we want).
[jc: this is from the almost year-old $gmane/212316; the credit goes
to Peff, but we need his sign-off]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
unpack-trees.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 7c9ecf6..bf978e1 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1728,14 +1728,23 @@ int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
newtree = NULL;
if (current) {
- if ((!oldtree && !newtree) || /* 4 and 5 */
- (!oldtree && newtree &&
- same(current, newtree)) || /* 6 and 7 */
- (oldtree && newtree &&
- same(oldtree, newtree)) || /* 14 and 15 */
- (oldtree && newtree &&
- !same(oldtree, newtree) && /* 18 and 19 */
- same(current, newtree))) {
+ if (current->ce_flags & CE_CONFLICTED) {
+ if (same(oldtree, newtree) || o->reset) {
+ if (!newtree)
+ return deleted_entry(current, current, o);
+ else
+ return merged_entry(newtree, current, o);
+ }
+ return o->gently ? -1 : reject_merge(current, o);
+ }
+ else if ((!oldtree && !newtree) || /* 4 and 5 */
+ (!oldtree && newtree &&
+ same(current, newtree)) || /* 6 and 7 */
+ (oldtree && newtree &&
+ same(oldtree, newtree)) || /* 14 and 15 */
+ (oldtree && newtree &&
+ !same(oldtree, newtree) && /* 18 and 19 */
+ same(current, newtree))) {
return keep_entry(current, o);
}
else if (oldtree && !newtree && same(current, oldtree)) {
--
1.8.5-rc0-281-g8951339
^ permalink raw reply related [relevance 1%]
* Re: [PATCH] commit: Add -f, --fixes <commit> option to add Fixes: line
@ 2013-10-28 0:49 2% ` Jim Hill
0 siblings, 0 replies; 200+ results
From: Jim Hill @ 2013-10-28 0:49 UTC (permalink / raw)
To: Josh Triplett, git
Cc: Dan Carpenter, Greg KH, ksummit-2013-discuss, ksummit-attendees,
linux-kernel
On 10/26/13 18:34, Josh Triplett wrote:
> Linux Kernel ... "Fixes:" line ... containing an abbreviated commit hash
<!-- -->
> This helps people (or automated tools) determine how far to backport
I beg pardon if I'm rehearsing an old debate, but it seems to me it
would be better and worthwhile to bring more of git to bear by adding
`reference` links as follows from considering this proposed sequence:
# ...G---B---... history-with-bug-at-B
Gprime=`git commit-tree --reference G`
Bprime=`git commit-tree --reference B -p $Gprime`
# ...G---B---... history-with-bug-at-B
# : : # <-- `:`'s are `reference` links
# G'--B' $Bprime is a mergeable cherry-pick for B
`reference` links have no enforced semantics. Teach all current logic to
ignore them (fetch doesn't fetch through them, fsck doesn't care, etc.).
Elaborating some of the good parts:
* If the author and committer data are left untouched when
`commit-tree`'s tree and message arguments are defaulted, as above, to
the referenced commit's tree and message, the resulting commit is unique.
* Bullet-proof cherry-pick creation becomes easy and idempotent:
git-make-cherry-pick() {
local picked=$1
set -- `git rev-list --parents $picked^!`
shift
local parents
local parent
local p2
for parent; do
p2="$p2 -p `git commit-tree --reference $parent`"
done
git commit-tree --reference $picked $parents`
}
* Which makes the created commit id a fully-implemented _change-id_ for
the referenced commit:
git merge $(git-make-cherry-pick $B)
can be done from anywhere, merge won't have to rely on patch-id's
to detect cherry-picks done this way.
* A bugged commit gets fixed by fixing its reference commit and merging
normally, worry-free:
...G---B ... -F Merge fix X for a bug in B
: : /
G'--B'---X X's commit message is the `Fixes:` equivalent
Bugfix commit X can be safely merged anywhere. Worst case, `git
merge -s ours --no-commit X` and do whatever you would have done otherwise.
`merge` might usefully be updated to warn about merging from a commit
with only a reference parent, I think merging from `G'` would probably
be a mistake.
---
So, this is as far as I've gotten with this, is there reason to think it
should or shouldn't be pursued?
^ permalink raw reply [relevance 2%]
* Re: ANNOUNCE: git-integration -- Easily manage integration branches
@ 2013-07-30 17:57 2% ` John Keeping
0 siblings, 0 replies; 200+ results
From: John Keeping @ 2013-07-30 17:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Tue, Jul 30, 2013 at 09:45:49AM -0700, Junio C Hamano wrote:
> John Keeping <john@keeping.me.uk> writes:
>
> > I wrote this script a few months ago and have been using it pretty much
> > daily since then, so I figure it's time to see if anyone else finds it
> > useful...
> >
> > git-integration [1] is a script to help manage integration branches in
> > Git. By defining a base point and a set of branches to be merged to
> > form the integration branch, git-integration lets you easily rebuild an
> > integration branch when anything in it changes, as well as showing you
> > the status of all of the branches in the integration branch.
> >
> > For example, the instruction sheet for git-integration's "pu" branch
> > recently looked like this:
> >
> > base master
> >
> > merge make-clean
> >
> > Add a "clean" target to the makefile.
> >
> > merge version
> >
> > Support for "--version" option.
> >
> > N.B. this builds on "make-clean".
> >
> > merge skip-option
> >
> > Needs more work to be able to handle "branch not found".
> >
> > This tells git-integration to base the "pu" branch on "master" and merge
> > the "make-clean", "version" and "skip-option" branches in. The comments
> > following the "merge" instructions are added to the commit message for
> > the corresponding merge commit. When I want to rebuild the "pu" branch
> > I simply do:
> >
> > $ git integration --rebuild pu
> >
> > To change the contents of the branch, I either edit the instruction
> > sheet manually:
> >
> > $ git integration --edit pu
> >
> > or quickly add a new branch from the command line:
> >
> > $ git integration --add my-new-branch pu
> >
> > In fact, I can combine these to get the benefit of bash-completion on
> > the branch name and the ability to edit the instruction sheet - when
> > multiple commands are specified, git-integration performs each of them
> > in a sensible order, described in the manpage [2].
> >
> >
> > [1] http://johnkeeping.github.io/git-integration/
> > [2] http://johnkeeping.github.io/git-integration/git-integration.html
>
> Interesting.
>
> Would it help me to replay "evil merges" I previously made and avoid
> necessity to write merge log messages repeatedly?
Currently it does nothing beyond having the ability to continue
automatically if rerere manages to resolve all conflicts (disabled by
default). There is no equivalent of your refs/merge-fix/ feature,
although I think I might add one soon ;-).
Since the commit messages for the merge commits come from the
instruction sheet, it does avoid the need to write them repeatedly - if
you want to change the merge message you can simply update the
instruction sheet and rebuild.
> In short, can I replace my Meta/Reintegrate and Meta/cook with this
> (see Documentation/howto/maintain-git.txt)?
It performs the same basic function as those scripts, but it's quite a
lot simpler and hasn't been designed for the git.git workflow, so I
don't think it's suitable for replacing your existing scripts.
If I were starting from scratch and attempting to implement the git.git
workflow on top of git-integration, I think I would make
whats-cooking.txt a build artifact generated from the instruction sheet
for pu. This would require some new commands to be added to
git-integration's instruction sheet to let it assign sections to
branches, but ought to be possible. I expect there would be some
subtleties though - certainly git-integration's "--status" output does
not handle all of the cases the Meta/cook does, not least because it
only compares against a single base branch.
^ permalink raw reply [relevance 2%]
* Re: Premerging topics
2013-04-29 19:06 3% ` Antoine Pelisse
@ 2013-04-29 22:19 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-04-29 22:19 UTC (permalink / raw)
To: Antoine Pelisse; +Cc: Johan Herland, Michael Haggerty, Jeff King, git
Antoine Pelisse <apelisse@gmail.com> writes:
> Should we think about adding some commands for that ?
>
> On the very top of my head (there is certainly more than that):
> - Save such a change: By basically creating a ref to HEAD (HEAD being
> the commit, HEAD^ the fixed merge) with merge-fix/HEAD^^1-HEAD^^2
> - Apply the merge-fix: On top of a merge, find the most recent
> merge-fix for HEAD^1/HEAD^2 (according to what was discussed), and
> squash it.
Yeah, some nasties may live in the details, but these two operations
are needed and probably sufficient as the end-user facing UI.
The "save" step, when done manually, needs to be a two-step process
that saves M and then F separately, but somebody _might_ be able to
come up with a clever idea to let the user jump directly to F
without recording M. If such a triangle (A and B merges to F) can
be recorded as merge-fix/A-B, that would certainly be less error
prone and easier for the users to use. Having said that, in the
presense of possible textual conflicts when creating M, I do not
think of a way that is easily implementable mechanically to
internally sift changes for M and F when replaying it while
resolving a merge between X and Y to produce N and eventually F'.
The "apply" step should be a single step, and it should be easy to
implement mechanically if M and F are recorded separately (but
again, you may be able to re-synthesise M from A and B when you need
to replay the evil merge).
^ permalink raw reply [relevance 2%]
* Re: Premerging topics
@ 2013-04-29 19:06 3% ` Antoine Pelisse
2013-04-29 22:19 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Antoine Pelisse @ 2013-04-29 19:06 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johan Herland, Michael Haggerty, Jeff King, git
Should we think about adding some commands for that ?
On the very top of my head (there is certainly more than that):
- Save such a change: By basically creating a ref to HEAD (HEAD being
the commit, HEAD^ the fixed merge) with merge-fix/HEAD^^1-HEAD^^2
- Apply the merge-fix: On top of a merge, find the most recent
merge-fix for HEAD^1/HEAD^2 (according to what was discussed), and
squash it.
On Wed, Apr 24, 2013 at 9:14 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Johan Herland <johan@herland.net> writes:
>
>> This raises the same question I recently asked Antoine: For a given
>> prepackaged merge <X,Y>, do we assume that it only resolves conflicts
>> between the changes introduced in commit X vs. changes introduced in
>> commit Y, or do we assume that it resolves conflicts between the
>> histories leading up to X and Y, respectively? In other words, does
>> <X,Y> _supercede_ earlier pre-merges between the histories leading up
>> to X and Y?
>
> That is an interesting question. There are largely two cases.
>
> When you replayed M---F to produce N---F', there may have been no
> textual or semantic conflict. Which means that there were no new
> reason between A--X and B--Y that necessitates an evil merge. A
> later merge between a descendant of X (but not Y) and a descendant
> of Y (but not X) can cherry pick the same <A,B> (M---F) on top of a
> mechanical merge,
>
> On the other hand, you may have had either a textual or a semantic
> conflict when replaying <A,B> on N, and you had to fix up F' for it
> to be the correct resolution of merge between X and Y.
>
> ---o---o---A---o---X
> \ \
> \ N---F'
> \ /
> o---B---o---Y
>
> In such a case, you do want to record the fixed N---F' as the
> prepackaged resolution for <X,Y>. Any time later when somebody is
> on a branch that has X (but not Y) and merges a branch that has Y
> (but not X), that N---F' should be the one to cherry-pick on top of
> a mechanical merge O between S and T. What <A,B> (M---F) did is
> superseded if you are going to replay <X,Y>.
>
> ---o---o---A---o---X----------S
> \ \ \ \
> \ M--F N---F' O---F''
> \ / / /
> o---B---o---Y----------T
>
> You can tell that by noticing that A is an ancestor of X and B is an
> ancestor of Y. As you said, this is a good way to reduce the number
> of prepackaged evil merges that need to be considered.
>
^ permalink raw reply [relevance 3%]
* Re: Premerging topics
2013-04-24 5:48 3% ` Premerging topics Junio C Hamano
@ 2013-04-24 6:22 3% ` Johan Herland
0 siblings, 1 reply; 200+ results
From: Johan Herland @ 2013-04-24 6:22 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Antoine Pelisse, Michael Haggerty, Jeff King, git
On Wed, Apr 24, 2013 at 7:48 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Johan Herland <johan@herland.net> writes:
>
>>> But P is a commit(/merge with two parents), not a blob. Can we have trees
>>> pointing to commits instead of blobs ?
>>
>> Sort of. We do so when recording submodules in regular git trees.
>
> You are using notes to maintain reachability, aren't you? Because
> commit objects that appears in trees are not treated as reachable
> from the trees, that won't fly.
>
> I think you guys are making it unnecessarily complex by using notes.
> To record a prepared evil merge for merging branch that contains A
> with another branch that contains B (assuming that the interation
> between A and B is what makes the evil merge necessary, e.g. A
> renames a function foo() to bar(), while B adds new callsite that
> calls foo()), we can store a single commit that records the prepared
> evil merge under "refs/merge-fix/$A-$B" where A and B are their
> object names.
>
> Then when merging a branch Y that contains B into our history X that
> already contains A (or vice versa),
>
> ---o---o---A---o---X... ???
> \ .
> \ .
> \ .
> o---B----o---Y
>
> we can enumerate the commits that appear in "log --left-right X...Y"
> on the left/right side and notice there is refs/merge-fix/$A-$B.
>
> So the simplest implementation of "an efficient data store to record
> a commit for <A,B> pair" turns out to be just a ref namespace ;-)
>
> There may be other <C,D> pairs in X...Y history, and it probably is
> the sane thing to do to replay prepackaged evil merges from older to
> newer in the topological sense, but that loop would be trivial, once
> we understand how to replay a single such evil merge.
This raises the same question I recently asked Antoine: For a given
prepackaged merge <X,Y>, do we assume that it only resolves conflicts
between the changes introduced in commit X vs. changes introduced in
commit Y, or do we assume that it resolves conflicts between the
histories leading up to X and Y, respectively? In other words, does
<X,Y> _supercede_ earlier pre-merges between the histories leading up
to X and Y?
I think the latter makes more sense, since we can then reduce the
number of pre-merges to consider in the final merge. There might still
be more than one pre-merge to consider, though, e.g. in criss-cross
cases like this:
---o---o---o---o---o---o---o---o
\ / \ \
\ / \ \
\ / \ \
o---o---o P2 \
\ \ / \
\ \ / M
\ \ / /
o---o---+---o /
\ \ \ /
\ P1 \ /
\ / \ /
o---o---o---o---o
(there is no commit at the "+")
> The actual merge-fix data should be just a commit with a single
> parent. The easiest way to prepare it would be like this:
>
> ---o---o---A
> \ \
> \ M---F
> \ /
> o---B
>
> where M is the result of mechanical merge between A and B (there
> could be textual conflicts and you could choose to leave them in, or
> you could choose to have rerere resolve it. As long as you do the
> same when replaying this prepackaged evil merge, this choice does
> not matter, but using rerere will make your life easier), and F is
> the final result you would want, with semantics conflicts resolved.
> In other words, in the ideal world, you would have resolved a merge
> between A and B to record the tree of F.
>
> Point "F" with refs/merge-fix/$A-$B and you are done.
>
> When you replay this prepackaged evil merge, first you mechanically
> merge X and Y without worrying about M or F to produce N. If you
> allowed rerere to resolve textual conflicts between A and B when you
> recorded M, allow rerere to resolve this merge. Otherwise leave the
> textual conflict in.
>
> ---o---o---A---o---X
> \ \
> \ N
> \ /
> o---B---o---Y
>
> Then on top of N, you cherry-pick F, which will bring the semantic
> conflict resolution between M and F on top of N.
>
> ---o---o---A---o---X
> \ \
> \ N---F'
> \ /
> o---B---o---Y
>
> Once you know the tree shape of F', then you no longer need N. Just
> amend it away and make the tree recorded in F' the result of the
> merge between X and Y.
>
> ---o---o---A---o---X---.
> \ \
> \ F''
> \ /
> o---B---o---Y--.
This is obviously a much better way to solve it. It might already be
obvious, but I would suggest when making "refs/merge-fix/$A-$B" that you
canonicalize the name by always choosing A and B such that A precedes B
alphabetically. That way you won't have problems with both recording
"refs/merge-fix/$A-$B" and "refs/merge-fix/$B-$A".
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
^ permalink raw reply [relevance 3%]
* Re: Premerging topics
@ 2013-04-24 5:48 3% ` Junio C Hamano
2013-04-24 6:22 3% ` Johan Herland
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2013-04-24 5:48 UTC (permalink / raw)
To: Johan Herland; +Cc: Antoine Pelisse, Michael Haggerty, Jeff King, git
Johan Herland <johan@herland.net> writes:
>> But P is a commit(/merge with two parents), not a blob. Can we have trees
>> pointing to commits instead of blobs ?
>
> Sort of. We do so when recording submodules in regular git trees.
You are using notes to maintain reachability, aren't you? Because
commit objects that appears in trees are not treated as reachable
from the trees, that won't fly.
I think you guys are making it unnecessarily complex by using notes.
To record a prepared evil merge for merging branch that contains A
with another branch that contains B (assuming that the interation
between A and B is what makes the evil merge necessary, e.g. A
renames a function foo() to bar(), while B adds new callsite that
calls foo()), we can store a single commit that records the prepared
evil merge under "refs/merge-fix/$A-$B" where A and B are their
object names.
Then when merging a branch Y that contains B into our history X that
already contains A (or vice versa),
---o---o---A---o---X... ???
\ .
\ .
\ .
o---B----o---Y
we can enumerate the commits that appear in "log --left-right X...Y"
on the left/right side and notice there is refs/merge-fix/$A-$B.
So the simplest implementation of "an efficient data store to record
a commit for <A,B> pair" turns out to be just a ref namespace ;-)
There may be other <C,D> pairs in X...Y history, and it probably is
the sane thing to do to replay prepackaged evil merges from older to
newer in the topological sense, but that loop would be trivial, once
we understand how to replay a single such evil merge.
The actual merge-fix data should be just a commit with a single
parent. The easiest way to prepare it would be like this:
---o---o---A
\ \
\ M---F
\ /
o---B
where M is the result of mechanical merge between A and B (there
could be textual conflicts and you could choose to leave them in, or
you could choose to have rerere resolve it. As long as you do the
same when replaying this prepackaged evil merge, this choice does
not matter, but using rerere will make your life easier), and F is
the final result you would want, with semantics conflicts resolved.
In other words, in the ideal world, you would have resolved a merge
between A and B to record the tree of F.
Point "F" with refs/merge-fix/$A-$B and you are done.
When you replay this prepackaged evil merge, first you mechanically
merge X and Y without worrying about M or F to produce N. If you
allowed rerere to resolve textual conflicts between A and B when you
recorded M, allow rerere to resolve this merge. Otherwise leave the
textual conflict in.
---o---o---A---o---X
\ \
\ N
\ /
o---B---o---Y
Then on top of N, you cherry-pick F, which will bring the semantic
conflict resolution between M and F on top of N.
---o---o---A---o---X
\ \
\ N---F'
\ /
o---B---o---Y
Once you know the tree shape of F', then you no longer need N. Just
amend it away and make the tree recorded in F' the result of the
merge between X and Y.
---o---o---A---o---X---.
\ \
\ F''
\ /
o---B---o---Y--.
^ permalink raw reply [relevance 3%]
* Re: Premerging topics
2013-04-23 15:29 0% ` Junio C Hamano
@ 2013-04-23 15:36 0% ` Antoine Pelisse
0 siblings, 0 replies; 200+ results
From: Antoine Pelisse @ 2013-04-23 15:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johan Herland, Michael Haggerty, Jeff King, git
On Tue, Apr 23, 2013 at 5:29 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Antoine Pelisse <apelisse@gmail.com> writes:
>
>> And I
>> have the feeling that "merge-fix/B" or "merge-fix/A" doesn't hold
>> enough information to do that accurately.
>
> Oh, you do not have to resort to feeling; these names do _not_ hold
> enough information, period. We already know that, that was why I was
> unhappy, and that was why I sent the "annotating a pair of commit
> objects" RFD in the first place ;-).
:)
>> The idea is then to store the <A, B> pair as a note, and to associate
>> a "merge" to that (solving the semantic conflict).
>
> OK, and as the datastore for <A, B> pair you were thinking about
> using a specially-formatted blob and Johan suggested to use a
> regular tree object?
Exactly. But as I said, it should associate the pair to a merge. And
trees contain other trees or blobs, not commits. I'm wondering if this
is a problem.
^ permalink raw reply [relevance 0%]
* Re: Premerging topics
2013-04-23 15:17 2% ` Antoine Pelisse
@ 2013-04-23 15:29 0% ` Junio C Hamano
2013-04-23 15:36 0% ` Antoine Pelisse
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2013-04-23 15:29 UTC (permalink / raw)
To: Antoine Pelisse; +Cc: Johan Herland, Michael Haggerty, Jeff King, git
Antoine Pelisse <apelisse@gmail.com> writes:
> And I
> have the feeling that "merge-fix/B" or "merge-fix/A" doesn't hold
> enough information to do that accurately.
Oh, you do not have to resort to feeling; these names do _not_ hold
enough information, period. We already know that, that was why I was
unhappy, and that was why I sent the "annotating a pair of commit
objects" RFD in the first place ;-).
> The idea is then to store the <A, B> pair as a note, and to associate
> a "merge" to that (solving the semantic conflict).
OK, and as the datastore for <A, B> pair you were thinking about
using a specially-formatted blob and Johan suggested to use a
regular tree object?
^ permalink raw reply [relevance 0%]
* Re: Premerging topics
2013-04-23 14:53 3% ` Junio C Hamano
@ 2013-04-23 15:17 2% ` Antoine Pelisse
2013-04-23 15:29 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Antoine Pelisse @ 2013-04-23 15:17 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johan Herland, Michael Haggerty, Jeff King, git
On Tue, Apr 23, 2013 at 4:53 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Johan Herland <johan@herland.net> writes:
>
>> Can you solve this problem with a tree object, instead of inventing a
>> specially-formatted blob?
>
> Hmm. What problem are you guys trying to solve?
>
> [snipped..]
> And that was why I wanted to have a data structure that is quick to
> query to answer "I am about to merge B. Does the history already
> have an A for which I have recorded a merge-fix for <A,B> pair?"
That's exactly the problem I'm trying to solve.
I'm willing to have an efficient way to merge topicC that has semantic
conflicts with topicA and topicB.
As topics will be merged together first in pu, then in next and
finally in master, chances are that they won't be merged in the same
order (or then, why would we even care about a topic workflow?). And I
have the feeling that "merge-fix/B" or "merge-fix/A" doesn't hold
enough information to do that accurately.
The idea is then to store the <A, B> pair as a note, and to associate
a "merge" to that (solving the semantic conflict). It would then be
used as an implicit third parent for the merge of "branch containing
A" and "branch containing B". This is pretty much what Michael said in
the $gmane you talked about.
Cheers,
Antoine
^ permalink raw reply [relevance 2%]
* Re: Premerging topics
@ 2013-04-23 14:53 3% ` Junio C Hamano
2013-04-23 15:17 2% ` Antoine Pelisse
1 sibling, 1 reply; 200+ results
From: Junio C Hamano @ 2013-04-23 14:53 UTC (permalink / raw)
To: Johan Herland; +Cc: Antoine Pelisse, Michael Haggerty, Jeff King, git
Johan Herland <johan@herland.net> writes:
> Can you solve this problem with a tree object, instead of inventing a
> specially-formatted blob?
Hmm. What problem are you guys trying to solve?
I think Michael's use of a merge commit to record a merge result is
sufficient as a means to record how to recreate an evil merge.
http://thread.gmane.org/gmane.comp.version-control.git/212570/focus=212578
FWIW, in the [RFD], I wasn't asking for ideas on that part. When
rebuiling 'pu', I use an even simpler solution to have rerere
autoresolve the mechanical part of the merge, and then cherry-pick a
separate commit from refs/merge-fix/ hierarchy on the result, and it
works perfectly fine (this is done by the 'Reintegrate' script on
the 'todo' branch; see Documentation/howto/maintain-git.txt).
When topic A is closer to be done than topic B (in other words, when
I merge topic B to an integration branch, topic A is already merged
there), and these topics have semantic conflicts (e.g. A renames a
function foo() to bar(), while B adds a new callsite of foo()), a
mechanical merge of B may succeed without any textual conflict (or
if there is, rerere can resolve it), but a semantic fix-up needs to
do "s/foo/bar/g" on the result.
I would do something like this for the first time:
... while on 'pu', A has already been merged ...
git merge B ;# may conflict
edit textual conflicts away
git rerere ;# remember the textual resolution
git commit ;# commit _without_ semantics adjustment
edit semantic conflict away, i.e. s/foo/bar/g
git commit
git update-ref refs/merge-fix/B
After that, next time I rebuild 'pu', when the automated procedure
processes B, it would "git merge B", "git rerere", make sure textual
conflicts are gone, and "git cherry-pick refs/merge-fix/B". To make
sure this would work, what I typically do immediately after doing
all of the above is:
git reset --hard HEAD^^
to drop the fix-up commit and merge of B, and actually tell the
automated procedure to process B. It should recreate the evil merge
using the information I just recorded.
So "how a recipe to recreate an evil merge is recorded", as far as I
am concerned, is an already solved problem.
The part of the existing solution I was not happy was deciding when
to use which "merge-fix" commit to cherry-pick. If I start merging
topic B before topic A, the "merge-fix/B" needs to be renamed to
"merge-fix/A" in the above. Otherwise, when B is merged to 'pu',
there is no 'A' merged to it yet, so merge-fix that munges its new
call to foo() to call bar() instead will _break_ things [*1*].
And that was why I wanted to have a data structure that is quick to
query to answer "I am about to merge B. Does the history already
have an A for which I have recorded a merge-fix for <A,B> pair?"
[Footnote]
*1* If A has other kinds of conflicts with other topics, it is not
sufficient to just rename "merge-fix/B" to "merge-fix/A"---the
effect of cherry-picking "merge-fix/B" needs to be merged to
existing "merge-fix/A". If a merge-fix is recorded for a pair of
commits that necessitates an evil merge, this naturally goes away.
I can keep a merge-fix for the <A,B> pair whether I merge A before
or after B, and semantic conflicts A may have with another topic C
would be stored in a separate merge-fix for <A,C> pair.
^ permalink raw reply [relevance 3%]
* Re: [PATCH 4/6] dir.c::match_pathname(): pay attention to the length of string parameters
2013-03-29 17:04 0% ` Jeff King
@ 2013-03-29 17:35 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-03-29 17:35 UTC (permalink / raw)
To: Jeff King; +Cc: Duy Nguyen, git, avila.jn
Jeff King <peff@peff.net> writes:
> On Fri, Mar 29, 2013 at 09:44:32AM -0700, Junio C Hamano wrote:
> ...
>> With the merge-fix, fnmatch_icase_mem() calls into wildmatch(), but
>> fnmatch_icase() still calls into fnmatch().
>>
>> The latter's flags are meant to be taken from FNM_* family, but the
>> former takes flags from WM_* family of bits, no?
>
> Yeah, that does not seem right. If match_pathname has learned to call
> into wildmatch instead of fnmatch_icase in the interim, then the right
> resolution is to convert its call to fnmatch_icase_mem to a new
> wildmatch_mem. Presumably that can be done by either tweaking
> fnmatch_icase_mem, or, if wildmatch is ready to take counted strings,
> calling into it with the right options.
>
>> I think you are running with USE_WILDMATCH which may make the
>> differences harder to notice, but the name fnmatch_icase_mem() that is
>> not in the same family as fnmatch but is from the wildmatch() family
>> smells like an accident waiting to happen.
>
> Agreed.
This may be just the matter of naming.
It smelled wrong to me only because the "fnmatch" in the helper
fnmatch_icase_mem() told me that it should forever use fnmatch
semantics. After reading its (only) two callsites, they are both
"the caller has transformed the inputs to this lowest level pathname
vs pattern matching function in order to reduce the cost of
matching, and now it is time to exercise the matcher". The only
thing they care about is that they are calling "the lowest level
pathname vs pattern matching function."
If we pronounce "fnmatch_icase_mem()" as "match_path_with_pattern()"
or something in the original series, the problem may go away ;-)
Does any caller pass FNM_* bits to a callchain that reach the new *_mem()
function?
^ permalink raw reply [relevance 0%]
* Re: [PATCH 4/6] dir.c::match_pathname(): pay attention to the length of string parameters
2013-03-29 16:44 2% ` Junio C Hamano
@ 2013-03-29 17:04 0% ` Jeff King
2013-03-29 17:35 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Jeff King @ 2013-03-29 17:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Duy Nguyen, git, avila.jn
On Fri, Mar 29, 2013 at 09:44:32AM -0700, Junio C Hamano wrote:
> Duy Nguyen <pclouds@gmail.com> writes:
>
> >> So we would want to do any adjustment to the fix when we merge up to
> >> maint.
> >
> > OK. Then Junio, you may need to resolve the conflict with something
> > like this. Originally match_basename uses fnmatch, not wildmatch. But
> > using wildmatch there too should be fine, now that both
> > match_{base,path}name share fnmatch_icase_mem().
>
> Thanks.
>
> The result still smells somewhat funny, though.
>
> fnmatch_icase_mem() is meant to be a wrapper of fnmatch_icase() for
> counted strings and its matching semantics should be the same as
> fnmatch_icase().
>
> With the merge-fix, fnmatch_icase_mem() calls into wildmatch(), but
> fnmatch_icase() still calls into fnmatch().
>
> The latter's flags are meant to be taken from FNM_* family, but the
> former takes flags from WM_* family of bits, no?
Yeah, that does not seem right. If match_pathname has learned to call
into wildmatch instead of fnmatch_icase in the interim, then the right
resolution is to convert its call to fnmatch_icase_mem to a new
wildmatch_mem. Presumably that can be done by either tweaking
fnmatch_icase_mem, or, if wildmatch is ready to take counted strings,
calling into it with the right options.
> I think you are running with USE_WILDMATCH which may make the
> differences harder to notice, but the name fnmatch_icase_mem() that is
> not in the same family as fnmatch but is from the wildmatch() family
> smells like an accident waiting to happen.
Agreed.
> I tend to think in the longer term it may be a good idea to build with
> USE_WILDMATCH unconditionally (we can lose compat/fnmatch), so in the
> end this may not matter that much
Yeah, I think that is a sane long-term goal.
-Peff
^ permalink raw reply [relevance 0%]
* Re: [PATCH 4/6] dir.c::match_pathname(): pay attention to the length of string parameters
@ 2013-03-29 16:44 2% ` Junio C Hamano
2013-03-29 17:04 0% ` Jeff King
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2013-03-29 16:44 UTC (permalink / raw)
To: Duy Nguyen; +Cc: Jeff King, git, avila.jn
Duy Nguyen <pclouds@gmail.com> writes:
>> So we would want to do any adjustment to the fix when we merge up to
>> maint.
>
> OK. Then Junio, you may need to resolve the conflict with something
> like this. Originally match_basename uses fnmatch, not wildmatch. But
> using wildmatch there too should be fine, now that both
> match_{base,path}name share fnmatch_icase_mem().
Thanks.
The result still smells somewhat funny, though.
fnmatch_icase_mem() is meant to be a wrapper of fnmatch_icase() for
counted strings and its matching semantics should be the same as
fnmatch_icase().
With the merge-fix, fnmatch_icase_mem() calls into wildmatch(), but
fnmatch_icase() still calls into fnmatch().
The latter's flags are meant to be taken from FNM_* family, but the
former takes flags from WM_* family of bits, no?
I think you are running with USE_WILDMATCH which may make the
differences harder to notice, but the name fnmatch_icase_mem() that
is not in the same family as fnmatch but is from the wildmatch()
family smells like an accident waiting to happen.
I tend to think in the longer term it may be a good idea to build
with USE_WILDMATCH unconditionally (we can lose compat/fnmatch), so
in the end this may not matter that much, but before that happens,
soon after we merge the regression fix with this merge-fix, we may
want to update the codebase as if we applied a series that were
based on 'maint' as you suggested, i.e. using raw wildmatch()
consistently in the match_{base,path}name() codepath.
Opinions?
>
> -- 8< --
> diff --git a/dir.c b/dir.c
> index 73a08af..84744df 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -81,7 +81,9 @@ static int fnmatch_icase_mem(const char *pattern, int patternlen,
> use_str = str_buf.buf;
> }
>
> - match_status = fnmatch_icase(use_pat, use_str, flags);
> + if (ignore_case)
> + flags |= WM_CASEFOLD;
> + match_status = wildmatch(use_pat, use_str, flags, NULL);
>
> strbuf_release(&pat_buf);
> strbuf_release(&str_buf);
> @@ -564,7 +566,7 @@ int match_pathname(const char *pathname, int pathlen,
>
> return fnmatch_icase_mem(pattern, patternlen,
> name, namelen,
> - FNM_PATHNAME) == 0;
> + WM_PATHNAME) == 0;
> }
>
> /*
> -- 8< --
^ permalink raw reply [relevance 2%]
* [PATCH v2] Documentation: update "howto maintain git"
@ 2013-01-03 20:40 6% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2013-01-03 20:40 UTC (permalink / raw)
To: git
The flow described in the document is still correct, but over time I
have automated various parts of the workflow with tools and their
use was not explained at all.
Update it and outline the use of two key scripts from the 'todo'
branch, "Reintegrate" and "cook".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* I sent an incomplete preview some time ago; this is an update.
The old one is at:
http://thread.gmane.org/gmane.comp.version-control.git/210632
Antoine Cc'ed because this is a more detailed answer to his
question in:
http://thread.gmane.org/gmane.comp.version-control.git/212127/focus=212333
Documentation/howto/maintain-git.txt | 314 +++++++++++++++++++++++++----------
1 file changed, 225 insertions(+), 89 deletions(-)
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index 8823a37..a4ec3cb 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -8,20 +8,20 @@ Abstract: Imagine that git development is racing along as usual, when our friend
The maintainer's git time is spent on three activities.
- - Communication (60%)
+ - Communication (45%)
Mailing list discussions on general design, fielding user
questions, diagnosing bug reports; reviewing, commenting on,
suggesting alternatives to, and rejecting patches.
- - Integration (30%)
+ - Integration (50%)
Applying new patches from the contributors while spotting and
correcting minor mistakes, shuffling the integration and
testing branches, pushing the results out, cutting the
releases, and making announcements.
- - Own development (10%)
+ - Own development (5%)
Scratching my own itch and sending proposed patch series out.
@@ -35,6 +35,9 @@ The policy.
contain bugfixes and enhancements in any area, including
functionality, performance and usability, without regression.
+ - One release cycle for a feature release is expected to last for
+ eight to ten weeks.
+
- Maintenance releases are numbered as vX.Y.Z.W and are meant
to contain only bugfixes for the corresponding vX.Y.Z feature
release and earlier maintenance releases vX.Y.Z.V (V < W).
@@ -58,12 +61,15 @@ The policy.
- 'pu' branch is used to publish other proposed changes that do
not yet pass the criteria set for 'next'.
- - The tips of 'master', 'maint' and 'next' branches will always
- fast-forward, to allow people to build their own
- customization on top of them.
+ - The tips of 'master' and 'maint' branches will not be rewound to
+ allow people to build their own customization on top of them.
+ Early in a new development cycle, 'next' is rewound to the tip of
+ 'master' once, but otherwise it will not be rewound until the end
+ of the cycle.
- - Usually 'master' contains all of 'maint', 'next' contains all
- of 'master' and 'pu' contains all of 'next'.
+ - Usually 'master' contains all of 'maint' and 'next' contains all
+ of 'master'. 'pu' contains all the topics merged to 'next', but
+ is rebuilt directly on 'master'.
- The tip of 'master' is meant to be more stable than any
tagged releases, and the users are encouraged to follow it.
@@ -76,11 +82,16 @@ The policy.
A typical git day for the maintainer implements the above policy
by doing the following:
- - Scan mailing list and #git channel log. Respond with review
- comments, suggestions etc. Kibitz. Collect potentially
- usable patches from the mailing list. Patches about a single
- topic go to one mailbox (I read my mail in Gnus, and type
- \C-o to save/append messages in files in mbox format).
+ - Scan mailing list. Respond with review comments, suggestions
+ etc. Kibitz. Collect potentially usable patches from the
+ mailing list. Patches about a single topic go to one mailbox (I
+ read my mail in Gnus, and type \C-o to save/append messages in
+ files in mbox format).
+
+ - Write his own patches to address issues raised on the list but
+ nobody has stepped up solving. Send it out just like other
+ contributors do, and pick them up just like patches from other
+ contributors (see above).
- Review the patches in the saved mailboxes. Edit proposed log
message for typofixes and clarifications, and add Acks
@@ -96,40 +107,32 @@ by doing the following:
- Obviously correct fixes that pertain to the tip of 'master'
are directly applied to 'master'.
+ - Other topics are not handled in this step.
+
This step is done with "git am".
$ git checkout master ;# or "git checkout maint"
- $ git am -3 -s mailbox
+ $ git am -sc3 mailbox
$ make test
- - Merge downwards (maint->master):
-
- $ git checkout master
- $ git merge maint
- $ make test
+ In practice, almost no patch directly goes to 'master' or
+ 'maint'.
- Review the last issue of "What's cooking" message, review the
- topics scheduled for merging upwards (topic->master and
- topic->maint), and merge.
+ topics ready for merging (topic->master and topic->maint). Use
+ "Meta/cook -w" script (where Meta/ contains a checkout of the
+ 'todo' branch) to aid this step.
+
+ And perform the merge. Use "Meta/Reintegrate -e" script (see
+ later) to aid this step.
+
+ $ Meta/cook -w last-issue-of-whats-cooking.mbox
$ git checkout master ;# or "git checkout maint"
- $ git merge ai/topic ;# or "git merge ai/maint-topic"
+ $ echo ai/topic | Meta/Reintegrate -e ;# "git merge ai/topic"
$ git log -p ORIG_HEAD.. ;# final review
$ git diff ORIG_HEAD.. ;# final review
$ make test ;# final review
- $ git branch -d ai/topic ;# or "git branch -d ai/maint-topic"
-
- - Merge downwards (maint->master) if needed:
-
- $ git checkout master
- $ git merge maint
- $ make test
-
- - Merge downwards (master->next) if needed:
-
- $ git checkout next
- $ git merge master
- $ make test
- Handle the remaining patches:
@@ -138,9 +141,9 @@ by doing the following:
and not in 'master') is applied to a new topic branch that
is forked from the tip of 'master'. This includes both
enhancements and unobvious fixes to 'master'. A topic
- branch is named as ai/topic where "ai" is typically
- author's initial and "topic" is a descriptive name of the
- topic (in other words, "what's the series is about").
+ branch is named as ai/topic where "ai" is two-letter string
+ named after author's initial and "topic" is a descriptive name
+ of the topic (in other words, "what's the series is about").
- An unobvious fix meant for 'maint' is applied to a new
topic branch that is forked from the tip of 'maint'. The
@@ -158,7 +161,8 @@ by doing the following:
The above except the "replacement" are all done with:
- $ git am -3 -s mailbox
+ $ git checkout ai/topic ;# or "git checkout -b ai/topic master"
+ $ git am -sc3 mailbox
while patch replacement is often done by:
@@ -166,93 +170,166 @@ by doing the following:
then replace some parts with the new patch, and reapplying:
+ $ git checkout ai/topic
$ git reset --hard ai/topic~$n
- $ git am -3 -s 000*.txt
+ $ git am -sc3 -s 000*.txt
The full test suite is always run for 'maint' and 'master'
after patch application; for topic branches the tests are run
as time permits.
- - Update "What's cooking" message to review the updates to
- existing topics, newly added topics and graduated topics.
-
- This step is helped with Meta/cook script (where Meta/ contains
- a checkout of the 'todo' branch).
+ - Merge maint to master as needed:
- - Merge topics to 'next'. For each branch whose tip is not
- merged to 'next', one of three things can happen:
+ $ git checkout master
+ $ git merge maint
+ $ make test
- - The commits are all next-worthy; merge the topic to next:
+ - Merge master to next as needed:
$ git checkout next
- $ git merge ai/topic ;# or "git merge ai/maint-topic"
+ $ git merge master
$ make test
+ - Review the last issue of "What's cooking" again and see if topics
+ that are ready to be merged to 'next' are still in good shape
+ (e.g. has there any new issue identified on the list with the
+ series?)
+
+ - Prepare 'jch' branch, which is used to represent somewhere
+ between 'master' and 'pu' and often is slightly ahead of 'next'.
+
+ $ Meta/Reintegrate master..pu >Meta/redo-jch.sh
+
+ The result is a script that lists topics to be merged in order to
+ rebuild 'pu' as the input to Meta/Reintegrate script. Remove
+ later topics that should not be in 'jch' yet. Add a line that
+ consists of '###' before the name of the first topic in the output
+ that should be in 'jch' but not in 'next' yet.
+
+ - Now we are ready to start merging topics to 'next'. For each
+ branch whose tip is not merged to 'next', one of three things can
+ happen:
+
+ - The commits are all next-worthy; merge the topic to next;
- The new parts are of mixed quality, but earlier ones are
- next-worthy; merge the early parts to next:
+ next-worthy; merge the early parts to next;
+ - Nothing is next-worthy; do not do anything.
+
+ This step is aided with Meta/redo-jch.sh script created earlier.
+ If a topic that was already in 'next' gained a patch, the script
+ would list it as "ai/topic~1". To include the new patch to the
+ updated 'next', drop the "~1" part; to keep it excluded, do not
+ touch the line. If a topic that was not in 'next' should be
+ merged to 'next', add it at the end of the list. Then:
+
+ $ git checkout -B jch master
+ $ Meta/redo-jch.sh -c1
+
+ to rebuild the 'jch' branch from scratch. "-c1" tells the script
+ to stop merging at the '###' line you added earlier.
+
+ At this point, build-test the result. It may reveal semantic
+ conflicts (e.g. a topic renamed a variable, another added a new
+ reference to the variable under its old name), in which case
+ prepare an appropriate merge-fix first (see appendix), and
+ rebuild the 'jch' branch from scratch, starting at the tip of
+ 'master'.
+
+ Then do the same to 'next'
$ git checkout next
- $ git merge ai/topic~2 ;# the tip two are dubious
- $ make test
+ $ sh Meta/redo-jch.sh -c1 -e
- - Nothing is next-worthy; do not do anything.
+ The "-e" option allows the merge message that comes from the
+ history of the topic and the comments in the "What's cooking" to
+ be edited. The resulting tree should match 'jch' as the same set
+ of topics are merged on 'master'; otherwise there is a mismerge.
+ Investigate why and do not proceed until the mismerge is found
+ and rectified.
- - [** OBSOLETE **] Optionally rebase topics that do not have any commit
- in next yet, when they can take advantage of low-level framework
- change that is merged to 'master' already.
+ $ git diff jch next
- $ git rebase master ai/topic
+ When all is well, clean up the redo-jch.sh script with
- This step is helped with Meta/git-topic.perl script to
- identify which topic is rebaseable. There also is a
- pre-rebase hook to make sure that topics that are already in
- 'next' are not rebased beyond the merged commit.
+ $ sh Meta/redo-jch.sh -u
- - [** OBSOLETE **] Rebuild "pu" to merge the tips of topics not in 'next'.
+ This removes topics listed in the script that have already been
+ merged to 'master'. This unfortunately loses the "###" marker,
+ so add it again to the appropriate place.
- $ git checkout pu
- $ git reset --hard next
- $ git merge ai/topic ;# repeat for all remaining topics
- $ make test
+ - Rebuild 'pu'.
+
+ $ Meta/Reintegrate master..pu >Meta/redo-pu.sh
+
+ Edit the result by adding new topics that are not still in 'pu'
+ in the script. Then
+
+ $ git checkout -B pu jch
+ $ sh Meta/redo-pu.sh
+
+ When all is well, clean up the redo-pu.sh script with
+
+ $ sh Meta/redo-pu.sh -u
+
+ Double check by running
+
+ $ git branch --no-merged pu
+
+ to see there is no unexpected leftover topics.
+
+ At this point, build-test the result for semantic conflicts, and
+ if there are, prepare an appropriate merge-fix first (see
+ appendix), and rebuild the 'pu' branch from scratch, starting at
+ the tip of 'jch'.
+
+ - Update "What's cooking" message to review the updates to
+ existing topics, newly added topics and graduated topics.
- This step is helped with Meta/PU script
+ This step is helped with Meta/cook script.
- - Push four integration branches to a private repository at
- k.org and run "make test" on all of them.
+ $ Meta/cook
- - Push four integration branches to /pub/scm/git/git.git at
- k.org. This triggers its post-update hook which:
+ This script inspects the history between master..pu, finds tips
+ of topic branches, compares what it found with the current
+ contents in Meta/whats-cooking.txt, and updates that file.
+ Topics not listed in the file but are found in master..pu are
+ added to the "New topics" section, topics listed in the file that
+ are no longer found in master..pu are moved to the "Graduated to
+ master" section, and topics whose commits changed their states
+ (e.g. used to be only in 'pu', now merged to 'next') are updated
+ with change markers "<<" and ">>".
- (1) runs "git pull" in $HOME/git-doc/ repository to pull
- 'master' just pushed out;
+ Look for lines enclosed in "<<" and ">>"; they hold contents from
+ old file that are replaced by this integration round. After
+ verifying them, remove the old part. Review the description for
+ each topic and update its doneness and plan as needed. To review
+ the updated plan, run
- (2) runs "make doc" in $HOME/git-doc/, install the generated
- documentation in staging areas, which are separate
- repositories that have html and man branches checked
- out.
+ $ Meta/cook -w
- (3) runs "git commit" in the staging areas, and run "git
- push" back to /pub/scm/git/git.git/ to update the html
- and man branches.
+ which will pick up comments given to the topics, such as "Will
+ merge to 'next'", etc. (see Meta/cook script to learn what kind
+ of phrases are supported).
- (4) installs generated documentation to /pub/software/scm/git/docs/
- to be viewed from http://www.kernel.org/
+ - Compile, test and install all four (five) integration branches;
+ Meta/Dothem script may aid this step.
- - Fetch html and man branches back from k.org, and push four
- integration branches and the two documentation branches to
- repo.or.cz and other mirrors.
+ - Format documentation if the 'master' branch was updated;
+ Meta/dodoc.sh script may aid this step.
+ - Push the integration branches out to public places; Meta/pushall
+ script may aid this step.
Some observations to be made.
- * Each topic is tested individually, and also together with
- other topics cooking in 'next'. Until it matures, none part
- of it is merged to 'master'.
+ * Each topic is tested individually, and also together with other
+ topics cooking first in 'pu', then in 'jch' and then in 'next'.
+ Until it matures, no part of it is merged to 'master'.
* A topic already in 'next' can get fixes while still in
'next'. Such a topic will have many merges to 'next' (in
other words, "git log --first-parent next" will show many
- "Merge ai/topic to next" for the same topic.
+ "Merge branch 'ai/topic' to next" for the same topic.
* An unobvious fix for 'maint' is cooked in 'next' and then
merged to 'master' to make extra sure it is Ok and then
@@ -274,3 +351,62 @@ Some observations to be made.
* Being in the 'next' branch is not a guarantee for a topic to
be included in the next feature release. Being in the
'master' branch typically is.
+
+
+[Appendix]
+
+Preparing a "merge-fix"
+
+A merge of two topics may not textually conflict but still have
+conflict at the semantic level. A classic example is for one topic
+to rename an variable and all its uses, while another topic adds a
+new use of the variable under its old name. When these two topics
+are merged together, the reference to the variable newly added by
+the latter topic will still use the old name in the result.
+
+The Meta/Reintegrate script that is used by redo-jch and redo-pu
+scripts implements a crude but usable way to work this issue around.
+When the script merges branch $X, it checks if "refs/merge-fix/$X"
+exists, and if so, the effect of it is squashed into the result of
+the mechanical merge. In other words,
+
+ $ echo $X | Meta/Reintegrate
+
+is roughly equivalent to this sequence:
+
+ $ git merge --rerere-autoupdate $X
+ $ git commit
+ $ git cherry-pick -n refs/merge-fix/$X
+ $ git commit --amend
+
+The goal of this "prepare a merge-fix" step is to come up with a
+commit that can be squashed into a result of mechanical merge to
+correct semantic conflicts.
+
+After finding that the result of merging branch "ai/topic" to an
+integration branch had such a semantic conflict, say pu~4, check the
+problematic merge out on a detached HEAD, edit the working tree to
+fix the semantic conflict, and make a separate commit to record the
+fix-up:
+
+ $ git checkout pu~4
+ $ git show -s --pretty=%s ;# double check
+ Merge branch 'ai/topic' to pu
+ $ edit
+ $ git commit -m 'merge-fix/ai/topic' -a
+
+Then make a reference "refs/merge-fix/ai/topic" to point at this
+result:
+
+ $ git update-ref refs/merge-fix/ai/topic HEAD
+
+Then double check the result by asking Meta/Reintegrate to redo the
+merge:
+
+ $ git checkout pu~5 ;# the parent of the problem merge
+ $ echo ai/topic | Meta/Reintegrate
+ $ git diff pu~4
+
+This time, because you prepared refs/merge-fix/ai/topic, the
+resulting merge should have been tweaked to include the fix for the
+semantic conflict.
--
1.8.1.293.g4a210a9
^ permalink raw reply related [relevance 6%]
* Re: [PATCH 1/2] dir.c: Make git-status --ignored more consistent
@ 2012-12-30 21:36 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2012-12-30 21:36 UTC (permalink / raw)
To: Antoine Pelisse; +Cc: git, Jeff King, Adam Spiers
Antoine Pelisse <apelisse@gmail.com> writes:
> By the way, that merges without conflicts with Adam's series, but it
> will not compile as he renamed functions that I'm now using
> (path_excluded() -> is_path_excluded() that is).
>
> By the way, Junio, how do you handle this situation as a maintainer ?
> Do you keep a note to manually make the change every time you remerge
> the series together ? That is the kind of use-case you can't handle
> with git-rerere, and I've been trying to find a solution to it.
I'll finish the write-up on jc/doc-maintainer topic not in a very
distant future, but not today.
In the meantime, the hint is in the use of refs/merge-fix/ hierarchy
in the Reintegrate script found on my 'todo' branch (which I have a
separate clone/checkout of in "Meta/" directory in my main working
tree).
^ permalink raw reply [relevance 2%]
* [BUG] two-way read-tree can write null sha1s into index
@ 2012-12-29 20:51 1% ` Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2012-12-29 20:51 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: git, Junio C Hamano
On Sat, Dec 29, 2012 at 06:05:41AM -0500, Jeff King wrote:
> [clear state from last run]
> $ rm -rf .git/rebase-apply
> $ git reset --hard
>
> [apply the patch; we get a conflict]
> $ git am -3sc queue-3.2/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch
>
> [now run just the read-tree from "am --abort"]
> $ git.compile read-tree --reset -u HEAD ORIG_HEAD
> warning: cache entry has null sha1: sound/usb/midi.c
>
> [and now check our index]
> $ git ls-files -s sound/usb/midi.c
> 100644 0000000000000000000000000000000000000000 0 sound/usb/midi.c
>
> [yes, this index is bogus]
> $ git write-tree
> error: invalid object 100644 0000000000000000000000000000000000000000 for 'sound/usb/midi.c'
> fatal: git-write-tree: error building trees
>
> So I think this check may actually be finding a real bug. I have seen
> these null sha1s in the wild, but I was never able to track down the
> actual cause. Maybe this will give us a clue. Now we just need to work
> backwards and figure out who is putting it in the in-memory index and
> why.
I made some progress on this, but I'd like a sanity check from others
(especially Junio). As far as I can tell, this is a bug in read-tree.
When we call "read-tree --reset -u HEAD ORIG_HEAD", the first thing we
do with the index is call read_cache_unmerged. Originally that would
read the index, leaving aside any unmerged entries. However, as of
d1a43f2 (reset --hard/read-tree --reset -u: remove unmerged new paths,
2008-10-15), it actually creates a new cache entry. This serves as a
placeholder, so that we later know to update the working tree.
However, we later noticed that the sha1 of that unmerged entry was
just copied from some higher stage, leaving you with random content in
the index. That was fixed by e11d7b5 ("reset --merge": fix unmerged
case, 2009-12-31), which instead puts the null sha1 into the newly
created entry, and sets a CE_CONFLICTED flag. At the same time, it
teaches the unpack-trees machinery to pay attention to this flag, so
that oneway_merge throws away the current value.
However, it did not update the code paths for twoway_merge, which is
where we end up in the read-tree above. We notice that the HEAD and
ORIG_HEAD versions are the same, and say "oh, we can just reuse the
current version". But that's not true. The current version is bogus.
So I think we need to update twoway_merge to recognize unmerged entries,
which gives us two options:
1. Reject the merge.
2. Throw away the current unmerged entry in favor of the "new" entry
(when old and new are the same, of course; otherwise we would
reject).
I think (2) is the right thing. It fixes the entry of the bogus sha1
into the index, _and_ it solves the problem that "git am --abort" leaves
the conflicted entry as a modification. It should just go away. But
maybe I am forgetting some other case where read-tree should be more
conservative, and (1) is a safer choice.
Something like this patch:
diff --git a/unpack-trees.c b/unpack-trees.c
index 6d96366..e06e01f 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1746,14 +1746,19 @@ int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
newtree = NULL;
if (current) {
- if ((!oldtree && !newtree) || /* 4 and 5 */
- (!oldtree && newtree &&
- same(current, newtree)) || /* 6 and 7 */
- (oldtree && newtree &&
- same(oldtree, newtree)) || /* 14 and 15 */
- (oldtree && newtree &&
- !same(oldtree, newtree) && /* 18 and 19 */
- same(current, newtree))) {
+ if (current->ce_flags & CE_CONFLICTED) {
+ if (same(oldtree, newtree))
+ return merged_entry(newtree, current, o);
+ return o->gently ? -1 : reject_merge(current, o);
+ }
+ else if ((!oldtree && !newtree) || /* 4 and 5 */
+ (!oldtree && newtree &&
+ same(current, newtree)) || /* 6 and 7 */
+ (oldtree && newtree &&
+ same(oldtree, newtree)) || /* 14 and 15 */
+ (oldtree && newtree &&
+ !same(oldtree, newtree) && /* 18 and 19 */
+ same(current, newtree))) {
return keep_entry(current, o);
}
else if (oldtree && !newtree && same(current, oldtree)) {
I suspect threeway_merge may need a similar update, but I haven't looked
too carefully yet.
-Peff
^ permalink raw reply related [relevance 1%]
* [PATCH v2] oneway_merge(): only lstat() when told to update worktree
2012-12-20 20:02 0% ` Junio C Hamano
@ 2012-12-20 21:03 2% ` Martin von Zweigbergk
0 siblings, 0 replies; 200+ results
From: Martin von Zweigbergk @ 2012-12-20 21:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Martin von Zweigbergk
Although the subject line of 613f027 (read-tree -u one-way merge fix
to check out locally modified paths., 2006-05-15) mentions "read-tree
-u", it did not seem to check whether -u was in effect. Not checking
whether -u is in effect makes e.g. "read-tree --reset" lstat() the
worktree, even though the worktree stat should not matter for that
operation.
This speeds up e.g. "git reset" a little on the linux-2.6 repo (best
of five, warm cache):
Before After
real 0m0.288s 0m0.233s
user 0m0.190s 0m0.150s
sys 0m0.090s 0m0.080s
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
---
unpack-trees.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 6d96366..61acc5e 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1834,7 +1834,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
if (old && same(old, a)) {
int update = 0;
- if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
+ if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
struct stat st;
if (lstat(old->name, &st) ||
ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
--
1.8.0.1.240.ge8a1f5a
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] oneway_merge(): only lstat() when told to update worktree
2012-12-20 17:37 1% [PATCH] oneway_merge(): only lstat() when told to update worktree Martin von Zweigbergk
@ 2012-12-20 20:02 0% ` Junio C Hamano
2012-12-20 21:03 2% ` [PATCH v2] " Martin von Zweigbergk
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2012-12-20 20:02 UTC (permalink / raw)
To: Martin von Zweigbergk; +Cc: git
Martin von Zweigbergk <martinvonz@gmail.com> writes:
> Although the subject line of 613f027 (read-tree -u one-way merge fix
> to check out locally modified paths., 2006-05-15) mentions "read-tree
> -u", it did not seem to check whether -u was in effect. Not checking
> whether -u is in effect makes e.g. "read-tree --reset" lstat() the
> worktree, even though the worktree stat should not matter for that
> operation.
>
> This speeds up e.g. "git reset" a little on the linux-2.6 repo (best
> of five, warm cache):
>
> Before After
> real 0m0.288s 0m0.233s
> user 0m0.190s 0m0.150s
> sys 0m0.090s 0m0.080s
> ---
Sign-off?
I briefly discussed this with Martin in person and came to the same
conclusion. To me this looks like an obvious performance fix, but an
independent code audit catches our mistakes is of course welcomed.
Thanks.
> I am very unfamiliar with this part of git, so my attempt at a
> motivation may be totally off.
>
> I have another twenty-or-so patches to reset.c coming up that take the
> timings down to around 90 ms, but this patch was quite unrelated to
> that. Those other patches actually make this patch pointless for "git
> reset" (it takes another path), but I hope this is still a good change
> for other operations that use oneway_merge.
>
> unpack-trees.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 6d96366..61acc5e 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -1834,7 +1834,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
>
> if (old && same(old, a)) {
> int update = 0;
> - if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
> + if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
> struct stat st;
> if (lstat(old->name, &st) ||
> ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
^ permalink raw reply [relevance 0%]
* [PATCH] oneway_merge(): only lstat() when told to update worktree
@ 2012-12-20 17:37 1% Martin von Zweigbergk
2012-12-20 20:02 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Martin von Zweigbergk @ 2012-12-20 17:37 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Martin von Zweigbergk
Although the subject line of 613f027 (read-tree -u one-way merge fix
to check out locally modified paths., 2006-05-15) mentions "read-tree
-u", it did not seem to check whether -u was in effect. Not checking
whether -u is in effect makes e.g. "read-tree --reset" lstat() the
worktree, even though the worktree stat should not matter for that
operation.
This speeds up e.g. "git reset" a little on the linux-2.6 repo (best
of five, warm cache):
Before After
real 0m0.288s 0m0.233s
user 0m0.190s 0m0.150s
sys 0m0.090s 0m0.080s
---
I am very unfamiliar with this part of git, so my attempt at a
motivation may be totally off.
I have another twenty-or-so patches to reset.c coming up that take the
timings down to around 90 ms, but this patch was quite unrelated to
that. Those other patches actually make this patch pointless for "git
reset" (it takes another path), but I hope this is still a good change
for other operations that use oneway_merge.
unpack-trees.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 6d96366..61acc5e 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1834,7 +1834,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
if (old && same(old, a)) {
int update = 0;
- if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
+ if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
struct stat st;
if (lstat(old->name, &st) ||
ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
--
1.8.0.1.240.ge8a1f5a
^ permalink raw reply related [relevance 1%]
* Re: What's cooking in git.git (Nov 2012, #03; Tue, 13)
@ 2012-11-13 20:01 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2012-11-13 20:01 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> This is my final "what's cooking" as interim maintainer. I didn't
> graduate anything to master, but I updated my plans for each topic to
> give Junio an idea of where I was.
After exploding the first-parent history between your master..pu
into component topics and recreating one new merge-fix for
nd/wildmatch topic, I think I now know how to rebuild your
integration branches.
I still haven't caught up with the past discussions (and still am
slightly jetlagged), but I think I can take it over from here with
help from contributors.
Thanks.
^ permalink raw reply [relevance 2%]
* Re: git workflow - merging upwards
2012-08-16 20:43 3% ` Junio C Hamano
@ 2012-08-17 8:14 0% ` Patrick Sabin
0 siblings, 0 replies; 200+ results
From: Patrick Sabin @ 2012-08-17 8:14 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Thanks, for the great answer.
What I am still concerned about is that in my project I plan to make bigger
structural changes (let's say in 1.2) while still developing in the
older branch
(let's say 1.1 with the old structure. I expect that there will be many changes
which I think that they can't be easily merged from 1.1 to 1.2.
Do you think it is better to have a heavily used 1.1.1 branch which
contains all
the changes for 1.1.* only, use many revert commits, or should I avoid merging
from 1.1 to 1.2 and go for cherry-picking instead?
On Thu, Aug 16, 2012 at 10:43 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Patrick Sabin <patrick.just4fun@gmail.com> writes:
>
>> I read through gitworkflows and want to use the Merge Upwards rule in
>> my projects:
>>
>> "Always commit your fixes to the oldest supported branch that require
>> them. Then (periodically) merge the integration branches upwards into
>> each other."
>>
>> This looks great but I have some trouble in the case if I want to have
>> a change in an older branch and don't want to propagate the change to
>> the newer branches. Let's say I have a v1.1 and a v1.2 and now a have
>> a bug fix/workaround which only affects version v1.1 but not v1.2. If
>> I commit to v1.1 then the periodical merge would merge the change to
>> v1.2 which is what I don't want.
>>
>> Any ideas/workarounds for that problem?
>
> The document may describe the "upwards" in a bit too simplified way
> for readability. If you have two fixes to 1.1, one applicable only
> to 1.1 and the other applicable to both, you would fork them from
> tip of maint-1.1, like so:
>
> git checkout -b fix-1.1-only maint-1.1; do your work and commit
> git checkout -b fix-1.1-onwards maint-1.1; do your work and commit
>
> and when they are proven to be good, you would merge both of them to
> maint-1.1 branch:
>
> git checkout maint-1.1
> git merge fix-1.1-only
> git merge fix-1.1-onwards
>
> But merging the resulting maint-1.1 into maint-1.2 will pull the
> history and the change of fix-1.1-only that you do not want to have
> in maint-1.2. You want the history so that later merge will not
> pull it to maint-1.2, but you do not want the change.
>
> The first thing to think about is if fix-1.1-only is really a "fix
> that only should go to maint-1.1".
>
> If the change is only for 1.1.x release (e.g. update version number
> from 1.1.4 to 1.1.5), you may not even want to have such a change
> directly on the maint-1.1 branch in the first place. You would
> rather want to have release-1.1 branch that is forked from maint-1.1
> branch, that contains the whole of maint-1.1 branch, and also
> contains the "update version number from 1.1.x to 1.1.y" changes
> that are not in the maint-1.1 branch [*1*].
>
> That arrangement may be sufficient to allow you merge maint-1.1 to
> maint-1.2 sanely.
>
> Otherwise, you would fork another branch after merging fix-1.1-*
> branches to maint-1.1 to merge it upwards. After these two merges
> illustrated above, while still on maint-1.1, you would do:
>
> git checkout -B merge-1.1-to-1.2 maint-1.1
> git revert -m 1 maint-1.1~1 ;# revert the fix-1.1-only merge
>
> which would result in a state as if you merged fix-1.1-onwards but
> not fix-1.1-only to the original maint-1.1 branch. But the history
> of this branch contains both fix-1.1-only and fix-1.1-onwards.
>
> And merge that result to maint-1.2, i.e.
>
> git checkout maint-1.2
> git merge merge-1.1-to-1.2
> git branch -d merge-1.1-to-1.2
>
> That way, future merges from maint-1.1 to maint-1.2 will not drag
> the change of fix-1.1-only.
>
>
> [Footnote]
>
> *1* This principle applies not just to "release numbers". If you
> want both maint-1.1 and maint-1.2 as generic two codebases, tweaks
> meant only for customers of maint-1.1 track should *not* go to
> maint-1.1, but customer-1.1 branch that forks from maint-1.1. That
> way, you can keep the generic branches clean from "this is only for
> that branch" kind of changes.
^ permalink raw reply [relevance 0%]
* Re: git workflow - merging upwards
@ 2012-08-16 20:43 3% ` Junio C Hamano
2012-08-17 8:14 0% ` Patrick Sabin
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2012-08-16 20:43 UTC (permalink / raw)
To: Patrick Sabin; +Cc: git
Patrick Sabin <patrick.just4fun@gmail.com> writes:
> I read through gitworkflows and want to use the Merge Upwards rule in
> my projects:
>
> "Always commit your fixes to the oldest supported branch that require
> them. Then (periodically) merge the integration branches upwards into
> each other."
>
> This looks great but I have some trouble in the case if I want to have
> a change in an older branch and don't want to propagate the change to
> the newer branches. Let's say I have a v1.1 and a v1.2 and now a have
> a bug fix/workaround which only affects version v1.1 but not v1.2. If
> I commit to v1.1 then the periodical merge would merge the change to
> v1.2 which is what I don't want.
>
> Any ideas/workarounds for that problem?
The document may describe the "upwards" in a bit too simplified way
for readability. If you have two fixes to 1.1, one applicable only
to 1.1 and the other applicable to both, you would fork them from
tip of maint-1.1, like so:
git checkout -b fix-1.1-only maint-1.1; do your work and commit
git checkout -b fix-1.1-onwards maint-1.1; do your work and commit
and when they are proven to be good, you would merge both of them to
maint-1.1 branch:
git checkout maint-1.1
git merge fix-1.1-only
git merge fix-1.1-onwards
But merging the resulting maint-1.1 into maint-1.2 will pull the
history and the change of fix-1.1-only that you do not want to have
in maint-1.2. You want the history so that later merge will not
pull it to maint-1.2, but you do not want the change.
The first thing to think about is if fix-1.1-only is really a "fix
that only should go to maint-1.1".
If the change is only for 1.1.x release (e.g. update version number
from 1.1.4 to 1.1.5), you may not even want to have such a change
directly on the maint-1.1 branch in the first place. You would
rather want to have release-1.1 branch that is forked from maint-1.1
branch, that contains the whole of maint-1.1 branch, and also
contains the "update version number from 1.1.x to 1.1.y" changes
that are not in the maint-1.1 branch [*1*].
That arrangement may be sufficient to allow you merge maint-1.1 to
maint-1.2 sanely.
Otherwise, you would fork another branch after merging fix-1.1-*
branches to maint-1.1 to merge it upwards. After these two merges
illustrated above, while still on maint-1.1, you would do:
git checkout -B merge-1.1-to-1.2 maint-1.1
git revert -m 1 maint-1.1~1 ;# revert the fix-1.1-only merge
which would result in a state as if you merged fix-1.1-onwards but
not fix-1.1-only to the original maint-1.1 branch. But the history
of this branch contains both fix-1.1-only and fix-1.1-onwards.
And merge that result to maint-1.2, i.e.
git checkout maint-1.2
git merge merge-1.1-to-1.2
git branch -d merge-1.1-to-1.2
That way, future merges from maint-1.1 to maint-1.2 will not drag
the change of fix-1.1-only.
[Footnote]
*1* This principle applies not just to "release numbers". If you
want both maint-1.1 and maint-1.2 as generic two codebases, tweaks
meant only for customers of maint-1.1 track should *not* go to
maint-1.1, but customer-1.1 branch that forks from maint-1.1. That
way, you can keep the generic branches clean from "this is only for
that branch" kind of changes.
^ permalink raw reply [relevance 3%]
* Re: [PATCH v2 0/7] Provide API to invalidate refs cache
@ 2011-10-11 17:26 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2011-10-11 17:26 UTC (permalink / raw)
To: Michael Haggerty
Cc: git, Jeff King, Drew Northup, Jakub Narebski, Heiko Voigt,
Johan Herland, Julian Phillips, Martin Fick, Christian Couder,
Christian Couder, Thomas Rast
Michael Haggerty <mhagger@alum.mit.edu> writes:
> On 10/11/2011 02:02 AM, Junio C Hamano wrote:
> ...
>> I could rebase your series, but it always is more error prone to have
>> somebody who is not the original author rebase a series than the original
>> author build for the intended base tree from the beginning.
>
> I don't mind rebasing this little series on jp/get-ref-dir-unsorted.
> ...
> Rebasing 78 patches is going to be a morass of clerical work.
I do not think it is "clerical" in the first place.
Realistically, I expect that a 50+ patch series that touch fairly an
important part of the system to take 2 cycles and a half before it hits a
released version, judging from our recent experience with the recursive
merge fix-up series.
When we already have a patch that has been discussed well enough on the
list to fix somebody's real world problem, can we afford to block it and
give an exclusive write lock to part of the codebase for 2 cycles to your
series, or anybody's for that matter?
> Is there any alternative?
I think an alternative is not to hold on to a series before it gets so
large to make you feel adjusting to the needs to other changes in the
codebase is "clerical". Commit often and early while developing the
initial pass, re-read often and throughout the whole process looking for
things you regret you would have done in early in the series that you
didn't (aka "oops, here is a fixup for the thinko in the early patch in
the series), and clean-up early while preparing to publish. Reorder the
parts that you are more confident that they do not need to change to come
early in the series, and unleash these early parts when you reach certain
confidence level.
I think your iterate-refs series was an example of good execution. It made
the codeflow a lot clearer by reducing the special casing of the submodule
parameter. In your grand scheme of things (e.g. read only parts of the ref
namespace as needed) you might consider it a mere side effect, but the
series by itself was a good thing to have.
Sometimes you may feel that a part of your series when taken out of
context would not justify itself like the iterate-refs series did, until
later parts of the series start taking advantage of the change. But that
is what commit log messages are for: e.g. "this change to encapsulate
these global variables into a single structure does not make a difference
in the current codebase, but in a later patch this and that callers will
need additional pieces of information passed aruond in the callchain, and
will add new members to the structure".
> ... So maybe
> I brought this whole mess down on my own head :-(
No, it is not anybody's fault in particular. That's life and open source.
^ permalink raw reply [relevance 1%]
* Re: What's cooking in git.git (May 2011, #04; Sun, 8)
@ 2011-05-09 8:55 2% ` Ciaran
0 siblings, 0 replies; 200+ results
From: Ciaran @ 2011-05-09 8:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
> --------------------------------------------------
> [Stalled]
>
> * kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
> - config.mak.in: allow "configure --sysconfdir=/else/where"
> - Makefile: allow sysconfdir to be used from configure
> (merged to 'next' on 2011-05-02 at c747ba3)
> + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
>
> J6t is unhappy that sysconfdir is ignored in relocatable case. Although I
> personally do not think that is a problem, as it has never been an issue,
> let's see what others think.
>
> * jn/gitweb-js (2011-04-28) 13 commits
> - gitweb: Make JavaScript ability to adjust timezones configurable
> - gitweb.js: Add UI for selecting common timezone to display dates
> - gitweb: JavaScript ability to adjust time based on timezone
> - gitweb: Unify the way long timestamp is displayed
> - gitweb: Refactor generating of long dates into format_timestamp_html
> - gitweb.js: Provide getElementsByClassName method (if it not exists)
> - gitweb.js: Introduce code to handle cookies from JavaScript
> - gitweb.js: Extract and improve datetime handling
> - gitweb.js: Provide default values for padding in padLeftStr and padLeft
> - gitweb.js: Update and improve comments in JavaScript files
> - gitweb: Split JavaScript for maintability, combining on build
> - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
> - git-instaweb: Simplify build dependency on gitweb
>
Sorry if this is dumb, as I'm unsure how Git (the mailing list)
handles regression tracking, but I saw no mention of this thread:
http://marc.info/?l=git&m=130445013906259&w=2
Is this something overlooked or something you're aware of just not
worried about at the minute. What is the process if a merge to
master causes a regression, do you just git revert the offending
merge, fix on the branch, then re-merge?
Many thanks
- cj.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (May 2011, #03; Fri, 6)
@ 2011-05-06 23:22 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2011-05-06 23:22 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
The main part of this cycle is expected to run thru May, aiming for a
feature freeze in early June.
We are late in the week #2 of this cycle.
--------------------------------------------------
[Graduated to "master"]
* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
(merged to 'next' on 2011-05-02 at 9a159a5)
+ git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
* cj/p4merge (2011-05-01) 1 commit
(merged to 'next' on 2011-05-02 at 7197ef3)
+ Pass empty file to p4merge where no base is suitable.
* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
(merged to 'next' on 2011-05-02 at 5a89e3e)
+ Look for password in both CVS and CVSNT password files.
* im/hashcmp-optim (2011-04-28) 1 commit
(merged to 'next' on 2011-05-02 at f131195)
+ hashcmp(): inline memcmp() by hand to optimize
* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
(merged to 'next' on 2011-04-28 at f1f837c)
+ diff-files: show unmerged entries correctly
+ diff: remove often unused parameters from diff_unmerge()
+ diff.c: return filepair from diff_unmerge()
+ test: use $_z40 from test-lib
(this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
(merged to 'next' on 2011-04-28 at 587f2d4)
+ pretty: quote rfc822 specials in email addresses
* jk/merge-one-file-working-tree (2011-04-29) 2 commits
(merged to 'next' on 2011-05-02 at 308fe21)
+ merge-one-file: fix broken merges with alternate work trees
+ add tests for merge-index / merge-one-file
* jn/run-command-error-failure (2011-04-20) 2 commits
(merged to 'next' on 2011-04-26 at a1f171e)
+ run-command: handle short writes and EINTR in die_child
+ tests: check error message from run_command
* js/blame-parsename (2011-05-05) 2 commits
(merged to 'next' on 2011-05-05 at 1d5e505)
+ t/annotate-tests: Use echo & cat instead of sed
(merged to 'next' on 2011-04-29 at 5fde945)
+ blame: tolerate bogus e-mail addresses a bit better
* js/info-man-path (2011-05-02) 2 commits
(merged to 'next' on 2011-05-02 at 20a15dd)
+ Documentation: clarify meaning of --html-path, --man-path, and --info-path
+ git: add --info-path and --man-path options
* mg/alias-expose-prefix (2011-04-27) 2 commits
(merged to 'next' on 2011-05-02 at 1c01d3a)
+ handle_alias: provide GIT_PREFIX to !alias
+ t1020: test !alias in subdirectory
* mg/diff-uiconfig-doc (2011-04-27) 1 commit
(merged to 'next' on 2011-05-02 at 579a515)
+ config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
* nd/struct-pathspec (2011-04-05) 5 commits
(merged to 'next' on 2011-04-25 at 65dbe80)
+ pathspec: rename per-item field has_wildcard to use_wildcard
+ Improve tree_entry_interesting() handling code
+ Convert read_tree{,_recursive} to support struct pathspec
+ Reimplement read_tree_recursive() using tree_entry_interesting()
+ Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
* sg/completion-cleanup (2011-04-28) 2 commits
+ completion: remove unnecessary _get_comp_words_by_ref() invocations
+ completion: don't modify the $cur variable in completion functions
(this branch is used by sg/completion-updates.)
--------------------------------------------------
[New Topics]
* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit
- fast-import: fix option parser for no-arg options
Will merge to "next".
* jc/advice-about-to-lose-commit (2011-05-06) 1 commit
- checkout: honor advice.detachedHead when reattaching to a branch
A weather-balloon.
* mg/merge-ff-config (2011-05-06) 2 commits
- merge: introduce merge.ff configuration variable
- Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
(this branch uses jc/maint-branch-mergeoptions.)
--------------------------------------------------
[Stalled]
* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
- config.mak.in: allow "configure --sysconfdir=/else/where"
- Makefile: allow sysconfdir to be used from configure
(merged to 'next' on 2011-05-02 at c747ba3)
+ Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
J6t is unhappy that sysconfdir is ignored in relocatable case. Although I
personally do not think that is a problem, as it has never been an issue,
let's see what others think.
* jn/gitweb-js (2011-04-28) 13 commits
- gitweb: Make JavaScript ability to adjust timezones configurable
- gitweb.js: Add UI for selecting common timezone to display dates
- gitweb: JavaScript ability to adjust time based on timezone
- gitweb: Unify the way long timestamp is displayed
- gitweb: Refactor generating of long dates into format_timestamp_html
- gitweb.js: Provide getElementsByClassName method (if it not exists)
- gitweb.js: Introduce code to handle cookies from JavaScript
- gitweb.js: Extract and improve datetime handling
- gitweb.js: Provide default values for padding in padLeftStr and padLeft
- gitweb.js: Update and improve comments in JavaScript files
- gitweb: Split JavaScript for maintability, combining on build
- Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
- git-instaweb: Simplify build dependency on gitweb
Rerolled. Waiting for comments.
* jn/ctags-more (2011-04-29) 3 commits
- gitweb: Optional grouping of projects by category
- gitweb: Modularized git_get_project_description to be more generic
- gitweb: Split git_project_list_body in two functions
(this branch uses jn/ctags.)
Waiting for comments.
* jc/dotdot-is-parent-directory (2011-05-02) 1 commit
- specifying ranges: we did not mean to make ".." an empty set
Updated documentation.
* mg/diff-stat-count (2011-05-03) 2 commits
- diff-options.txt: describe --stat-{width,name-width,count}
- diff: introduce --stat-count to limit the stat lines
There was a miscounting spotted. Need another round.
* jc/require-work-tree-exists (2011-05-04) 1 commit
- require-work-tree wants more than what its name says
Make "git pull" run from a random place work as long as GIT_DIR and
GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
is a sane use case, though.
* jc/add-delete-default (2011-04-19) 1 commit
- git add: notice removal of tracked paths by default
(this branch uses jc/fix-add-u-unmerged.)
* jk/maint-merge-rename-create (2011-03-25) 3 commits
- merge: turn on rewrite detection
- merge: handle renames with replacement content
- t3030: fix accidental success in symlink rename
Peff wanted to reroll this.
* rr/rerere-clear-libify (2011-04-13) 1 commit
- rerere: Expose an API corresponding to 'clear' functionality
Jonathan had good comments on moving the garbage collection interface as
well. Perhaps needs a re-roll.
* jc/index-pack (2011-02-25) 5 commits
- index-pack --verify: read anomalous offsets from v2 idx file
- write_idx_file: need_large_offset() helper function
- index-pack: --verify
- write_idx_file: introduce a struct to hold idx customization options
- index-pack: group the delta-base array entries also by type
Still a WIP. Need to put histogram output into index-pack --verify to
really kill verify-pack.
* jk/tag-contains (2010-07-05) 4 commits
- Why is "git tag --contains" so slow?
- default core.clockskew variable to one day
- limit "contains" traversals based on commit timestamp
- tag: speed up --contains calculation
The idea of the bottom one is probably Ok, except that the use of object
flags needs to be rethought, or at least the helper needs to be moved to
builtin/tag.c to make it clear that it should not be used outside the
current usage context.
--------------------------------------------------
[Cooking]
* mk/grep-pcre (2011-05-05) 3 commits
- grep: Put calls to fixmatch() and regmatch() into patmatch()
- contrib/completion: --line-number to git grep
- Documentation: Add --line-number to git-grep synopsis
This is without the real PCRE integration. The above three looked
reasonable clean-ups regardless.
Will merge to "next".
* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits
(merged to 'next' on 2011-05-06 at 46b522c)
+ git-reset.txt: better docs for '--patch'
+ git-checkout.txt: better docs for '--patch'
+ git-stash.txt: better docs for '--patch'
+ git-add.txt: document 'interactive.singlekey'
+ config.txt: 'interactive.singlekey; is used by...
* jc/maint-branch-mergeoptions (2011-05-04) 1 commit
- merge: fix branch.<name>.mergeoptions
(this branch is used by mg/merge-ff-config.)
Fix branch.<name>.mergeoptions that does not override merge.<option>; this
is needed for the "merge.ff" configuration topic to correctly work.
* jn/ctags (2011-04-29) 3 commits
(merged to 'next' on 2011-05-06 at 5c574ff)
+ gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
+ gitweb: Change the way "content tags" ('ctags') are handled
+ gitweb: Restructure projects list generation
(this branch is used by jn/ctags-more.)
* dm/http-cleanup (2011-05-05) 4 commits
(merged to 'next' on 2011-05-06 at 711ff78)
+ t5541-http-push: add test for chunked
+ http-push: refactor curl_easy_setup madness
+ http-push: use const for strings in signatures
+ http: make curl callbacks match contracts from curl header
* sg/completion-updates (2011-04-28) 1 commit
(merged to 'next' on 2011-05-02 at 0fd443a)
+ completion: don't declare 'local words' to make zsh happy
* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
(merged to 'next' on 2011-05-02 at e57b66f)
+ "add -p": work-around an old laziness that does not coalesce hunks
+ add--interactive.perl: factor out repeated --recount option
+ t3701: Editing a split hunk in an "add -p" session
+ add -p: 'q' should really quit
Probably needs tests.
* ld/p4-preserve-user-names (2011-04-21) 1 commit
(merged to 'next' on 2011-04-29 at 25116c8)
+ git-p4: add option to preserve user names
Luke wants to update this, so will not be merging to "master" until the
update settles down.
* jh/dirstat-lines (2011-04-29) 8 commits
(merged to 'next' on 2011-04-29 at a302674)
+ Mark dirstat error messages for translation
+ Improve error handling when parsing dirstat parameters
+ New --dirstat=lines mode, doing dirstat analysis based on diffstat
+ Allow specifying --dirstat cut-off percentage as a floating point number
+ Add config variable for specifying default --dirstat behavior
+ Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
+ Make --dirstat=0 output directories that contribute < 0.1% of changes
+ Add several testcases for --dirstat and friends
Will merge to "master" by the end of week #3.
* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
(merged to 'next' on 2011-04-28 at 6006cc4)
+ revisions: allow --glob and friends in parse_options-enabled commands
+ revisions: split out handle_revision_pseudo_opt function
Will merge to "master" by the end of week #3.
* cn/log-parse-opt (2011-04-14) 1 commit
(merged to 'next' on 2011-04-28 at 02f2eac)
+ log: convert to parse-options
Will merge to "master" by the end of week #3.
* jc/fix-add-u-unmerged (2011-04-20) 1 commit
(merged to 'next' on 2011-04-28 at f7ed821)
+ Fix "add -u" that sometimes fails to resolve unmerged paths
(this branch is used by jc/add-delete-default.)
Will merge to "master" by the end of week #3.
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits
+ send-pack: unbreak push over stateless rpc
+ send-pack: avoid deadlock when pack-object dies early
(this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
Will merge to "master" by the end of week #3.
* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits
(merged to 'next' on 2011-05-05 at 3f4ffb9)
+ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
(merged to 'next' on 2011-04-28 at db7e04a)
+ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
(this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
Will merge to "master" by the end of week #3.
* jc/magic-pathspec (2011-04-06) 3 commits
(merged to 'next' on 2011-04-25 at 788cd46)
+ magic pathspec: add ":(icase)path" to match case insensitively
+ magic pathspec: futureproof shorthand form
+ magic pathspec: add tentative ":/path/from/top/level" pathspec support
Thanks to Peff, Duy, and Michael for helping to whip the syntax and the
basic semantics into a not-so-horrible shape. Duy wanted to add tests.
Will merge to "master" by the end of week #3.
^ permalink raw reply [relevance 3%]
* Re: [PATCH v5] Add default merge options for all branches
2011-05-05 0:42 2% ` Junio C Hamano
2011-05-06 20:36 0% ` Junio C Hamano
@ 2011-05-06 21:32 0% ` Jonathan Nieder
1 sibling, 0 replies; 200+ results
From: Jonathan Nieder @ 2011-05-06 21:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Michael Grubb, git
Junio C Hamano wrote:
> Subject: [PATCH] merge: fix branch.<name>.mergeoptions
To be more precise, if I understand correctly:
merge: allow branch.<name>.mergeoptions to override merge.*
> This patch should fix it, even though I now strongly suspect that
> branch.<name>.mergeoptions that gives a single command line that
> needs to be parsed was likely to be an ill-conceived idea to begin
> with. Sigh...
Yes, and introducing branch.<name>.ff and branch.<name>.log might
still be a good idea.
The patch looks mostly good. I see only one actual problem, marked
with [*] below.
> --- a/builtin-merge.c
> +++ b/builtin-merge.c
> @@ -54,6 +54,7 @@ static size_t use_strategies_nr, use_strategies_alloc;
> static const char **xopts;
> static size_t xopts_nr, xopts_alloc;
> static const char *branch;
> +static char *branch_mergeoptions;
> static int verbosity;
> static int allow_rerere_auto;
>
> @@ -474,25 +475,33 @@ cleanup:
> strbuf_release(&bname);
> }
>
> +static void parse_branch_merge_options(char *bmo)
> +{
> + const char **argv;
> + int argc;
> + char *buf;
> +
> + if (!bmo)
> + return;
> + argc = split_cmdline(bmo, &argv);
> + if (argc < 0)
> + die("Bad branch.%s.mergeoptions string", branch);
> + argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
> + memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
This is not new code, but it might make sense to do
argv[0] = "merge.*.options";
for a saner error message when someone tries
[branch "master"]
mergeoptions = --nonsense
> + argc++;
> + parse_options(argc, argv, NULL, builtin_merge_options,
> + builtin_merge_usage, 0);
> + free(buf);
[*]
This buf seems to be left over. (I don't think the intent is to
call free on an uninitialized pointer. ;-))
[...]
> - free(buf);
> + free(branch_mergeoptions);
> + branch_mergeoptions = xstrdup(v);
It is tempting to do
size_t len;
len = strlen(v);
branch_mergeoptions = xrealloc(branch_mergeoptions, len + 1);
memcpy(branch_mergeoptions, v, len + 1);
but free + xstrdup is simpler and clearer. Makes sense.
> +test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
> + (
> + git config --remove-section branch.master
> + git config --remove-section merge
> + )
Since this patch is meant to apply to a very old git, we cannot use
test_might_fail. Makes sense: it can be fixed up later to use
&&-friendly syntax as part of a series introducing checks to make
sure we don't regress in that.
Thanks and hope that helps,
Jonathan
^ permalink raw reply [relevance 0%]
* Re: [PATCH v5] Add default merge options for all branches
2011-05-05 0:42 2% ` Junio C Hamano
@ 2011-05-06 20:36 0% ` Junio C Hamano
2011-05-06 21:32 0% ` Jonathan Nieder
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2011-05-06 20:36 UTC (permalink / raw)
To: Michael Grubb; +Cc: git, Jonathan Nieder
Junio C Hamano <gitster@pobox.com> writes:
> In any case, your test exposed an ancient breakage ever since the
> per-branch mergeoptions was introduced back when git-merge was a shell
> script (aec7b36 (git-merge: add support for branch.<name>.mergeoptions,
> 2007-09-24).
>
> -- >8 --
> Subject: [PATCH] merge: fix branch.<name>.mergeoptions
> ...
And then on top of that fix, we can do this.
I have a seemingly unrelated change to the existing test but that was
because it only made sure that the --ff-only option made the command fail
when it should fail, without making sure that it does not interfere when
it should succeed. A typical symptom of "showing off shiny new toy
because I am too excited" developer disease, I would guess. I didn't want
to forget to fix it.
-- >8 --
Subject: [PATCH] merge: introduce merge.ff configuration variable
This variable gives the default setting for --ff, --no-ff or --ff-only
options of "git merge" command.
Helped-by: Michael Grubb <devel@dailyvoid.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* If we were doing the command line option of "merge" from scratch today,
we probably would have done --ff, --ff=no, and --ff=only, instead of a
separate --ff-only. We could still add the latter two as a consistency
synonyms without deprecating anything, though.
Documentation/merge-config.txt | 10 +++++++++
builtin/merge.c | 9 ++++++++
t/t7600-merge.sh | 43 ++++++++++++++++++++++++++++++++++++++-
3 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 8920258..861bd6f 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -16,6 +16,16 @@ merge.defaultToUpstream::
to their corresponding remote tracking branches, and the tips of
these tracking branches are merged.
+merge.ff::
+ By default, git does not create an extra merge commit when merging
+ a commit that is a descendant of the current commit. Instead, the
+ tip of the current branch is fast-forwarded. When set to `false`,
+ this variable tells git to create an extra merge commit in such
+ a case (equivalent to giving the `--no-ff` option from the command
+ line). When set to `only`, only such fast-forward merges are
+ allowed (equivalent to giving the `--ff-only` option from the
+ command line).
+
merge.log::
In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the
diff --git a/builtin/merge.c b/builtin/merge.c
index 4fa789a..1c3ff13 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -550,6 +550,15 @@ static int git_merge_config(const char *k, const char *v, void *cb)
if (is_bool && shortlog_len)
shortlog_len = DEFAULT_MERGE_LOG_LEN;
return 0;
+ } else if (!strcmp(k, "merge.ff")) {
+ int boolval = git_config_maybe_bool(k, v);
+ if (0 <= boolval) {
+ allow_fast_forward = boolval;
+ } else if (v && !strcmp(v, "only")) {
+ allow_fast_forward = 1;
+ fast_forward_only = 1;
+ } /* do not barf on values from future versions of git */
+ return 0;
} else if (!strcmp(k, "merge.defaulttoupstream")) {
default_to_upstream = git_config_bool(k, v);
return 0;
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5463f87..4f1d4eb 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -225,12 +225,28 @@ test_expect_success 'merge c1 with c2 and c3' '
test_debug 'git log --graph --decorate --oneline --all'
-test_expect_success 'failing merges with --ff-only' '
+test_expect_success 'merges with --ff-only' '
git reset --hard c1 &&
test_tick &&
test_must_fail git merge --ff-only c2 &&
test_must_fail git merge --ff-only c3 &&
- test_must_fail git merge --ff-only c2 c3
+ test_must_fail git merge --ff-only c2 c3 &&
+ git reset --hard c0 &&
+ git merge c3 &&
+ verify_head $c3
+'
+
+test_expect_success 'merges with merge.ff=only' '
+ git reset --hard c1 &&
+ test_tick &&
+ test_when_finished "git config --unset merge.ff" &&
+ git config merge.ff only &&
+ test_must_fail git merge c2 &&
+ test_must_fail git merge c3 &&
+ test_must_fail git merge c2 c3 &&
+ git reset --hard c0 &&
+ git merge c3 &&
+ verify_head $c3
'
test_expect_success 'merge c0 with c1 (no-commit)' '
@@ -447,6 +463,29 @@ test_expect_success 'merge c0 with c1 (no-ff)' '
test_debug 'git log --graph --decorate --oneline --all'
+test_expect_success 'merge c0 with c1 (merge.ff=false)' '
+ git reset --hard c0 &&
+ git config merge.ff false &&
+ test_tick &&
+ git merge c1 &&
+ git config --remove-section merge &&
+ verify_merge file result.1 &&
+ verify_parents $c0 $c1
+'
+test_debug 'git log --graph --decorate --oneline --all'
+
+test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
+ git reset --hard c0 &&
+ git config branch.master.mergeoptions --ff
+ git config merge.ff false
+ test_tick &&
+ git merge c1 &&
+ git config --remove-section "branch.master" &&
+ git config --remove-section "merge" &&
+ verify_merge file result.1 &&
+ verify_parents "$c0"
+'
+
test_expect_success 'combining --squash and --no-ff is refused' '
test_must_fail git merge --squash --no-ff c1 &&
test_must_fail git merge --no-ff --squash c1
--
1.7.5.1.268.gce5bd
^ permalink raw reply related [relevance 0%]
* What's cooking in git.git (May 2011, #02; Wed, 4)
@ 2011-05-05 2:37 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2011-05-05 2:37 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
The main part of this cycle is expected to run thru May, aiming for a
feature freeze in early June.
We are in the middle of week #2 of this cycle.
--------------------------------------------------
[New Topics]
* jc/dotdot-is-parent-directory (2011-05-02) 1 commit
- specifying ranges: we did not mean to make ".." an empty set
Updated documentation.
* mg/diff-stat-count (2011-05-03) 2 commits
- diff-options.txt: describe --stat-{width,name-width,count}
- diff: introduce --stat-count to limit the stat lines
There was a miscounting spotted. Need another round.
* mk/grep-pcre (2011-05-03) 3 commits
- git-grep: Learn PCRE
- Documentation: Add --line-number to git-grep synopsis
- [Missing sign-off and justification] grep: Put calls to fixmatch() and regmatch() into patmatch()
There was a re-roll but I haven't picked it up yet.
* vh/config-interactive-singlekey-doc (2011-05-02) 1 commit
- config.txt: 'interactive.singlekey; is used by...
Will merge to 'next' but I recall we discussed the need for more cross
references and description of the configuration variable in Patch mode
documentation.
* jc/maint-branch-mergeoptions (2011-05-04) 1 commit
- merge: fix branch.<name>.mergeoptions
Fix branch.<name>.mergeoptions that does not override merge.<option>
* jc/require-work-tree-exists (2011-05-04) 1 commit
- require-work-tree wants more than what its name says
Make "git pull" run from a random place work as long as GIT_DIR and
GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
is a sane use case, though.
--------------------------------------------------
[Graduated to "master"]
* ab/i18n-fixup (2011-04-14) 24 commits
(merged to 'next' on 2011-04-25 at 32fef07)
+ i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
+ i18n: use test_i18n{grep,cmp} in t7508
+ i18n: use test_i18ngrep in t7506
+ i18n: use test_i18ngrep and test_i18ncmp in t7502
+ i18n: use test_i18ngrep in t7501
+ i18n: use test_i18ncmp in t7500
+ i18n: use test_i18ngrep in t7201
+ i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
+ i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
+ i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
+ i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
+ i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
+ i18n: use test_i18ngrep in lib-httpd and t2019
+ i18n: do not overuse C_LOCALE_OUTPUT (grep)
+ i18n: use test_i18ncmp in t1200 and t2200
+ i18n: .git file is not a human readable message (t5601)
+ i18n: do not overuse C_LOCALE_OUTPUT
+ i18n: mark init-db messages for translation
+ i18n: mark checkout plural warning for translation
+ i18n: mark checkout --detach messages for translation
+ i18n: mark clone nonexistent repository message for translation
+ i18n: mark merge CHERRY_PICK_HEAD messages for translation
+ i18n: mark merge "upstream" messages for translation
+ i18n: mark merge "Could not read from" message for translation
* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at 8e59a0e)
+ gitweb: supply '-n' to gzip for identical output
* jh/notes-add-ui (2011-03-30) 1 commit
(merged to 'next' on 2011-04-25 at 4fb1ac2)
+ Make "git notes add" more user-friendly when there are existing notes
* jk/format-patch-multiline-header (2011-04-14) 1 commit
(merged to 'next' on 2011-04-26 at 3d5eda3)
+ format-patch: wrap email addresses after long names
* jk/notes-ui-updates (2011-04-14) 8 commits
(merged to 'next' on 2011-04-25 at 4216d33)
+ contrib/completion: --notes, --no-notes
+ log/pretty-options: Document --[no-]notes and deprecate old notes options
+ revision.c: make --no-notes reset --notes list
+ revision.c: support --notes command-line option
+ notes: refactor display notes default handling
+ notes: refactor display notes extra refs field
+ revision.c: refactor notes ref expansion
+ notes: make expand_notes_ref globally accessible
* jm/mergetool-submodules (2011-04-13) 1 commit
(merged to 'next' on 2011-04-26 at 40892cf)
+ mergetool: Teach about submodules
* jn/format-patch-doc (2011-04-18) 6 commits
(merged to 'next' on 2011-04-26 at 3f64325)
+ Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
+ Documentation: publicize hints for sending patches with GMail
+ Documentation: publicize KMail hints for sending patches inline
+ Documentation: hints for sending patches inline with Thunderbird
+ Documentation: explain how to check for patch corruption
+ Merge v1.7.5-rc2 into jn/format-patch-doc
(this branch uses jn/maint-format-patch-doc.)
* jn/maint-format-patch-doc (2011-04-14) 1 commit
(merged to 'next' on 2011-04-26 at 400cf42)
+ Documentation: describe the format of messages with inline patches
(this branch is used by jn/format-patch-doc.)
* mg/rev-list-count-cherry (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at dc3e80a)
+ rev-list --count: separate count for --cherry-mark
* ml/test-readme (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at d1efe84)
+ t/README: unify documentation of test function args
* mz/maint-rename-unmerged (2011-03-23) 1 commit
(merged to 'next' on 2011-04-25 at 038a8c3)
+ diffcore-rename: don't consider unmerged path as source
* nd/maint-setup (2011-03-26) 2 commits
(merged to 'next' on 2011-04-25 at fd45c63)
+ Kill off get_relative_cwd()
+ setup: return correct prefix if worktree is '/'
* nm/submodule-update-force (2011-04-01) 1 commit
(merged to 'next' on 2011-04-25 at 270fffc)
+ submodule: Add --force option for git submodule update
* ss/cherry-pick-x-doc (2011-04-15) 1 commit
(merged to 'next' on 2011-04-26 at c9a6f83)
+ doc: Clarify that "cherry-pick -x" does not use "git notes"
* ss/doc-svn (2011-04-19) 1 commit
(merged to 'next' on 2011-04-26 at a723b91)
+ remove noise and inaccuracies from git-svn docs
* vr/merge-base-doc (2011-04-15) 2 commits
(merged to 'next' on 2011-04-26 at e906ba3)
+ Restructure documentation for git-merge-base.
+ Documentation: update to git-merge-base --octopus
--------------------------------------------------
[Stalled]
* jn/gitweb-js (2011-04-28) 13 commits
- gitweb: Make JavaScript ability to adjust timezones configurable
- gitweb.js: Add UI for selecting common timezone to display dates
- gitweb: JavaScript ability to adjust time based on timezone
- gitweb: Unify the way long timestamp is displayed
- gitweb: Refactor generating of long dates into format_timestamp_html
- gitweb.js: Provide getElementsByClassName method (if it not exists)
- gitweb.js: Introduce code to handle cookies from JavaScript
- gitweb.js: Extract and improve datetime handling
- gitweb.js: Provide default values for padding in padLeftStr and padLeft
- gitweb.js: Update and improve comments in JavaScript files
- gitweb: Split JavaScript for maintability, combining on build
- Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
- git-instaweb: Simplify build dependency on gitweb
Rerolled. Waiting for comments.
* jn/ctags (2011-04-29) 6 commits
- gitweb: Optional grouping of projects by category
- gitweb: Modularized git_get_project_description to be more generic
- gitweb: Split git_project_list_body in two functions
- gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
- gitweb: Change the way "content tags" ('ctags') are handled
- gitweb: Restructure projects list generation
Waiting for comments.
* jk/maint-merge-rename-create (2011-03-25) 3 commits
- merge: turn on rewrite detection
- merge: handle renames with replacement content
- t3030: fix accidental success in symlink rename
Peff wanted to reroll this, so this is taken out of "next".
* rr/rerere-clear-libify (2011-04-13) 1 commit
- rerere: Expose an API corresponding to 'clear' functionality
Jonathan had good comments on moving the garbage collection interface as
well. Perhaps needs a re-roll.
* jc/index-pack (2011-02-25) 5 commits
- index-pack --verify: read anomalous offsets from v2 idx file
- write_idx_file: need_large_offset() helper function
- index-pack: --verify
- write_idx_file: introduce a struct to hold idx customization options
- index-pack: group the delta-base array entries also by type
Still a WIP. Need to put histogram output into index-pack --verify to
really kill verify-pack.
* jk/tag-contains (2010-07-05) 4 commits
- Why is "git tag --contains" so slow?
- default core.clockskew variable to one day
- limit "contains" traversals based on commit timestamp
- tag: speed up --contains calculation
The idea of the bottom one is probably Ok, except that the use of object
flags needs to be rethought, or at least the helper needs to be moved to
builtin/tag.c to make it clear that it should not be used outside the
current usage context.
--------------------------------------------------
[Cooking]
* dm/http-cleanup (2011-05-05) 4 commits
- t5541-http-push: add test for chunked
- http-push: refactor curl_easy_setup madness
- http-push: use const for strings in signatures
- http: make curl callbacks match contracts from curl header
* im/hashcmp-optim (2011-04-28) 1 commit
(merged to 'next' on 2011-05-02 at f131195)
+ hashcmp(): inline memcmp() by hand to optimize
* jc/add-delete-default (2011-04-19) 1 commit
- git add: notice removal of tracked paths by default
(this branch uses jc/fix-add-u-unmerged, jc/fix-add-u-unmerged and jc/fix-diff-files-unmerged.)
* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
- config.mak.in: allow "configure --sysconfdir=/else/where"
- Makefile: allow sysconfdir to be used from configure
(merged to 'next' on 2011-05-02 at c747ba3)
+ Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
Fixed up after hitting 'next'.
* sg/completion-updates (2011-04-28) 3 commits
(merged to 'next' on 2011-05-02 at 0fd443a)
+ completion: don't declare 'local words' to make zsh happy
+ completion: remove unnecessary _get_comp_words_by_ref() invocations
+ completion: don't modify the $cur variable in completion functions
Has this one settled?
* jk/merge-one-file-working-tree (2011-04-29) 2 commits
(merged to 'next' on 2011-05-02 at 308fe21)
+ merge-one-file: fix broken merges with alternate work trees
+ add tests for merge-index / merge-one-file
* js/blame-parsename (2011-04-21) 1 commit
(merged to 'next' on 2011-04-29 at 5fde945)
+ blame: tolerate bogus e-mail addresses a bit better
Will merge to "master" by the end of week #2.
* js/info-man-path (2011-05-02) 2 commits
(merged to 'next' on 2011-05-02 at 20a15dd)
+ Documentation: clarify meaning of --html-path, --man-path, and --info-path
+ git: add --info-path and --man-path options
* cj/p4merge (2011-05-01) 1 commit
(merged to 'next' on 2011-05-02 at 7197ef3)
+ Pass empty file to p4merge where no base is suitable.
* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
(merged to 'next' on 2011-05-02 at 5a89e3e)
+ Look for password in both CVS and CVSNT password files.
* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
(merged to 'next' on 2011-05-02 at e57b66f)
+ "add -p": work-around an old laziness that does not coalesce hunks
+ add--interactive.perl: factor out repeated --recount option
+ t3701: Editing a split hunk in an "add -p" session
+ add -p: 'q' should really quit
* ld/p4-preserve-user-names (2011-04-21) 1 commit
(merged to 'next' on 2011-04-29 at 25116c8)
+ git-p4: add option to preserve user names
Will merge to "master" by the end of week #2.
* jh/dirstat-lines (2011-04-29) 8 commits
(merged to 'next' on 2011-04-29 at a302674)
+ Mark dirstat error messages for translation
+ Improve error handling when parsing dirstat parameters
+ New --dirstat=lines mode, doing dirstat analysis based on diffstat
+ Allow specifying --dirstat cut-off percentage as a floating point number
+ Add config variable for specifying default --dirstat behavior
+ Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
+ Make --dirstat=0 output directories that contribute < 0.1% of changes
+ Add several testcases for --dirstat and friends
* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
(merged to 'next' on 2011-05-02 at 9a159a5)
+ git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
* mg/alias-expose-prefix (2011-04-27) 2 commits
(merged to 'next' on 2011-05-02 at 1c01d3a)
+ handle_alias: provide GIT_PREFIX to !alias
+ t1020: test !alias in subdirectory
* mg/diff-uiconfig-doc (2011-04-27) 1 commit
(merged to 'next' on 2011-05-02 at 579a515)
+ config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
(merged to 'next' on 2011-04-28 at 587f2d4)
+ pretty: quote rfc822 specials in email addresses
Will merge to "master" by the end of week #2.
* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
(merged to 'next' on 2011-04-28 at 6006cc4)
+ revisions: allow --glob and friends in parse_options-enabled commands
+ revisions: split out handle_revision_pseudo_opt function
* cn/log-parse-opt (2011-04-14) 1 commit
(merged to 'next' on 2011-04-28 at 02f2eac)
+ log: convert to parse-options
* jc/fix-add-u-unmerged (2011-04-20) 1 commit
(merged to 'next' on 2011-04-28 at f7ed821)
+ Fix "add -u" that sometimes fails to resolve unmerged paths
(this branch is used by jc/add-delete-default and jc/add-delete-default; uses jc/fix-diff-files-unmerged.)
* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
(merged to 'next' on 2011-04-28 at f1f837c)
+ diff-files: show unmerged entries correctly
+ diff: remove often unused parameters from diff_unmerge()
+ diff.c: return filepair from diff_unmerge()
+ test: use $_z40 from test-lib
(this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
+ send-pack: avoid deadlock when pack-object dies early
(this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
Will merge to "master" by the end of week #2.
* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
(merged to 'next' on 2011-04-28 at db7e04a)
+ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
(this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
Will merge to "master" by the end of week #2.
* jn/run-command-error-failure (2011-04-20) 2 commits
(merged to 'next' on 2011-04-26 at a1f171e)
+ run-command: handle short writes and EINTR in die_child
+ tests: check error message from run_command
Will merge to "master" by the end of week #2.
* nd/struct-pathspec (2011-04-05) 5 commits
(merged to 'next' on 2011-04-25 at 65dbe80)
+ pathspec: rename per-item field has_wildcard to use_wildcard
+ Improve tree_entry_interesting() handling code
+ Convert read_tree{,_recursive} to support struct pathspec
+ Reimplement read_tree_recursive() using tree_entry_interesting()
+ Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
Will merge to "master" by the end of week #2.
* jc/magic-pathspec (2011-04-06) 3 commits
(merged to 'next' on 2011-04-25 at 788cd46)
+ magic pathspec: add ":(icase)path" to match case insensitively
+ magic pathspec: futureproof shorthand form
+ magic pathspec: add tentative ":/path/from/top/level" pathspec support
Thanks to Peff, Duy, and Michael for helping to whip the syntax and the
basic semantics into a not-so-horrible shape.
Will merge to "master" by the end of week #2.
----------------------------------------------------------------
[Discarded]
* mg/branch-wildcard-config (2011-05-02) 1 commit
- Add default merge options for all branches
It seems a separate merge.ff configuration would be more favourable
than this approach.
^ permalink raw reply [relevance 3%]
* Re: [PATCH v5] Add default merge options for all branches
@ 2011-05-05 0:42 2% ` Junio C Hamano
2011-05-06 20:36 0% ` Junio C Hamano
2011-05-06 21:32 0% ` Jonathan Nieder
0 siblings, 2 replies; 200+ results
From: Junio C Hamano @ 2011-05-05 0:42 UTC (permalink / raw)
To: Michael Grubb; +Cc: git, Jonathan Nieder
Thanks.
I think we still need to work on this a bit more, but I found an unrelated
and nastier issue before this patch can sanely be applied.
> +test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
> + git reset --hard c0 &&
> + git config branch.master.mergeoptions --ff
> + git config merge.ff false
> + test_tick &&
> + git merge c1 &&
> + git config --remove-section "branch.master" &&
> + git config --remove-section "merge" &&
> + verify_merge file result.1 &&
> + verify_parents "$c0"
> +'
If you insert an "exit" after this test and inspect the resulting commit,
you will see that it created a merge.
Side note: I think verify_parents is buggy. It only makes sure
that the earlier parents of HEAD match the commits given, and does
not care if there actually are more parents.
In any case, your test exposed an ancient breakage ever since the
per-branch mergeoptions was introduced back when git-merge was a shell
script (aec7b36 (git-merge: add support for branch.<name>.mergeoptions,
2007-09-24).
I am not going to fix verify_parents tonight, as I have other git things
to do.
-- >8 --
Subject: [PATCH] merge: fix branch.<name>.mergeoptions
The parsing of the additional command line parameters supplied to
the branch.<name>.mergeoptions configuration variable was implemented
at the wrong stage. If any merge-related variable came after we read
branch.<name>.mergeoptions, the earlier value was overwritten.
We should first read all the merge.* configuration, override them by
reading from branch.<name>.mergeoptions and then finally read from
the command line.
This patch should fix it, even though I now strongly suspect that
branch.<name>.mergeoptions that gives a single command line that
needs to be parsed was likely to be an ill-conceived idea to begin
with. Sigh...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-merge.c | 39 +++++++++++++++++++++++++--------------
t/t7600-merge.sh | 32 ++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index 3aaec7b..01389a3 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -54,6 +54,7 @@ static size_t use_strategies_nr, use_strategies_alloc;
static const char **xopts;
static size_t xopts_nr, xopts_alloc;
static const char *branch;
+static char *branch_mergeoptions;
static int verbosity;
static int allow_rerere_auto;
@@ -474,25 +475,33 @@ cleanup:
strbuf_release(&bname);
}
+static void parse_branch_merge_options(char *bmo)
+{
+ const char **argv;
+ int argc;
+ char *buf;
+
+ if (!bmo)
+ return;
+ argc = split_cmdline(bmo, &argv);
+ if (argc < 0)
+ die("Bad branch.%s.mergeoptions string", branch);
+ argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
+ memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
+ argc++;
+ parse_options(argc, argv, NULL, builtin_merge_options,
+ builtin_merge_usage, 0);
+ free(buf);
+}
+
static int git_merge_config(const char *k, const char *v, void *cb)
{
if (branch && !prefixcmp(k, "branch.") &&
!prefixcmp(k + 7, branch) &&
!strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
- const char **argv;
- int argc;
- char *buf;
-
- buf = xstrdup(v);
- argc = split_cmdline(buf, &argv);
- if (argc < 0)
- die("Bad branch.%s.mergeoptions string", branch);
- argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
- memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
- argc++;
- parse_options(argc, argv, NULL, builtin_merge_options,
- builtin_merge_usage, 0);
- free(buf);
+ free(branch_mergeoptions);
+ branch_mergeoptions = xstrdup(v);
+ return 0;
}
if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
@@ -918,6 +927,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (diff_use_color_default == -1)
diff_use_color_default = git_use_color_default;
+ if (branch_mergeoptions)
+ parse_branch_merge_options(branch_mergeoptions);
argc = parse_options(argc, argv, prefix, builtin_merge_options,
builtin_merge_usage, 0);
if (verbosity < 0)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 57f6d2b..56c653d 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -372,6 +372,38 @@ test_expect_success 'merge c1 with c2 (no-commit in config)' '
test_debug 'gitk --all'
+test_expect_success 'merge c1 with c2 (log in config)' '
+ git config branch.master.mergeoptions "" &&
+ git reset --hard c1 &&
+ git merge --log c2 &&
+ git show -s --pretty=tformat:%s%n%b >expect &&
+
+ git config branch.master.mergeoptions --log &&
+ git reset --hard c1 &&
+ git merge c2 &&
+ git show -s --pretty=tformat:%s%n%b >actual &&
+
+ test_cmp expect actual
+'
+
+test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
+ (
+ git config --remove-section branch.master
+ git config --remove-section merge
+ )
+ git reset --hard c1 &&
+ git merge c2 &&
+ git show -s --pretty=tformat:%s%n%b >expect &&
+
+ git config branch.master.mergeoptions "--no-log" &&
+ git config merge.log true &&
+ git reset --hard c1 &&
+ git merge c2 &&
+ git show -s --pretty=tformat:%s%n%b >actual &&
+
+ test_cmp expect actual
+'
+
test_expect_success 'merge c1 with c2 (squash in config)' '
git reset --hard c1 &&
git config branch.master.mergeoptions "--squash" &&
--
1.7.5.284.g84c3a8
^ permalink raw reply related [relevance 2%]
* Re: git rebase -p doesn't understand -X
@ 2011-04-20 23:40 2% ` Jonathan Nieder
0 siblings, 0 replies; 200+ results
From: Jonathan Nieder @ 2011-04-20 23:40 UTC (permalink / raw)
To: Martin von Zweigbergk; +Cc: Marius Storm-Olsen, git, Johannes Schindelin
Hi Martin,
Martin von Zweigbergk wrote:
> Interactive rebase uses cherry-pick internally. Jonathan added support
> for -X to that command not too long ago (in commit 67ac1e1, late last
> year), so it should be pretty straight-forward to add support for what
> you want. Maybe I'll do that in a few weeks when I get back from
> vacation.
That would be excellent.
> A related topic is _when_ to use the strategy (and strategy options).
I agree with your analysis. In particular:
> Example:
>
> X
> \
> A---M---B
> /
> ---o---O---P---Q
>
> When the current HEAD is "B", "git rebase -i -p --onto Q O" will yield
>
> X
> \
> ---o---O---P---Q---A'---M'---B'
I have a vague feeling that honoring --strategy and --strategy-option
would be confusing here. The merge used in cherry-picking A does not
have much to do with the merge used to reincorporate changes from X.
Well, that is my intuition, but most of the examples I can think of
lead to the opposite conclusion! If I use -Xrenormalize, because P
changed the line-ending style, then I will want the same option when
merging X on top. Similarly, if I use -Xsubtree=src, because Q moved
all existing files in the source tree under src/, then with luck the
same trick will work when replaying the merge of X.
Luckily there is an exception to prove the intuition ok. If X was the
first parent of M and I am using -Xours to sloppily favor upstream's
decisions when rebasing my history on top of it, using -Xours to favor
choices from X (which is my own) would be just plain wrong. (Phew.)
> C---D
> / \
> A---B---M
> /
> ---o---O---P---Q
>
> which would yield
>
> C'---D'
> / \
> ---o---O---P---Q---A'---B'---M'
Likewise in this case.
> A more advanced solution would be recreate the merge using rerere.
[...]
Here's a vague and probably wrong idea about another way to re-create
merges.
When cherry-picking a patch (A, say), we run a three-way merge, with
A^ as merge base, A as "their" change, and the new parent for A (= Q)
as "our" change.
Maybe the same trick could work for re-creating merges. In your first
example, run a three-way merge with M^ (= A) as merge base, M as
"their" change, and the new parent for M (= A') as "our" change. That
only works in such a straightforward way if only one of M's parents
was rewritten, though. More generally it could be possible to run a
sequence of three-way merges:
base=M^1, theirs=M, ours=(M^1)' => call the result "m_1"
base=M^2, theirs=m_1, ours=(M^2)' => call the result "m_2"
...
At this point it gets ugly enough that just redoing the merge might be
simpler.
The main problem with rerere is that it can make mistakes. In the
long run, I wonder if rebase could learn to take into account
something more explicit like Junio's merge-fix mechanism (see
origin/todo:Reintegrate).
Thanks; that was interesting.
Jonathan
^ permalink raw reply [relevance 2%]
* Re: [PATCH] merge: honor prepare-commit-msg hook
2011-02-15 1:07 2% [PATCH] merge: honor prepare-commit-msg hook Jay Soffian
@ 2011-02-15 21:36 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2011-02-15 21:36 UTC (permalink / raw)
To: Jay Soffian; +Cc: git
Jay Soffian <jaysoffian@gmail.com> writes:
> When a merge is stopped due to conflicts or --no-commit, the
> subsequent commit calls the prepare-commit-msg hook. However,
> it is not called after a clean merge. Fix this inconsistency
> by invoking the hook after clean merges as well.
>
> Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
> ---
> I sent this out previously as an RFC:
>
> http://thread.gmane.org/gmane.comp.version-control.git/151297
>
> But never prepared a proper patch. Here it is.
Looks very sensible. Thanks.
Will queue.
^ permalink raw reply [relevance 0%]
* [PATCH] merge: honor prepare-commit-msg hook
@ 2011-02-15 1:07 2% Jay Soffian
2011-02-15 21:36 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Jay Soffian @ 2011-02-15 1:07 UTC (permalink / raw)
To: git; +Cc: Jay Soffian, Junio C Hamano
When a merge is stopped due to conflicts or --no-commit, the
subsequent commit calls the prepare-commit-msg hook. However,
it is not called after a clean merge. Fix this inconsistency
by invoking the hook after clean merges as well.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
I sent this out previously as an RFC:
http://thread.gmane.org/gmane.comp.version-control.git/151297
But never prepared a proper patch. Here it is.
builtin/merge.c | 38 ++++++++++++++++++++++++++++-------
t/t7505-prepare-commit-msg-hook.sh | 12 +++++++++++
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 42fff38..83389ed 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -795,6 +795,33 @@ static void add_strategies(const char *string, unsigned attr)
}
+static void write_merge_msg(void)
+{
+ int fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666);
+ if (fd < 0)
+ die_errno("Could not open '%s' for writing",
+ git_path("MERGE_MSG"));
+ if (write_in_full(fd, merge_msg.buf, merge_msg.len) !=
+ merge_msg.len)
+ die_errno("Could not write to '%s'", git_path("MERGE_MSG"));
+ close(fd);
+}
+
+static void read_merge_msg(void)
+{
+ strbuf_reset(&merge_msg);
+ if (strbuf_read_file(&merge_msg, git_path("MERGE_MSG"), 0) < 0)
+ die_errno("Could not read from '%s'", git_path("MERGE_MSG"));
+}
+
+static void run_prepare_commit_msg(void)
+{
+ write_merge_msg();
+ run_hook(get_index_file(), "prepare-commit-msg",
+ git_path("MERGE_MSG"), "merge", NULL, NULL);
+ read_merge_msg();
+}
+
static int merge_trivial(void)
{
unsigned char result_tree[20], result_commit[20];
@@ -806,6 +833,7 @@ static int merge_trivial(void)
parent->next = xmalloc(sizeof(*parent->next));
parent->next->item = remoteheads->item;
parent->next->next = NULL;
+ run_prepare_commit_msg();
commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
finish(result_commit, "In-index merge");
drop_save();
@@ -835,6 +863,7 @@ static int finish_automerge(struct commit_list *common,
}
free_commit_list(remoteheads);
strbuf_addch(&merge_msg, '\n');
+ run_prepare_commit_msg();
commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
finish(result_commit, buf.buf);
@@ -1316,14 +1345,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
die_errno("Could not write to '%s'", git_path("MERGE_HEAD"));
close(fd);
strbuf_addch(&merge_msg, '\n');
- fd = open(git_path("MERGE_MSG"), O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
- die_errno("Could not open '%s' for writing",
- git_path("MERGE_MSG"));
- if (write_in_full(fd, merge_msg.buf, merge_msg.len) !=
- merge_msg.len)
- die_errno("Could not write to '%s'", git_path("MERGE_MSG"));
- close(fd);
+ write_merge_msg();
fd = open(git_path("MERGE_MODE"), O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (fd < 0)
die_errno("Could not open '%s' for writing",
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index ff18962..5b4b694 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -132,6 +132,18 @@ test_expect_success 'with hook (-c)' '
'
+test_expect_success 'with hook (merge)' '
+
+ head=`git rev-parse HEAD` &&
+ git checkout -b other HEAD@{1} &&
+ echo "more" >> file &&
+ git add file &&
+ git commit -m other &&
+ git checkout - &&
+ git merge other &&
+ test "`git log -1 --pretty=format:%s`" = merge
+'
+
cat > "$HOOK" <<'EOF'
#!/bin/sh
exit 1
--
1.7.4.5.g9affb
^ permalink raw reply related [relevance 2%]
* Re: conflict resolution of pd/bash-4-completion [Re: What's cooking in git.git (Dec 2010, #05; Thu, 16)]
@ 2010-12-17 19:24 3% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-12-17 19:24 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git
SZEDER Gábor <szeder@ira.uka.de> writes:
> On Thu, Dec 16, 2010 at 11:38:21PM -0800, Junio C Hamano wrote:
>> * pd/bash-4-completion (2010-12-15) 3 commits
>> - Merge branch 'master' (early part) into pd/bash-4-completion
>> - bash: simple reimplementation of _get_comp_words_by_ref
>> - bash: get --pretty=m<tab> completion to work with bash v4
>>
>> Updated by Jonathan; this still has some conflicts around "notes"
>> completion I tried to resolve near the tip of 'pu'.
>
> The resolution of that conflict is not quite correct. I'm not sure
> how I should send a proper conflict resolution... but I'll try
> anyway.
Thanks, this helped me quite a lot to update my rerere database, so that
the fix-up can be carried forward in future merges to 'next' and
eventually 'master'.
For anybody interested, here is how a merge fix-up patch like yours can be
used:
1. First apply to the commit it is intended to be applied:
$ git co pu
$ git am your-patch
2. Re-attempt the merge. CG stands for "Commit Goal".
$ CG=$(git rev-parse HEAD)
$ git reset --hard HEAD^^
$ git merge pd/bash-4-completion
3. Clear the rerere database and redo the merge, letting it conflict.
$ git rerere forget contrib/completion/git-completion.bash
$ git reset --hard
$ git merge pd/bash-4-completion
4. Take the fixup and conclude the merge; this updates the rerere
database.
$ git checkout $CG .
$ git commit
^ permalink raw reply [relevance 3%]
* Re: Git automatic stashing?
@ 2010-11-09 7:49 2% ` Matthieu Moy
0 siblings, 0 replies; 200+ results
From: Matthieu Moy @ 2010-11-09 7:49 UTC (permalink / raw)
To: Casey McGinty; +Cc: git
Casey McGinty <casey.mcginty@gmail.com> writes:
> Is there any feature in git to perform and auto stash apply/pop when
> trying to do a merge/rebase in a dirty working dir? This would save
> some keystrokes from time-to-time, and make it easier for new users
> unfamiliar with git.
I agree with the keystrokes part, but not with the fact that it would
make it easier in general. In the sequence
git stash
git merge
git stash pop
conflicts can occur in 2 distinct places. One can easily forsee this
senario occuring:
git stash
git merge
# fix conflicts
# git commit
# forget to do the action needed to get the "git stash pop"
and voila, you've just lost data.
Actually, what I'd like to see would be this feature, but limited to
the case where the merge is a fast-forward, because then, only the
last action of the sequence could possibly leave conflict, so Git
could finish with a message like "please fix conflicts and continue
working". Actually, this is not far from what "git checout -m" is
doing.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [relevance 2%]
* Re: [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix)
2010-08-17 7:46 3% ` [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Ævar Arnfjörð Bjarmason
@ 2010-08-17 8:10 3% ` Jonathan Nieder
0 siblings, 0 replies; 200+ results
From: Jonathan Nieder @ 2010-08-17 8:10 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: git, Lars Hjemli, Tay Ray Chuan, Matthieu Moy, Clemens Buchacher,
Jeff King
Ævar Arnfjörð Bjarmason wrote:
> On Tue, Aug 17, 2010 at 06:51, Jonathan Nieder <jrnieder@gmail.com> wrote:
>> Patches 8-10 expose functionality used by merge when handling octopus
>> merges.
>
> You mean 9-10, 8 looks good. I don't have the familiarity to comment
> on 9-10.
I would be especially interested in feedback on the interface from
those two. ;-)
Is merge-base the right command to learn --independent?
Is --independent the right name for "reduced parent list"?
Is merge-base --octopus generally useful at all, or should we change
the API for custom octopus strategies (maybe at the same time as
teaching them to declare NO_TRIVIAL and NO_FAST_FORWARD preferences)
to leave the list of merge bases out?
>> Patches 12 and later are ports of various patches to builtin/merge.c.
>> I did the bare minimum to make tests pass. :)
>
> Those also look good to my untrained eye.
Thanks for looking them over.
> How do you run the tests against git-merge.sh? Is there some make
> target to use it instead of git-merge.c, or do you manually move it in
> place?
Ah, yes, I should have made that information more prominent.
To test: remove cmd_merge from the builtins list in git.c,
build git, and then run:
cp contrib/examples/git-merge.sh .
make SCRIPT_SH=git-merge.sh git-merge
cd t && make
> If it's the latter a switch somewhere to run the test suite against
> these .sh alternatives might compliment this series nicely.
Yes, that sounds like an good idea. Of course most of the retired
scripts are bitrotted by now.
^ permalink raw reply [relevance 3%]
* Re: [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix)
2010-08-17 6:51 2% [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Jonathan Nieder
2010-08-17 7:04 2% ` [PATCH 15/24] merge script: improve log message subject Jonathan Nieder
@ 2010-08-17 7:46 3% ` Ævar Arnfjörð Bjarmason
2010-08-17 8:10 3% ` Jonathan Nieder
1 sibling, 1 reply; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2010-08-17 7:46 UTC (permalink / raw)
To: Jonathan Nieder
Cc: git, Lars Hjemli, Tay Ray Chuan, Matthieu Moy, Clemens Buchacher,
Jeff King
On Tue, Aug 17, 2010 at 06:51, Jonathan Nieder <jrnieder@gmail.com> wrote:
> While preparing to make some minor "git merge" changes, I noticed that
> the old merge script does not pass all tests any more. Since it can
> be easier to prototype in shell and then port to C, I think that is
> worth fixing.
>
> Of course this is not urgent at all.
> Patches 2-7 are minor test changes. They are early in the series
> to give flexibility about when to merge them.
Those all looked good, thanks for tackling that.
> Patches 8-10 expose functionality used by merge when handling octopus
> merges.
You mean 9-10, 8 looks good. I don't have the familiarity to comment
on 9-10.
> Patches 12 and later are ports of various patches to builtin/merge.c.
> I did the bare minimum to make tests pass. :)
Those also look good to my untrained eye.
How do you run the tests against git-merge.sh? Is there some make
target to use it instead of git-merge.c, or do you manually move it in
place?
If it's the latter a switch somewhere to run the test suite against
these .sh alternatives might compliment this series nicely.
^ permalink raw reply [relevance 3%]
* [PATCH 15/24] merge script: improve log message subject
2010-08-17 6:51 2% [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Jonathan Nieder
@ 2010-08-17 7:04 2% ` Jonathan Nieder
2010-08-17 7:46 3% ` [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 200+ results
From: Jonathan Nieder @ 2010-08-17 7:04 UTC (permalink / raw)
To: git; +Cc: Lars Hjemli, Tay Ray Chuan, Matthieu Moy, Clemens Buchacher,
Jeff King
- point out remote-tracking branches as "remote branch
'upstream/master'";
- avoid misleading log messages when a tag and branch
share a name.
This approximates the builtin merge command's behavior well
enough to pass the relevant tests.
Based roughly on v1.6.4.2~10^2 (merge: indicate remote tracking
branches in merge message, 2009-08-09) and v1.6.4.2~10^2~1 (merge: fix
incorrect merge message for ambiguous tag/branch, 2009-08-09).
Cc: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
contrib/examples/git-merge.sh | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 50042df..d491566 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -134,21 +134,32 @@ finish () {
merge_name () {
remote="$1"
rh=$(git rev-parse --verify "$remote^0" 2>/dev/null) || return
- bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
- if test "$rh" = "$bh"
- then
- echo "$rh branch '$remote' of ."
- elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
+ if truname=$(expr "$remote" : '\(.*\)~[0-9]*$') &&
git show-ref -q --verify "refs/heads/$truname" 2>/dev/null
then
echo "$rh branch '$truname' (early part) of ."
- elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
+ return
+ fi
+ if found_ref=$(git rev-parse --symbolic-full-name --verify \
+ "$remote" 2>/dev/null)
+ then
+ if test "${found_ref#refs/heads/}" != "$found_ref"
+ then
+ echo "$rh branch '$remote' of ."
+ return
+ elif test "${found_ref#refs/remotes/}" != "$found_ref"
+ then
+ echo "$rh remote branch '$remote' of ."
+ return
+ fi
+ fi
+ if test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
then
sed -e 's/ not-for-merge / /' -e 1q \
"$GIT_DIR/FETCH_HEAD"
- else
- echo "$rh commit '$remote'"
+ return
fi
+ echo "$rh commit '$remote'"
}
parse_config () {
--
1.7.2.1.544.ga752d.dirty
^ permalink raw reply related [relevance 2%]
* [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix)
@ 2010-08-17 6:51 2% Jonathan Nieder
2010-08-17 7:04 2% ` [PATCH 15/24] merge script: improve log message subject Jonathan Nieder
2010-08-17 7:46 3% ` [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Ævar Arnfjörð Bjarmason
0 siblings, 2 replies; 200+ results
From: Jonathan Nieder @ 2010-08-17 6:51 UTC (permalink / raw)
To: git; +Cc: Lars Hjemli, Tay Ray Chuan, Matthieu Moy, Clemens Buchacher,
Jeff King
While preparing to make some minor "git merge" changes, I noticed that
the old merge script does not pass all tests any more. Since it can
be easier to prototype in shell and then port to C, I think that is
worth fixing.
Of course this is not urgent at all.
Patch 1 fixes a minor bug that the scripted implementation does not
suffer from, illustrated by the test "merge early part of c2" from
t7600-merge.sh.
The underlying problem is a subtlety in the resolve_ref() API (from
v0.99.8~13, Use resolve_ref() to implement read_ref(), 2005-09-30):
the "reading" argument to resolve_ref() should usually be true, but
that is not obvious to newcomers.
Patches 2-7 are minor test changes. They are early in the series
to give flexibility about when to merge them.
Patches 8-10 expose functionality used by merge when handling octopus
merges. merge-base --octopus is get_octopus_merge_bases(), used to
provide basis arguments when running the "git merge-octopus" command.
Of course the latter does not care about its basis arguments, but
that is a topic for another series. merge-base --independent is
reduce_refs(), used to reduce the parent list when --no-ff is not
in use.
These are analagous to show-branch --merge-base and
show-branch --independent but are slower and can be used with more
than 25 refs.
Patch 11 exposes the functionality from fmt-merge-msg needed to
implement merge --log -m.
Patches 12 and later are ports of various patches to builtin/merge.c.
I did the bare minimum to make tests pass. :)
Patches are against jn/merge-renormalize~2 (rerere: migrate to
parse-options API) from pu, because without that,
"rerere --rerere-autoupdate" does not work.
Thoughts?
Jonathan Nieder (24):
merge: do not mistake (ancestor of) tag for branch
t7600 (merge): modernize style
t7600 (merge): do not launch gitk for --debug
t7600 (merge): check reflog entry
t7600 (merge): test merge from branch yet to be born
t6010 (merge-base): modernize style
t6200 (fmt-merge-msg): style nitpicks
Documentation: add a SEE ALSO section for merge-base
merge-base --octopus to mimic show-branch --merge-base
merge-base --independent to print reduced parent list in a merge
fmt-merge-msg -m to replace subject line
merge script: --squash, --ff from unborn branch are errors
merge script: tweak unmerged files message to match builtin
merge script: refuse to merge during merge
merge script: improve log message subject
merge script: merge -X<option>
merge script: allow custom strategies
merge script: forbid merge -s index
merge script: handle -m --log correctly
merge script: handle many-way octopus
merge script: --ff-only to disallow true merge
merge script: handle --no-ff --no-commit correctly
merge script: notice @{-1} shorthand
merge script: learn --[no-]rerere-autoupdate
Documentation/git-fmt-merge-msg.txt | 9 +-
Documentation/git-merge-base.txt | 34 +++-
builtin/fmt-merge-msg.c | 18 ++-
builtin/merge-base.c | 44 ++++-
builtin/merge.c | 2 +-
contrib/examples/git-merge.sh | 115 ++++++++---
t/t6010-merge-base.sh | 358 +++++++++++++++++++--------------
t/t6200-fmt-merge-msg.sh | 306 ++++++++++++++--------------
t/t7600-merge.sh | 385 +++++++++++++++--------------------
9 files changed, 705 insertions(+), 566 deletions(-)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #08; Sun, 24)
@ 2010-01-25 4:39 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-25 4:39 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This is fix for a tricky codepath; I've been using this personally during
the whole cycle up to point, so hopefully it finally have nailed all the
corner cases? Knock wood...
--------------------------------------------------
[New Topics]
* cc/reset-keep (2010-01-19) 5 commits
- reset: disallow using --keep when there are unmerged entries
- reset: disallow "reset --keep" outside a work tree
- Documentation: reset: describe new "--keep" option
- reset: add test cases for "--keep" option
- reset: add option "--keep" to "git reset"
I do not think I'd ever use this, and I am not convinced I can sell this
to users as a great new feature without confusing them unnecessarily, but
perhaps queuing it to pu to give it wider visibility may help somebody
coming up with a better way to defend the feature and introduce it to
users without confusing them than Christan nor I managed to.
* jc/ce-uptodate (2010-01-24) 1 commit
- Make ce_uptodate() trustworthy again
I think this and Jens Lehmann's follow-up patch to avoid calling
is_submodule_modified() are needed before 1.7.0
--------------------------------------------------
[Cooking]
* jh/notes (2010-01-17) 20 commits
- builtin-gc: Teach the new --notes option to garbage-collect notes
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
- t3305: Verify that removing notes triggers automatic fanout consolidation
- builtin-notes: Teach -d option for deleting existing notes
- Teach builtin-notes to remove empty notes
- Teach notes code to properly preserve non-notes in the notes tree
- t3305: Verify that adding many notes with git-notes triggers increased fanout
- t3301: Verify successful annotation of non-commits
- Builtin-ify git-notes
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: write_notes_tree(): Store the notes tree in the database
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: remove_note(): Remove note objects from the notes tree structure
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor non-functional fixes to notes.c
The changes to test vector this series makes to t3301 breaks tests that
are in 'master', so 'pu' doesn't pass it.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
I know there is a series to split the later ones into smaller chunks that
are being discussed on the list, but they don't appear here. I'd prefer
to pick the series up after all the dust from the discussion settles.
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #07; Fri, 22)
@ 2010-01-23 3:28 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-23 3:28 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* jc/conflict-marker-size (2010-01-16) 8 commits
(merged to 'next' on 2010-01-18 at f1f6023)
+ rerere: honor conflict-marker-size attribute
+ rerere: prepare for customizable conflict marker length
+ conflict-marker-size: new attribute
+ rerere: use ll_merge() instead of using xdl_merge()
+ merge-tree: use ll_merge() not xdl_merge()
+ xdl_merge(): allow passing down marker_size in xmparam_t
+ xdl_merge(): introduce xmparam_t for merge specific parameters
+ git_attr(): fix function signature
* ag/maint-apply-too-large-p (2010-01-17) 1 commit
(merged to 'next' on 2010-01-18 at 8bd106a)
+ builtin-apply.c: Skip filenames without enough components
* ag/patch-header-verify (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 2cd0ddc)
+ builtin-apply.c: fix the --- and +++ header filename consistency check
* bw/cvsimport (2010-01-19) 3 commits
(merged to 'next' on 2010-01-19 at 63f4c8d)
+ cvsimport: standarize system() calls to external git tools
+ cvsimport: standarize open() calls to external git tools
+ cvsimport: modernize callouts to git subcommands
* jc/checkout-merge-base (2010-01-19) 1 commit
(merged to 'next' on 2010-01-19 at 3665110)
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit
+ status: don't require the repository to be writable
* nd/status-partial-refresh (2010-01-17) 2 commits
(merged to 'next' on 2010-01-19 at 64f0c0b)
+ rm: only refresh entries that we may touch
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* ap/merge-backend-opts (2008-07-18) 7 commits
(merged to 'next' on 2010-01-18 at cb1f6b7)
+ Document that merge strategies can now take their own options
+ Extend merge-subtree tests to test -Xsubtree=dir.
+ Make "subtree" part more orthogonal to the rest of merge-recursive.
+ pull: Fix parsing of -X<option>
+ Teach git-pull to pass -X<option> to git-merge
+ git merge -X<option>
+ git-merge-file --ours, --theirs
* jc/maint-limit-note-output (2010-01-21) 2 commits
(merged to 'next' on 2010-01-21 at bcb80b9)
+ Fix "log --oneline" not to show notes
(merged to 'next' on 2010-01-20 at 526bfcc)
+ Fix "log" family not to be too agressive about showing notes
* nd/ls-files-sparse-fix (2010-01-20) 1 commit
(merged to 'next' on 2010-01-20 at 0f61dbc)
+ Fix memory corruption when .gitignore does not end by \n
* il/branch-set-upstream (2010-01-18) 2 commits
(merged to 'next' on 2010-01-18 at b9b0993)
+ branch: warn and refuse to set a branch as a tracking branch of itself.
+ Add branch --set-upstream
* il/remote-updates (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 5c3e805)
+ Add git remote set-url
* il/rev-glob (2010-01-22) 3 commits
(merged to 'next' on 2010-01-21 at 453a21c)
+ Documentation: improve description of --glob=pattern and friends
(merged to 'next' on 2010-01-20 at 928ba0a)
+ rev-parse --branches/--tags/--remotes=pattern
+ rev-parse --glob
This is a re-rolled "--namespace=" one.
* jl/submodule-diff (2010-01-18) 4 commits
(merged to 'next' on 2010-01-20 at 95cb513)
+ Performance optimization for detection of modified submodules
(merged to 'next' on 2010-01-17 at 525075b)
+ git status: Show uncommitted submodule changes too when enabled
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* js/refer-upstream (2010-01-19) 3 commits
(merged to 'next' on 2010-01-20 at 5a5547a)
+ Teach @{upstream} syntax to strbuf_branchanme()
+ t1506: more test for @{upstream} syntax
+ Introduce <branch>@{upstream} notation
Updated to teach the new syntax to commands like "checkout" and "merge"
that want to behave better when they know what were given was a branch
name, not a random SHA-1.
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
--------------------------------------------------
[Cooking]
* jh/notes (2010-01-17) 20 commits
. builtin-gc: Teach the new --notes option to garbage-collect notes
. Notes API: gc_notes(): Prune notes that belong to non-existing objects
. t3305: Verify that removing notes triggers automatic fanout consolidation
. builtin-notes: Teach -d option for deleting existing notes
. Teach builtin-notes to remove empty notes
. Teach notes code to properly preserve non-notes in the notes tree
. t3305: Verify that adding many notes with git-notes triggers increased fanout
. t3301: Verify successful annotation of non-commits
. Builtin-ify git-notes
. Refactor notes concatenation into a flexible interface for combining notes
. Notes API: Allow multiple concurrent notes trees with new struct notes_tree
. Notes API: write_notes_tree(): Store the notes tree in the database
. Notes API: for_each_note(): Traverse the entire notes tree with a callback
. Notes API: get_note(): Return the note annotating the given object
. Notes API: remove_note(): Remove note objects from the notes tree structure
. Notes API: add_note(): Add note objects to the internal notes tree structure
. Notes API: init_notes(): Initialize the notes tree from the given notes ref
. Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
. Notes API: get_commit_notes() -> format_note() + remove the commit restriction
. Minor non-functional fixes to notes.c
Tentatively ejected, as its tests conflict with tests in a higher priority
fix.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jan 2010, #06; Wed, 20)
@ 2010-01-21 0:52 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-21 0:52 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
* tc/smart-http-restrict (2010-01-14) 5 commits
(merged to 'next' on 2010-01-16 at 71fc84c)
+ Test t5560: Fix test when run with dash
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* js/windows (2010-01-15) 7 commits
+ Do not use date.c:tm_to_time_t() from compat/mingw.c
+ MSVC: Windows-native implementation for subset of Pthreads API
+ MSVC: Fix an "incompatible pointer types" compiler warning
+ Windows: avoid the "dup dance" when spawning a child process
+ Windows: simplify the pipe(2) implementation
+ Windows: boost startup by avoiding a static dependency on shell32.dll
+ Windows: disable Python
* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f95ea8e)
+ fast-import: tag may point to any object type
* nd/include-termios-for-osol (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at 3160c76)
+ Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at b06ca1a)
+ Remove empty directories when checking out a commit with fewer submodules
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
* rr/core-tutorial (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at d9dd8bd)
+ Documentation: Update git core tutorial clarifying reference to scripts
* il/push-set-upstream (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at e3a7a60)
+ Add push --set-upstream
* jk/warn-author-committer-after-commit (2010-01-17) 6 commits
(merged to 'next' on 2010-01-17 at c2bb7fd)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ commit.c::print_summary: do not release the format string too early
(merged to 'next' on 2010-01-16 at f22c077)
+ commit: allow suppression of implicit identity advice
+ commit: show interesting ident information in summary
+ strbuf: add strbuf_addbuf_percentquote
+ strbuf_expand: convert "%%" to "%"
* jc/ident (2010-01-17) 5 commits
(merged to 'next' on 2010-01-19 at 9fba1c0)
+ ident.c: replace fprintf with fputs to suppress compiler warning
(merged to 'next' on 2010-01-17 at 625670d)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* tr/http-push-ref-status (2010-01-08) 6 commits
(merged to 'next' on 2010-01-16 at 7e872ac)
+ transport-helper.c::push_refs(): emit "no refs" error message
+ transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
+ transport.c::transport_push(): make ref status affect return value
+ refactor ref status logic for pushing
+ t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
+ t5541-http-push.sh: add tests for non-fast-forward pushes
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
(merged to 'next' on 2010-01-16 at cc4ae57)
+ Handle relative paths in submodule .git files
+ Test update-index for a gitlink to a .git file
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
(merged to 'next' on 2010-01-16 at 57d6d31)
+ Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
+ Add 'git rev-parse --show-toplevel' option.
* jc/symbol-static (2010-01-18) 17 commits
(merged to 'next' on 2010-01-18 at d063267)
+ Replace parse_blob() with an explanatory comment
+ symlinks.c: remove unused functions
+ object.c: remove unused functions
+ strbuf.c: remove unused function
+ sha1_file.c: remove unused function
+ mailmap.c: remove unused function
(merged to 'next' on 2010-01-17 at d7346b1)
+ utf8.c: mark file-local function static
+ submodule.c: mark file-local function static
+ quote.c: mark file-local function static
+ remote-curl.c: mark file-local function static
+ read-cache.c: mark file-local functions static
+ parse-options.c: mark file-local function static
+ entry.c: mark file-local function static
+ http.c: mark file-local functions static
+ pretty.c: mark file-local function static
+ builtin-rev-list.c: mark file-local function static
+ bisect.c: mark file-local function static
* mh/rebase-fixup (2010-01-14) 23 commits
(merged to 'next' on 2010-01-16 at 7ccb228)
+ rebase -i: Retain user-edited commit messages after squash/fixup conflicts
+ t3404: Set up more of the test repo in the "setup" step
+ rebase -i: For fixup commands without squashes, do not start editor
+ rebase -i: Change function make_squash_message into update_squash_message
+ rebase -i: Extract function do_with_author
+ rebase -i: Handle the author script all in one place in do_next
+ rebase -i: Extract a function "commit_message"
+ rebase -i: Simplify commit counting for generated commit messages
+ rebase -i: Improve consistency of commit count in generated commit messages
+ t3404: Test the commit count in commit messages generated by "rebase -i"
+ rebase -i: Introduce a constant AMEND
+ rebase -i: Introduce a constant AUTHOR_SCRIPT
+ rebase -i: Document how temporary files are used
+ rebase -i: Use symbolic constant $MSG consistently
+ rebase -i: Use "test -n" instead of "test ! -z"
+ rebase -i: Inline expression
+ rebase -i: Remove dead code
+ rebase -i: Make the condition for an "if" more transparent
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* da/difftool (2010-01-15) 10 commits
(merged to 'next' on 2010-01-16 at 609f0da)
+ difftool: Update copyright notices to list each year separately
+ difftool: Use eval to expand '--extcmd' expressions
+ difftool: Add '-x' and as an alias for '--extcmd'
+ t7800-difftool.sh: Simplify the --extcmd test
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* mm/conflict-advice (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at b83be11)
+ Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at 5959eee)
+ strbuf_addbuf(): allow passing the same buf to dst and src
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
* jc/grep-lookahead (2010-01-15) 4 commits
(merged to 'next' on 2010-01-17 at 4a5be2d)
+ grep --no-index: allow use of "git grep" outside a git repository
+ grep: prepare to run outside of a work tree
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
(merged to 'next' on 2010-01-16 at d36016a)
+ ls-files: fix overeager pathspec optimization
+ read_directory(): further split treat_path()
+ read_directory_recursive(): refactor handling of a single path into a separate function
+ t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
(merged to 'next' on 2010-01-16 at 0e28d02)
+ Improve error message when a transport helper was not found
+ start_command: detect execvp failures early
+ run-command: move wait_or_whine earlier
+ start_command: report child process setup errors to the parent's stderr
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
(this branch is used by jc/conflict-marker-size.)
--------------------------------------------------
[New Topics]
* jc/conflict-marker-size (2010-01-16) 8 commits
(merged to 'next' on 2010-01-18 at f1f6023)
+ rerere: honor conflict-marker-size attribute
+ rerere: prepare for customizable conflict marker length
+ conflict-marker-size: new attribute
+ rerere: use ll_merge() instead of using xdl_merge()
+ merge-tree: use ll_merge() not xdl_merge()
+ xdl_merge(): allow passing down marker_size in xmparam_t
+ xdl_merge(): introduce xmparam_t for merge specific parameters
+ git_attr(): fix function signature
* ag/maint-apply-too-large-p (2010-01-17) 1 commit
(merged to 'next' on 2010-01-18 at 8bd106a)
+ builtin-apply.c: Skip filenames without enough components
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
* ag/patch-header-verify (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 2cd0ddc)
+ builtin-apply.c: fix the --- and +++ header filename consistency check
* il/branch-set-upstream (2010-01-18) 2 commits
(merged to 'next' on 2010-01-18 at b9b0993)
+ branch: warn and refuse to set a branch as a tracking branch of itself.
+ Add branch --set-upstream
* il/remote-updates (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 5c3e805)
+ Add git remote set-url
* bw/cvsimport (2010-01-19) 3 commits
(merged to 'next' on 2010-01-19 at 63f4c8d)
+ cvsimport: standarize system() calls to external git tools
+ cvsimport: standarize open() calls to external git tools
+ cvsimport: modernize callouts to git subcommands
* jc/checkout-merge-base (2010-01-19) 1 commit
(merged to 'next' on 2010-01-19 at 3665110)
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit
- status: don't require the repository to be writable
* il/rev-glob (2010-01-20) 2 commits
- rev-parse --branches/--tags/--remotes=pattern
- rev-parse --glob
This is a re-rolled "--namespace=" one.
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* nd/status-partial-refresh (2010-01-17) 2 commits
(merged to 'next' on 2010-01-19 at 64f0c0b)
+ rm: only refresh entries that we may touch
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* jl/submodule-diff (2010-01-18) 4 commits
(merged to 'next' on 2010-01-20 at 95cb513)
+ Performance optimization for detection of modified submodules
(merged to 'next' on 2010-01-17 at 525075b)
+ git status: Show uncommitted submodule changes too when enabled
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* ap/merge-backend-opts (2008-07-18) 7 commits
(merged to 'next' on 2010-01-18 at cb1f6b7)
+ Document that merge strategies can now take their own options
+ Extend merge-subtree tests to test -Xsubtree=dir.
+ Make "subtree" part more orthogonal to the rest of merge-recursive.
+ pull: Fix parsing of -X<option>
+ Teach git-pull to pass -X<option> to git-merge
+ git merge -X<option>
+ git-merge-file --ours, --theirs
--------------------------------------------------
[Cooking]
* js/refer-upstream (2010-01-19) 3 commits
(merged to 'next' on 2010-01-20 at 5a5547a)
+ Teach @{upstream} syntax to strbuf_branchanme()
+ t1506: more test for @{upstream} syntax
+ Introduce <branch>@{upstream} notation
Updated to teach the new syntax to commands like "checkout" and "merge"
that want to behave better when they know what were given was a branch
name, not a random SHA-1.
* jh/notes (2010-01-17) 23 commits
- builtin-gc: Teach the new --notes option to garbage-collect notes
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
- t3305: Verify that removing notes triggers automatic fanout consolidation
- builtin-notes: Teach -d option for deleting existing notes
- Teach builtin-notes to remove empty notes
- Teach notes code to properly preserve non-notes in the notes tree
- t3305: Verify that adding many notes with git-notes triggers increased fanout
- t3301: Verify successful annotation of non-commits
- Builtin-ify git-notes
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: write_notes_tree(): Store the notes tree in the database
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: remove_note(): Remove note objects from the notes tree structure
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor non-functional fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
Updated with a re-roll.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #06 draft)
@ 2010-01-20 10:24 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-20 10:24 UTC (permalink / raw)
To: git
This is a draft copy of the real one I would send out after my git
Wednesday is over.
But before that day begins, I need to go to sleep ;-)
---
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
* tc/smart-http-restrict (2010-01-14) 5 commits
(merged to 'next' on 2010-01-16 at 71fc84c)
+ Test t5560: Fix test when run with dash
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
I have already given ample time for people to react, but ended up getting
tired of waiting for tests to materialize and doing it myself, as I want
to close merge window for 1.7.0-rc0 by the end of next week to have the
final release early next month.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* js/windows (2010-01-15) 7 commits
- Do not use date.c:tm_to_time_t() from compat/mingw.c
- MSVC: Windows-native implementation for subset of Pthreads API
- MSVC: Fix an "incompatible pointer types" compiler warning
- Windows: avoid the "dup dance" when spawning a child process
- Windows: simplify the pipe(2) implementation
- Windows: boost startup by avoiding a static dependency on shell32.dll
- Windows: disable Python
* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f95ea8e)
+ fast-import: tag may point to any object type
* nd/include-termios-for-osol (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at 3160c76)
+ Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at b06ca1a)
+ Remove empty directories when checking out a commit with fewer submodules
Instead of using unlink(2) that will never succeed, use rmdir(2) to remove
an empty directory, knowing that this won't harm a populated directory.
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
--------------------------------------------------
[New Topics]
* jc/conflict-marker-size (2010-01-16) 8 commits
(merged to 'next' on 2010-01-18 at f1f6023)
+ rerere: honor conflict-marker-size attribute
+ rerere: prepare for customizable conflict marker length
+ conflict-marker-size: new attribute
+ rerere: use ll_merge() instead of using xdl_merge()
+ merge-tree: use ll_merge() not xdl_merge()
+ xdl_merge(): allow passing down marker_size in xmparam_t
+ xdl_merge(): introduce xmparam_t for merge specific parameters
+ git_attr(): fix function signature
(this branch uses jc/cache-unmerge.)
* ag/maint-apply-too-large-p (2010-01-17) 1 commit
(merged to 'next' on 2010-01-18 at 8bd106a)
+ builtin-apply.c: Skip filenames without enough components
* il/rev-namespace (2010-01-19) 2 commits
(merged to 'next' on 2010-01-19 at 2dbc665)
+ Fix errors in t6018
(merged to 'next' on 2010-01-18 at 3e68978)
+ rev-parse --namespace
This probably will be dropped and replaced with the --glob one, perhaps
with minor tweaks.
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
* ag/patch-header-verify (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 2cd0ddc)
+ builtin-apply.c: fix the --- and +++ header filename consistency check
* il/branch-set-upstream (2010-01-18) 2 commits
(merged to 'next' on 2010-01-18 at b9b0993)
+ branch: warn and refuse to set a branch as a tracking branch of itself.
+ Add branch --set-upstream
* il/remote-updates (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 5c3e805)
+ Add git remote set-url
* bw/cvsimport (2010-01-19) 3 commits
(merged to 'next' on 2010-01-19 at 63f4c8d)
+ cvsimport: standarize system() calls to external git tools
+ cvsimport: standarize open() calls to external git tools
+ cvsimport: modernize callouts to git subcommands
* jc/checkout-merge-base (2010-01-19) 1 commit
(merged to 'next' on 2010-01-19 at 3665110)
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit
- status: don't require the repository to be writable
--------------------------------------------------
[Will merge to 'master' soon unless somebody complains]
* rr/core-tutorial (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at d9dd8bd)
+ Documentation: Update git core tutorial clarifying reference to scripts
* il/push-set-upstream (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at e3a7a60)
+ Add push --set-upstream
* jk/warn-author-committer-after-commit (2010-01-17) 6 commits
(merged to 'next' on 2010-01-17 at c2bb7fd)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ commit.c::print_summary: do not release the format string too early
(merged to 'next' on 2010-01-16 at f22c077)
+ commit: allow suppression of implicit identity advice
+ commit: show interesting ident information in summary
+ strbuf: add strbuf_addbuf_percentquote
+ strbuf_expand: convert "%%" to "%"
* jc/ident (2010-01-17) 5 commits
(merged to 'next' on 2010-01-19 at 9fba1c0)
+ ident.c: replace fprintf with fputs to suppress compiler warning
(merged to 'next' on 2010-01-17 at 625670d)
+ user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
+ ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* tr/http-push-ref-status (2010-01-08) 6 commits
(merged to 'next' on 2010-01-16 at 7e872ac)
+ transport-helper.c::push_refs(): emit "no refs" error message
+ transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
+ transport.c::transport_push(): make ref status affect return value
+ refactor ref status logic for pushing
+ t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
+ t5541-http-push.sh: add tests for non-fast-forward pushes
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
(merged to 'next' on 2010-01-16 at cc4ae57)
+ Handle relative paths in submodule .git files
+ Test update-index for a gitlink to a .git file
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
(merged to 'next' on 2010-01-16 at 57d6d31)
+ Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
+ Add 'git rev-parse --show-toplevel' option.
Avoid having to use "cd -P" that may not be available on some platforms'
shells.
* jc/symbol-static (2010-01-18) 17 commits
(merged to 'next' on 2010-01-18 at d063267)
+ Replace parse_blob() with an explanatory comment
+ symlinks.c: remove unused functions
+ object.c: remove unused functions
+ strbuf.c: remove unused function
+ sha1_file.c: remove unused function
+ mailmap.c: remove unused function
(merged to 'next' on 2010-01-17 at d7346b1)
+ utf8.c: mark file-local function static
+ submodule.c: mark file-local function static
+ quote.c: mark file-local function static
+ remote-curl.c: mark file-local function static
+ read-cache.c: mark file-local functions static
+ parse-options.c: mark file-local function static
+ entry.c: mark file-local function static
+ http.c: mark file-local functions static
+ pretty.c: mark file-local function static
+ builtin-rev-list.c: mark file-local function static
+ bisect.c: mark file-local function static
Mark file-local symbols "static", and remove unused functions.
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* nd/status-partial-refresh (2010-01-17) 2 commits
(merged to 'next' on 2010-01-19 at 64f0c0b)
+ rm: only refresh entries that we may touch
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* mh/rebase-fixup (2010-01-14) 23 commits
(merged to 'next' on 2010-01-16 at 7ccb228)
+ rebase -i: Retain user-edited commit messages after squash/fixup conflicts
+ t3404: Set up more of the test repo in the "setup" step
+ rebase -i: For fixup commands without squashes, do not start editor
+ rebase -i: Change function make_squash_message into update_squash_message
+ rebase -i: Extract function do_with_author
+ rebase -i: Handle the author script all in one place in do_next
+ rebase -i: Extract a function "commit_message"
+ rebase -i: Simplify commit counting for generated commit messages
+ rebase -i: Improve consistency of commit count in generated commit messages
+ t3404: Test the commit count in commit messages generated by "rebase -i"
+ rebase -i: Introduce a constant AMEND
+ rebase -i: Introduce a constant AUTHOR_SCRIPT
+ rebase -i: Document how temporary files are used
+ rebase -i: Use symbolic constant $MSG consistently
+ rebase -i: Use "test -n" instead of "test ! -z"
+ rebase -i: Inline expression
+ rebase -i: Remove dead code
+ rebase -i: Make the condition for an "if" more transparent
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* da/difftool (2010-01-15) 10 commits
(merged to 'next' on 2010-01-16 at 609f0da)
+ difftool: Update copyright notices to list each year separately
+ difftool: Use eval to expand '--extcmd' expressions
+ difftool: Add '-x' and as an alias for '--extcmd'
+ t7800-difftool.sh: Simplify the --extcmd test
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* mm/conflict-advice (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at b83be11)
+ Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at 5959eee)
+ strbuf_addbuf(): allow passing the same buf to dst and src
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
Optimize the "line-by-line" internal grep by skiping en masse over lines
that cannot possibly match.
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
Early conflict resolution for the above for recent git.
* jc/grep-lookahead (2010-01-15) 4 commits
(merged to 'next' on 2010-01-17 at 4a5be2d)
+ grep --no-index: allow use of "git grep" outside a git repository
+ grep: prepare to run outside of a work tree
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
* jl/submodule-diff (2010-01-18) 4 commits
- Performance optimization for detection of modified submodules
(merged to 'next' on 2010-01-17 at 525075b)
+ git status: Show uncommitted submodule changes too when enabled
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
(merged to 'next' on 2010-01-16 at d36016a)
+ ls-files: fix overeager pathspec optimization
+ read_directory(): further split treat_path()
+ read_directory_recursive(): refactor handling of a single path into a separate function
+ t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
(merged to 'next' on 2010-01-16 at 0e28d02)
+ Improve error message when a transport helper was not found
+ start_command: detect execvp failures early
+ run-command: move wait_or_whine earlier
+ start_command: report child process setup errors to the parent's stderr
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
(this branch is used by jc/conflict-marker-size.)
* ap/merge-backend-opts (2008-07-18) 7 commits
(merged to 'next' on 2010-01-18 at cb1f6b7)
+ Document that merge strategies can now take their own options
+ Extend merge-subtree tests to test -Xsubtree=dir.
+ Make "subtree" part more orthogonal to the rest of merge-recursive.
+ pull: Fix parsing of -X<option>
+ Teach git-pull to pass -X<option> to git-merge
+ git merge -X<option>
+ git-merge-file --ours, --theirs
--------------------------------------------------
[Cooking]
* js/refer-upstream (2010-01-19) 3 commits
- Teach @{upstream} syntax to strbuf_branchanme()
- t1506: more test for @{upstream} syntax
- Introduce <branch>@{upstream} notation
Updated to teach the new syntax to commands like "checkout" and "merge"
that want to behave better when they know what were given was a branch
name, not a random SHA-1 or a full refname.
* jh/notes (2010-01-17) 23 commits
- builtin-gc: Teach the new --notes option to garbage-collect notes
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
- t3305: Verify that removing notes triggers automatic fanout consolidation
- builtin-notes: Teach -d option for deleting existing notes
- Teach builtin-notes to remove empty notes
- Teach notes code to properly preserve non-notes in the notes tree
- t3305: Verify that adding many notes with git-notes triggers increased fanout
- t3301: Verify successful annotation of non-commits
- Builtin-ify git-notes
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: write_notes_tree(): Store the notes tree in the database
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: remove_note(): Remove note objects from the notes tree structure
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor non-functional fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
Updated with a re-roll.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #05; Sat, 16)
@ 2010-01-17 2:46 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-17 2:46 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
I am expecting that the next week we will see quite a busy 'master', as I
would really like to close the merge window for 1.7.0 and tag -rc0 by the
end of it.
--------------------------------------------------
[New Topics]
* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f95ea8e)
+ fast-import: tag may point to any object type
* il/push-set-upstream (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at e3a7a60)
+ Add push --set-upstream
* js/windows (2010-01-15) 7 commits
- Do not use date.c:tm_to_time_t() from compat/mingw.c
- MSVC: Windows-native implementation for subset of Pthreads API
- MSVC: Fix an "incompatible pointer types" compiler warning
- Windows: avoid the "dup dance" when spawning a child process
- Windows: simplify the pipe(2) implementation
- Windows: boost startup by avoiding a static dependency on shell32.dll
- Windows: disable Python
* nd/status-partial-refresh (2010-01-14) 1 commit
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* rr/core-tutorial (2010-01-16) 1 commit
(merged to 'next' on 2010-01-16 at d9dd8bd)
+ Documentation: Update git core tutorial clarifying reference to scripts
* jc/conflict-mark-len-attr (2010-01-16) 3 commits
. WIP : honor conflict-marker-lenght in rerere (does not work yet)
. rerere: use ll_merge() instead of using xdl_merge()
. conflict-marker-length: new attribute
(this branch uses jc/cache-unmerge.)
I am attempting to introduce a new per-path attribute to specify
non-default conflict marker length to help rerere grok conflicts in
Documentation/git-merge.txt, but the series is not yet in a presentable
state yet.
--------------------------------------------------
[Stalled]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* js/refer-upstream (2009-09-10) 1 commit
- Introduce <branch>@{upstream} notation
This does not teach the public interface about the new syntax; callers
that care about distinction between name vs SHA-1 might not work as well
as they should.
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
--------------------------------------------------
[Will merge to 'master' soon unless somebody complains]
* jk/warn-author-committer-after-commit (2010-01-13) 4 commits
(merged to 'next' on 2010-01-16 at f22c077)
+ commit: allow suppression of implicit identity advice
+ commit: show interesting ident information in summary
+ strbuf: add strbuf_addbuf_percentquote
+ strbuf_expand: convert "%%" to "%"
* tr/http-push-ref-status (2010-01-08) 6 commits
(merged to 'next' on 2010-01-16 at 7e872ac)
+ transport-helper.c::push_refs(): emit "no refs" error message
+ transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
+ transport.c::transport_push(): make ref status affect return value
+ refactor ref status logic for pushing
+ t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
+ t5541-http-push.sh: add tests for non-fast-forward pushes
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
* tc/smart-http-restrict (2010-01-14) 5 commits
(merged to 'next' on 2010-01-16 at 71fc84c)
+ Test t5560: Fix test when run with dash
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
(merged to 'next' on 2010-01-16 at cc4ae57)
+ Handle relative paths in submodule .git files
+ Test update-index for a gitlink to a .git file
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
I have already given ample time for people to react, but ended up getting
tired of waiting for tests to materialize and doing it myself, as I want
to close merge window for 1.7.0-rc0 by the end of next week to have the
final release early next month.
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
(merged to 'next' on 2010-01-16 at 57d6d31)
+ Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
+ Add 'git rev-parse --show-toplevel' option.
Avoid having to use "cd -P" that may not be available on some platforms'
shells.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* mh/rebase-fixup (2010-01-14) 21 commits
(merged to 'next' on 2010-01-16 at 7ccb228)
+ rebase -i: Retain user-edited commit messages after squash/fixup conflicts
+ t3404: Set up more of the test repo in the "setup" step
+ rebase -i: For fixup commands without squashes, do not start editor
+ rebase -i: Change function make_squash_message into update_squash_message
+ rebase -i: Extract function do_with_author
+ rebase -i: Handle the author script all in one place in do_next
+ rebase -i: Extract a function "commit_message"
+ rebase -i: Simplify commit counting for generated commit messages
+ rebase -i: Improve consistency of commit count in generated commit messages
+ t3404: Test the commit count in commit messages generated by "rebase -i"
+ rebase -i: Introduce a constant AMEND
+ rebase -i: Introduce a constant AUTHOR_SCRIPT
+ rebase -i: Document how temporary files are used
+ rebase -i: Use symbolic constant $MSG consistently
+ rebase -i: Use "test -n" instead of "test ! -z"
+ rebase -i: Inline expression
+ rebase -i: Remove dead code
+ rebase -i: Make the condition for an "if" more transparent
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* da/difftool (2010-01-15) 10 commits
(merged to 'next' on 2010-01-16 at 609f0da)
+ difftool: Update copyright notices to list each year separately
+ difftool: Use eval to expand '--extcmd' expressions
+ difftool: Add '-x' and as an alias for '--extcmd'
+ t7800-difftool.sh: Simplify the --extcmd test
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* mm/conflict-advice (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at b83be11)
+ Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
(merged to 'next' on 2010-01-16 at 5959eee)
+ strbuf_addbuf(): allow passing the same buf to dst and src
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
Optimize the "line-by-line" internal grep by skiping en masse over lines
that cannot possibly match.
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
Early conflict resolution for the above for recent git.
* jc/grep-lookahead (2010-01-15) 4 commits
- grep --no-index: allow use of "git grep" outside a git repository
- grep: prepare to run outside of a work tree
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
* nd/include-termios-for-osol (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at 3160c76)
+ Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
(merged to 'next' on 2010-01-16 at b06ca1a)
+ Remove empty directories when checking out a commit with fewer submodules
Instead of using unlink(2) that will never succeed, use rmdir(2) to remove
an empty directory, knowing that this won't harm a populated directory.
* jl/submodule-diff (2010-01-16) 2 commits
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
(merged to 'next' on 2010-01-16 at d36016a)
+ ls-files: fix overeager pathspec optimization
+ read_directory(): further split treat_path()
+ read_directory_recursive(): refactor handling of a single path into a separate function
+ t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
(merged to 'next' on 2010-01-16 at 0e28d02)
+ Improve error message when a transport helper was not found
+ start_command: detect execvp failures early
+ run-command: move wait_or_whine earlier
+ start_command: report child process setup errors to the parent's stderr
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
(this branch is used by jc/conflict-mark-len-attr.)
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
--------------------------------------------------
[Cooking]
* jc/symbol-static (2010-01-11) 17 commits
- symlinks.c: remove unused functions
- object.c: remove unused functions
- blob.c: remove unused function
- strbuf.c: remove unused function
- sha1_file.c: remove unused function
- mailmap.c: remove unused function
- utf8.c: mark file-local function static
- submodule.c: mark file-local function static
- quote.c: mark file-local function static
- remote-curl.c: mark file-local function static
- read-cache.c: mark file-local functions static
- parse-options.c: mark file-local function static
- entry.c: mark file-local function static
- http.c: mark file-local functions static
- pretty.c: mark file-local function static
- builtin-rev-list.c: mark file-local function static
- bisect.c: mark file-local function static
Mark file-local symbols "static", and remove unused functions. Daniel
suggests to leave some comment for blob.c and I agree in principle, but
I don't think of a good description myself.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
Opinions on the topmost one?
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #04; Wed, 13)
@ 2010-01-13 23:11 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-13 23:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* nd/sparse (2010-01-04) 25 commits
(merged to 'next' on 2010-01-10 at fa73d6e)
+ t7002: test for not using external grep on skip-worktree paths
+ t7002: set test prerequisite "external-grep" if supported
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
With the removal of external grep near future, some codepaths will be
slightly simplified.
* cc/reset-more (2010-01-08) 8 commits
(merged to 'next' on 2010-01-10 at 84730de)
+ t7111: check that reset options work as described in the tables
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* il/vcs-helper (2010-01-09) 9 commits
(merged to 'next' on 2010-01-10 at 11e448e)
+ Reset possible helper before reusing remote structure
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
* jc/checkout-merge-base (2010-01-07) 4 commits
(merged to 'next' on 2010-01-07 at 5229608)
+ rebase -i: teach --onto A...B syntax
+ rebase: fix --onto A...B parsing and add tests
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
--------------------------------------------------
[New Topics]
* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: optimize built-in grep by skipping lines that do not hit
(this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)
Optimize the "line-by-line" internal grep by skiping en masse over lines
that cannot possibly match.
* jc/maint-grep-lookahead (2010-01-12) 0 commits
(this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)
Early conflict resolution for the above for recent git.
* jc/grep-lookahead (2010-01-12) 2 commits
(merged to 'next' on 2010-01-13 at 20f8f4b)
+ grep: rip out pessimization to use fixmatch()
+ grep: rip out support for external grep
(this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)
This is for eventual inclusion for the next release.
* jc/symbol-static (2010-01-11) 17 commits
- symlinks.c: remove unused functions
- object.c: remove unused functions
- blob.c: remove unused function
- strbuf.c: remove unused function
- sha1_file.c: remove unused function
- mailmap.c: remove unused function
- utf8.c: mark file-local function static
- submodule.c: mark file-local function static
- quote.c: mark file-local function static
- remote-curl.c: mark file-local function static
- read-cache.c: mark file-local functions static
- parse-options.c: mark file-local function static
- entry.c: mark file-local function static
- http.c: mark file-local functions static
- pretty.c: mark file-local function static
- builtin-rev-list.c: mark file-local function static
- bisect.c: mark file-local function static
Mark file-local symbols "static", and remove unused functions. Daniel
suggests to leave some comment for blob.c and I agree in principle, but
I don't think of a good description myself.
* nd/include-termios-for-osol (2010-01-11) 1 commit
- Add missing #include to support TIOCGWINSZ on Solaris
* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit
- Remove empty directories when checking out a commit with fewer submodules
Instead of using unlink(2) that will never succeed, use rmdir(2) to remove
an empty directory, knowing that this won't harm a populated directory.
* sd/cd-p-show-toplevel (2010-01-12) 2 commits
- Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
- Add 'git rev-parse --show-toplevel' option.
Avoid having to use "cd -P" that may not be available on some platforms'
shells.
* jk/warn-author-committer-after-commit (2010-01-13) 4 commits
- commit: allow suppression of implicit identity advice
- commit: show interesting ident information in summary
- strbuf: add strbuf_addbuf_percentquote
- strbuf_expand: convert "%%" to "%"
* js/refer-upstream (2009-09-10) 1 commit
- Introduce <branch>@{upstream} notation
This does not teach the public interface about the new syntax; callers
that care about distinction between name vs SHA-1 might not work as well
as they should.
* mm/conflict-advice (2010-01-12) 1 commit
- Be more user-friendly when refusing to do something because of conflict.
* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
- strbuf_addbuf(): allow passing the same buf to dst and src
* jl/submodule-diff (2010-01-13) 2 commits
- Teach diff that modified submodule directory is dirty
- Show submodules as modified when they contain a dirty work tree
--------------------------------------------------
[Stalled]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mh/rebase-fixup (2010-01-12) 5 commits
(merged to 'next' on 2010-01-12 at e84eab0)
+ rebase-i: Ignore comments and blank lines in peek_next_command
+ lib-rebase: Allow comments and blank lines to be added to the rebase script
+ lib-rebase: Provide clearer debugging info about what the editor did
(merged to 'next' on 2010-01-06 at c4779a7)
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Expecting further improvements to skip opening the editor if a pick is
followed only by "fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
Blocked by the above.
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
* jh/gitweb-cached (2010-01-13) 7 commits
- (sign-off?) gitweb: File based caching layer (from git.kernel.org)
- (sign-off?) gitweb: add a get function to compliment print_local_time
- (sign-off?) gitweb: Convert output to using indirect file handle
- gitweb: Optionally add "git" links in project list page
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
--------------------------------------------------
[Cooking]
* jh/commit-status (2010-01-13) 2 commits
(merged to 'next' on 2010-01-13 at 0905d59)
+ t7502: test commit.status, --status and --no-status
+ commit: support commit.status, --status, and --no-status
I have already given ample time for people to react, but ended up getting
tired of waiting for tests to materialize and doing it myself, as I want
to close merge window for 1.7.0-rc0 by the end of next week to have the
final release early next month.
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
- Handle relative paths in submodule .git files
- Test update-index for a gitlink to a .git file
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
Opinions on the topmost one?
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
- ls-files: fix overeager pathspec optimization
- read_directory(): further split treat_path()
- read_directory_recursive(): refactor handling of a single path into a separate function
- t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-12) 4 commits
- Improve error message when a transport helper was not found
- start_command: detect execvp failures early
- run-command: move wait_or_whine earlier
- start_command: report child process setup errors to the parent's stderr
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* da/difftool (2010-01-09) 6 commits
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
(merged to 'next' on 2010-01-13 at 2290c44)
+ rerere forget path: forget recorded resolution
+ rerere: refactor rerere logic to make it independent from I/O
+ rerere: remove silly 1024-byte line limit
+ resolve-undo: teach "update-index --unresolve" to use resolve-undo info
+ resolve-undo: "checkout -m path" uses resolve-undo information
+ resolve-undo: allow plumbing to clear the information
+ resolve-undo: basic tests
+ resolve-undo: record resolved conflicts in a new index extension section
+ builtin-merge.c: use standard active_cache macros
* tr/http-push-ref-status (2010-01-08) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
Rerolled.
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #03; Sun, 10)
@ 2010-01-10 19:55 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-10 19:55 UTC (permalink / raw)
To: git
What's cooking in git.git (Jan 2010, #03; Sun, 10)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo
* mm/config-path (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state
* bg/maint-remote-update-default (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set
* mm/diag-path-in-treeish (2009-12-07) 1 commit
(merged to 'next' on 2010-01-06 at 6b4201e)
+ Detailed diagnosis when parsing an object name fails.
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
(merged to 'next' on 2010-01-06 at 03e00cd)
+ General --quiet improvements
--------------------------------------------------
[New Topics]
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
- Handle relative paths in submodule .git files
- Test update-index for a gitlink to a .git file
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
- ls-files: fix overeager pathspec optimization
- read_directory(): further split treat_path()
- read_directory_recursive(): refactor handling of a single path into a separate function
- t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-10) 4 commits
- Improve error message when a transport helper was not found
- start_command: detect execvp failures early
- run-command: move wait_or_whine earlier
- start_command: report child process setup errors to the parent's stderr
(this branch uses il/vcs-helper.)
--------------------------------------------------
[Stalled]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
Needs tests.
* mh/rebase-fixup (2009-12-07) 2 commits
(merged to 'next' on 2010-01-06 at c4779a7)
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Expecting further improvements to skip opening the editor if a pick is
followed only by "fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
Blocked by the above.
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
--------------------------------------------------
[Will graduate after a bit more cooking]
* nd/sparse (2010-01-04) 25 commits
(merged to 'next' on 2010-01-10 at fa73d6e)
+ t7002: test for not using external grep on skip-worktree paths
+ t7002: set test prerequisite "external-grep" if supported
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
I've queued the (close to) original tests for external grep, but as a belt
and suspender measure Nguyễn may also want to add the whitebox test
in the review thread.
* cc/reset-more (2010-01-08) 8 commits
(merged to 'next' on 2010-01-10 at 84730de)
+ t7111: check that reset options work as described in the tables
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* il/vcs-helper (2010-01-09) 9 commits
(merged to 'next' on 2010-01-10 at 11e448e)
+ Reset possible helper before reusing remote structure
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
(this branch is used by js/exec-error-report.)
--------------------------------------------------
[Cooking]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
(merged to 'next' on 2010-01-10 at df14116)
+ checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
(merged to 'next' on 2010-01-10 at f5a5d42)
+ Makefile: consolidate .FORCE-* targets
+ Makefile: learn to generate listings for targets requiring special flags
+ Makefile: use target-specific variable to pass flags to cc
+ Makefile: regenerate assembler listings when asked
* da/difftool (2010-01-09) 6 commits
(merged to 'next' on 2010-01-10 at 749c870)
+ git-diff.txt: Link to git-difftool
+ difftool: Allow specifying unconfigured commands with --extcmd
+ difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
Hold: Warthog on 2010-01-06, http://article.gmane.org/gmane.comp.version-control.git/136306
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'next' by brave souls is greatly
appreciated (I am using this in my private build).
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
(merged to 'next' on 2010-01-10 at e295b7f)
+ Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
(merged to 'next' on 2010-01-10 at 7479e2a)
+ t4030, t4031: work around bogus MSYS bash path conversion
+ diff: run external diff helper with shell
+ textconv: use shell to run helper
+ editor: use run_command's shell feature
+ run-command: optimize out useless shell calls
+ run-command: convert simple callsites to use_shell
+ t0021: use $SHELL_PATH for the filter script
+ run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* tc/clone-v-progress (2009-12-26) 4 commits
(merged to 'next' on 2010-01-10 at ec2bfd7)
+ clone: use --progress to force progress reporting
+ clone: set transport->verbose when -v/--verbose is used
+ git-clone.txt: reword description of progress behaviour
+ check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
Will wait a bit more before moving it to 'next'. J6t spotted an issue
with "rerere forget" and has a test script.
* jc/checkout-merge-base (2010-01-07) 4 commits
(merged to 'next' on 2010-01-07 at 5229608)
+ rebase -i: teach --onto A...B syntax
+ rebase: fix --onto A...B parsing and add tests
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2010-01-08) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
Rerolled.
* sr/gfi-options (2009-12-04) 7 commits
(merged to 'next' on 2010-01-10 at 8b305fb)
+ fast-import: add (non-)relative-marks feature
+ fast-import: allow for multiple --import-marks= arguments
+ fast-import: test the new option command
+ fast-import: add option command
+ fast-import: add feature command
+ fast-import: put marks reading in its own function
+ fast-import: put option parsing code in separate functions
^ permalink raw reply [relevance 2%]
* "What's cooking" incremental edition
@ 2010-01-10 19:55 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-10 19:55 UTC (permalink / raw)
To: git
This is "git show --ext-diff" output in 'todo' branch (see README.cooking
in the same branch) for today's updates to highlight the updated parts.
-- >8 --
-What's cooking in git.git (Jan 2010, #02; Thu, 07)
+What's cooking in git.git (Jan 2010, #03; Sun, 10)
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
-
-The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
Born topics
[New Topics]
* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
- Handle relative paths in submodule .git files
- Test update-index for a gitlink to a .git file
* jc/ident (2010-01-08) 3 commits
- ident.c: treat $EMAIL as giving user.email identity explicitly
(merged to 'next' on 2010-01-10 at f1f9ded)
+ ident.c: check explicit identity for name and email separately
+ ident.c: remove unused variables
* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
- ls-files: fix overeager pathspec optimization
- read_directory(): further split treat_path()
- read_directory_recursive(): refactor handling of a single path into a separate function
- t3001: test ls-files -o ignored/dir
* js/exec-error-report (2010-01-10) 4 commits
- Improve error message when a transport helper was not found
- start_command: detect execvp failures early
- run-command: move wait_or_whine earlier
- start_command: report child process setup errors to the parent's stderr
(this branch uses il/vcs-helper.)
--------------------------------------------------
Moved from [New Topics] to [Cooking]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- - checkout -m path: fix recreating conflicts
+ (merged to 'next' on 2010-01-10 at df14116)
+ + checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- - Makefile: consolidate .FORCE-* targets
- - Makefile: learn to generate listings for targets requiring special flags
- - Makefile: use target-specific variable to pass flags to cc
- - Makefile: regenerate assembler listings when asked
+ (merged to 'next' on 2010-01-10 at f5a5d42)
+ + Makefile: consolidate .FORCE-* targets
+ + Makefile: learn to generate listings for targets requiring special flags
+ + Makefile: use target-specific variable to pass flags to cc
+ + Makefile: regenerate assembler listings when asked
--------------------------------------------------
Moved from [Will graduate after a bit more cooking] to [Graduated to "master"]
* tr/http-updates (2009-12-28) 4 commits
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
* jk/push-to-delete (2009-12-30) 1 commit
* mm/config-path (2009-12-30) 1 commit
* pm/cvs-environ (2009-12-30) 1 commit
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
* bg/maint-remote-update-default (2009-12-31) 1 commit
--------------------------------------------------
Moved from [Cooking] to [Will graduate after a bit more cooking]
* cc/reset-more (2010-01-08) 8 commits
- - t7111: check that reset options work as described in the tables
+ (merged to 'next' on 2010-01-10 at 84730de)
+ + t7111: check that reset options work as described in the tables
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
-* il/vcs-helper (2009-12-09) 8 commits
+* il/vcs-helper (2010-01-09) 9 commits
+ (merged to 'next' on 2010-01-10 at 11e448e)
+ + Reset possible helper before reusing remote structure
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
+ (this branch is used by js/exec-error-report.)
--------------------------------------------------
Moved from [Cooking] to [Stalled]
* jh/commit-status (2009-12-07) 1 commit
* mh/rebase-fixup (2009-12-07) 2 commits
-Initial round of "fixup" action that is similar to "squash" action in
-"rebase -i" that excludes the commit log message from follow-up commits
-when composing the log message for the updated one. Expected is a further
-improvement to skip opening the editor if a pick is followed only by
-"fixup" and no "squash".
+Expecting further improvements to skip opening the editor if a pick is
+followed only by "fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
+
+Blocked by the above.
* jh/notes (2009-12-07) 11 commits
-http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
+Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
* ap/merge-backend-opts (2008-07-18) 6 commits
--------------------------------------------------
Moved from [Cooking] to [Graduated to "master"]
* mm/diag-path-in-treeish (2009-12-07) 1 commit
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
--------------------------------------------------
Other topics
[Will graduate after a bit more cooking]
* nd/sparse (2010-01-04) 25 commits
- - t7002: test for not using external grep on skip-worktree paths
- - t7002: set test prerequisite "external-grep" if supported
+ (merged to 'next' on 2010-01-10 at fa73d6e)
+ + t7002: test for not using external grep on skip-worktree paths
+ + t7002: set test prerequisite "external-grep" if supported
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
+
+I've queued the (close to) original tests for external grep, but as a belt
+and suspender measure Nguyễn may also want to add the whitebox test
+in the review thread.
[Cooking]
-* da/difftool (2009-12-22) 2 commits
+* da/difftool (2010-01-09) 6 commits
+ (merged to 'next' on 2010-01-10 at 749c870)
+ + git-diff.txt: Link to git-difftool
+ + difftool: Allow specifying unconfigured commands with --extcmd
+ + difftool--helper: Remove use of the GIT_MERGE_TOOL variable
+ + difftool--helper: Update copyright and remove distracting comments
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
-Will merge to 'next', unless I hear objections within a few days.
+Hold: Warthog on 2010-01-06, http://article.gmane.org/gmane.comp.version-control.git/136306
* jc/fix-tree-walk (2009-09-14) 7 commits
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'next' by brave souls is greatly
-appreciated. I am not very happy about the solution myself.
+appreciated (I am using this in my private build).
* jc/branch-d (2009-12-29) 1 commit
- - branch -d: base the "already-merged" safety on the branch it merges with
-
+ (merged to 'next' on 2010-01-10 at 61a14b7)
+ + branch -d: base the "already-merged" safety on the branch it merges with
-http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
-I am tempted to merge this to 'next', but please stop me if people see issues
-in it.
* jc/rerere (2009-12-04) 1 commit
- - Teach --[no-]rerere-autoupdate option to merge, revert and friends
+ (merged to 'next' on 2010-01-10 at e295b7f)
+ + Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
- - t4030, t4031: work around bogus MSYS bash path conversion
- - diff: run external diff helper with shell
- - textconv: use shell to run helper
- - editor: use run_command's shell feature
- - run-command: optimize out useless shell calls
- - run-command: convert simple callsites to use_shell
- - t0021: use $SHELL_PATH for the filter script
- - run-command: add "use shell" option
+ (merged to 'next' on 2010-01-10 at 7479e2a)
+ + t4030, t4031: work around bogus MSYS bash path conversion
+ + diff: run external diff helper with shell
+ + textconv: use shell to run helper
+ + editor: use run_command's shell feature
+ + run-command: optimize out useless shell calls
+ + run-command: convert simple callsites to use_shell
+ + t0021: use $SHELL_PATH for the filter script
+ + run-command: add "use shell" option
* tc/clone-v-progress (2009-12-26) 4 commits
- - clone: use --progress to force progress reporting
- - clone: set transport->verbose when -v/--verbose is used
- - git-clone.txt: reword description of progress behaviour
- - check stderr with isatty() instead of stdout when deciding to show progress
+ (merged to 'next' on 2010-01-10 at ec2bfd7)
+ + clone: use --progress to force progress reporting
+ + clone: set transport->verbose when -v/--verbose is used
+ + git-clone.txt: reword description of progress behaviour
+ + check stderr with isatty() instead of stdout when deciding to show progress
* jc/cache-unmerge (2009-12-25) 9 commits
-Will wait a bit more before moving it to 'next'.
+Will wait a bit more before moving it to 'next'. J6t spotted an issue
+with "rerere forget" and has a test script.
-* tr/http-push-ref-status (2009-12-24) 6 commits
+* tr/http-push-ref-status (2010-01-08) 6 commits
-Peff: $gmane/136169, 136167, 136168
-RC: $gmane/136172
+Rerolled.
* sr/gfi-options (2009-12-04) 7 commits
- - fast-import: add (non-)relative-marks feature
- - fast-import: allow for multiple --import-marks= arguments
- - fast-import: test the new option command
- - fast-import: add option command
- - fast-import: add feature command
- - fast-import: put marks reading in its own function
- - fast-import: put option parsing code in separate functions
-
-http://thread.gmane.org/gmane.comp.version-control.git/134540
-
+ (merged to 'next' on 2010-01-10 at 8b305fb)
+ + fast-import: add (non-)relative-marks feature
+ + fast-import: allow for multiple --import-marks= arguments
+ + fast-import: test the new option command
+ + fast-import: add option command
+ + fast-import: add feature command
+ + fast-import: put marks reading in its own function
+ + fast-import: put option parsing code in separate functions
-I haven't seen comments on this round, and I am tempted to merge it to
-'next' soonish. Please file complaints before I do so if people have
-objections.
--------------------------------------------------
Gone topics
Was in [Graduated to "master"]
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #02; Thu, 07)
2010-01-06 22:25 2% ` Junio C Hamano
@ 2010-01-08 7:42 2% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-08 7:42 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
[Graduated to "master"]
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
--------------------------------------------------
[New Topics]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- Makefile: consolidate .FORCE-* targets
- Makefile: learn to generate listings for targets requiring special flags
- Makefile: use target-specific variable to pass flags to cc
- Makefile: regenerate assembler listings when asked
--------------------------------------------------
[Will graduate after a bit more cooking]
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2010-01-04) 25 commits
- t7002: test for not using external grep on skip-worktree paths
- t7002: set test prerequisite "external-grep" if supported
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo
* mm/config-path (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state
* bg/maint-remote-update-default (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set
--------------------------------------------------
[Cooking]
* da/difftool (2009-12-22) 2 commits
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
Will merge to 'next', unless I hear objections within a few days.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'next' by brave souls is greatly
appreciated. I am not very happy about the solution myself.
* cc/reset-more (2010-01-08) 8 commits
- t7111: check that reset options work as described in the tables
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
I am tempted to merge this to 'next', but please stop me if people see issues
in it.
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- t0021: use $SHELL_PATH for the filter script
- run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
Will wait a bit more before moving it to 'next'.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
Needs tests.
* jc/checkout-merge-base (2010-01-07) 4 commits
(merged to 'next' on 2010-01-07 at 5229608)
+ rebase -i: teach --onto A...B syntax
+ rebase: fix --onto A...B parsing and add tests
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
Peff: $gmane/136169, 136167, 136168
RC: $gmane/136172
* il/vcs-helper (2009-12-09) 8 commits
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
(merged to 'next' on 2010-01-06 at 6b4201e)
+ Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
(merged to 'next' on 2010-01-06 at c4779a7)
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 1 commit
(merged to 'next' on 2010-01-06 at da4e2f5)
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
(merged to 'next' on 2010-01-06 at 03e00cd)
+ General --quiet improvements
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
http://thread.gmane.org/gmane.comp.version-control.git/134540
I haven't seen comments on this round, and I am tempted to merge it to
'next' soonish. Please file complaints before I do so if people have
objections.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #02 draft; Wed, 06)
2010-01-06 22:22 2% What's cooking in git.git (Jan 2010, #02 draft; Wed, 06) Junio C Hamano
@ 2010-01-06 22:25 2% ` Junio C Hamano
2010-01-08 7:42 2% ` What's cooking in git.git (Jan 2010, #02; Thu, 07) Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2010-01-06 22:25 UTC (permalink / raw)
To: git
This is the current draft of "2010 Jan, issue #2" that the experimental
"incremental update" I sent earlier was made out of, for comparison
purposes.
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
[New Topics]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- Makefile: consolidate .FORCE-* targets
- Makefile: learn to generate listings for targets requiring special flags
- Makefile: use target-specific variable to pass flags to cc
- Makefile: regenerate assembler listings when asked
--------------------------------------------------
[Will graduate after a bit more cooking]
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo
* mm/config-path (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state
* bg/maint-remote-update-default (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set
--------------------------------------------------
[Cooking]
* da/difftool (2009-12-22) 2 commits
(merged to 'next' on 2010-01-06 at e957395)
+ git-difftool: Add '--gui' for selecting a GUI tool
+ t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
Will merge to 'next', unless I hear objections within a few days.
* tc/test-locate-httpd (2010-01-02) 1 commit
(merged to 'next' on 2010-01-06 at 9d913e5)
+ t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'next' by brave souls is greatly
appreciated. I am not very happy about the solution myself.
* cc/reset-more (2010-01-05) 7 commits
(merged to 'next' on 2010-01-06 at 96639cb)
+ Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
I am tempted to merge this to 'next', but please stop me if people see issues
in it.
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- t0021: use $SHELL_PATH for the filter script
- run-command: add "use shell" option
Shuffled the commits in the topic, following J6t's suggestion in
http://thread.gmane.org/gmane.comp.version-control.git/136128
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
(merged to 'next' on 2010-01-06 at 82736cb)
+ Smart-http tests: Test http-backend without curl or a webserver
+ Smart-http tests: Break test t5560-http-backend into pieces
+ Smart-http tests: Improve coverage in test t5560
+ Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
Will wait a bit more before moving it to 'next'.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
Needs tests.
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
Users of "rebase -i" might want to teach this to the command. Volunteers?
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
Peff: $gmane/136169, 136167, 136168
RC: $gmane/136172
* il/vcs-helper (2009-12-09) 8 commits
(merged to 'next' on 2010-01-06 at 7c79f42)
+ Remove special casing of http, https and ftp
+ Support remote archive from all smart transports
+ Support remote helpers implementing smart transports
+ Support taking over transports
+ Refactor git transport options parsing
+ Pass unknown protocols to external protocol handlers
+ Support mandatory capabilities
+ Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
(merged to 'next' on 2010-01-06 at 6b4201e)
+ Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
(merged to 'next' on 2010-01-06 at c4779a7)
+ Add a command "fixup" to rebase --interactive
+ t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
(merged to 'next' on 2010-01-06 at 91913ca)
+ fixup! rebase -i --autosquash
+ rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
http://thread.gmane.org/gmane.comp.version-control.git/134738
What's the status of the fourth and later patches on this topic? Overall
it looked reasonable, if I recall correctly what I thought when I reviewed
it last time, and I am tempted to merge it to 'next' soonish. Please
file complaints before I do so if people have objections.
http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
(merged to 'next' on 2010-01-06 at 03e00cd)
+ General --quiet improvements
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
http://thread.gmane.org/gmane.comp.version-control.git/134540
I haven't seen comments on this round, and I am tempted to merge it to
'next' soonish. Please file complaints before I do so if people have
objections.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #02 draft; Wed, 06)
@ 2010-01-06 22:22 2% Junio C Hamano
2010-01-06 22:25 2% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2010-01-06 22:22 UTC (permalink / raw)
To: git
I am experimenting with ideas to better manage the periodic "What's
cooking" messages, and here is one of such attempt based on the current
draft of the upcoming "2010 Jan, issue #02".
This is an incremental update (the full version will follow shortly) that
shows the changes since the previous issue, and was generated with a
custom diff driver. One of the things to notice is that the ones that
only moved across sections (e.g. bg/maint-remote-update-default) without
any other changes are shown without the list of commits.
----------------------------------------------------------------
-What's cooking in git.git (Jan 2010, #01; Mon, 04)
+What's cooking in git.git (Jan 2010, #02 draft; Wed, 06)
--------------------------------------------------
Born topics
[New Topics]
* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
- checkout -m path: fix recreating conflicts
* jn/makefile (2010-01-06) 4 commits
- Makefile: consolidate .FORCE-* targets
- Makefile: learn to generate listings for targets requiring special flags
- Makefile: use target-specific variable to pass flags to cc
- Makefile: regenerate assembler listings when asked
--------------------------------------------------
Moved from [New Topics] to [Cooking]
* da/difftool (2009-12-22) 2 commits
- - git-difftool: Add '--gui' for selecting a GUI tool
- - t7800-difftool: Set a bogus tool for use by tests
+ (merged to 'next' on 2010-01-06 at e957395)
+ + git-difftool: Add '--gui' for selecting a GUI tool
+ + t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
+
+Will merge to 'next', unless I hear objections within a few days.
* tc/test-locate-httpd (2010-01-02) 1 commit
- - t/lib-http.sh: Restructure finding of default httpd location
+ (merged to 'next' on 2010-01-06 at 9d913e5)
+ + t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
-Resurrected from "Ejected" category.
+Resurrected from "Ejected" category. This is fix for a tricky codepath
+and testing and improving before it hits 'next' by brave souls is greatly
+appreciated. I am not very happy about the solution myself.
--------------------------------------------------
Moved from [Cooking] to [Will graduate after a bit more cooking]
* bg/maint-remote-update-default (2009-12-31) 1 commit
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
* jk/push-to-delete (2009-12-30) 1 commit
* mm/config-path (2009-12-30) 1 commit
* pm/cvs-environ (2009-12-30) 1 commit
* so/cvsserver-update (2009-12-07) 1 commit
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
* js/filter-branch-prime (2009-12-15) 1 commit
* mg/tag-d-show (2009-12-10) 1 commit
* sb/maint-octopus (2009-12-11) 3 commits
* bg/maint-add-all-doc (2009-12-07) 4 commits
* mv/commit-date (2009-12-03) 2 commits
* mo/bin-wrappers (2009-12-02) 3 commits
* tr/http-updates (2009-12-28) 4 commits
* nd/sparse (2009-12-30) 23 commits
--------------------------------------------------
Other topics
[Cooking]
-* cc/reset-more (2010-01-04) 6 commits
+* cc/reset-more (2010-01-05) 7 commits
+ (merged to 'next' on 2010-01-06 at 96639cb)
+ + Documentation: reset: add some missing tables
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
+
+http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
+I am tempted to merge this to 'next', but please stop me if people see issues
+in it.
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- - t0021: use $SHELL_PATH for the filter script
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
+ - t0021: use $SHELL_PATH for the filter script
- run-command: add "use shell" option
- Xref: news.gmane.org gmane.comp.version-control.git:136128
- * check t0021: drop one to t4030;
- * reorder and move t0021 up, immediately after run-command: optimize
+Shuffled the commits in the topic, following J6t's suggestion in
+http://thread.gmane.org/gmane.comp.version-control.git/136128
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
+
+Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
* tc/smart-http-restrict (2010-01-02) 4 commits
- - Smart-http tests: Test http-backend without curl or a webserver
- - Smart-http tests: Break test t5560-http-backend into pieces
- - Smart-http tests: Improve coverage in test t5560
- - Smart-http: check if repository is OK to export before serving it
+ (merged to 'next' on 2010-01-06 at 82736cb)
+ + Smart-http tests: Test http-backend without curl or a webserver
+ + Smart-http tests: Break test t5560-http-backend into pieces
+ + Smart-http tests: Improve coverage in test t5560
+ + Smart-http: check if repository is OK to export before serving it
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
+
+Will wait a bit more before moving it to 'next'.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
+
+Needs tests.
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
+
+Users of "rebase -i" might want to teach this to the command. Volunteers?
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
+
+Peff: $gmane/136169, 136167, 136168
+RC: $gmane/136172
* il/vcs-helper (2009-12-09) 8 commits
- - Remove special casing of http, https and ftp
- - Support remote archive from all smart transports
- - Support remote helpers implementing smart transports
- - Support taking over transports
- - Refactor git transport options parsing
- - Pass unknown protocols to external protocol handlers
- - Support mandatory capabilities
- - Add remote helper debug mode
+ (merged to 'next' on 2010-01-06 at 7c79f42)
+ + Remove special casing of http, https and ftp
+ + Support remote archive from all smart transports
+ + Support remote helpers implementing smart transports
+ + Support taking over transports
+ + Refactor git transport options parsing
+ + Pass unknown protocols to external protocol handlers
+ + Support mandatory capabilities
+ + Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- - Detailed diagnosis when parsing an object name fails.
+ (merged to 'next' on 2010-01-06 at 6b4201e)
+ + Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- - Add a command "fixup" to rebase --interactive
- - t3404: Use test_commit to set up test repository
+ (merged to 'next' on 2010-01-06 at c4779a7)
+ + Add a command "fixup" to rebase --interactive
+ + t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
* ns/rebase-auto-squash (2009-12-08) 2 commits
- - fixup! rebase -i --autosquash
- - rebase -i --autosquash: auto-squash commits
+ (merged to 'next' on 2010-01-06 at 91913ca)
+ + fixup! rebase -i --autosquash
+ + rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
+
+http://thread.gmane.org/gmane.comp.version-control.git/134738
+
+What's the status of the fourth and later patches on this topic? Overall
+it looked reasonable, if I recall correctly what I thought when I reviewed
+it last time, and I am tempted to merge it to 'next' soonish. Please
+file complaints before I do so if people have objections.
+
+http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- - General --quiet improvements
+ (merged to 'next' on 2010-01-06 at 03e00cd)
+ + General --quiet improvements
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
+
+http://thread.gmane.org/gmane.comp.version-control.git/134540
+
+I haven't seen comments on this round, and I am tempted to merge it to
+'next' soonish. Please file complaints before I do so if people have
+objections.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Jan 2010, #01; Mon, 04)
@ 2010-01-04 8:39 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-04 8:39 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' has been rebuilt on top of the current 'master'.
--------------------------------------------------
[New Topics]
* da/difftool (2009-12-22) 2 commits
- git-difftool: Add '--gui' for selecting a GUI tool
- t7800-difftool: Set a bogus tool for use by tests
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking
* tc/test-locate-httpd (2010-01-02) 1 commit
- t/lib-http.sh: Restructure finding of default httpd location
* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category.
--------------------------------------------------
[Cooking]
* cc/reset-more (2010-01-04) 6 commits
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo
* bg/maint-remote-update-default (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- t0021: use $SHELL_PATH for the filter script
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- run-command: add "use shell" option
* mm/config-path (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything
* so/cvsserver-update (2009-12-07) 1 commit
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
* tc/smart-http-restrict (2010-01-02) 4 commits
- Smart-http tests: Test http-backend without curl or a webserver
- Smart-http tests: Break test t5560-http-backend into pieces
- Smart-http tests: Improve coverage in test t5560
- Smart-http: check if repository is OK to export before serving it
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
* js/filter-branch-prime (2009-12-15) 1 commit
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'
* mg/tag-d-show (2009-12-10) 1 commit
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
* bg/maint-add-all-doc (2009-12-07) 4 commits
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
+ tests: rename duplicate t1009
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #06; Thu, 31)
@ 2010-01-01 0:10 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2010-01-01 0:10 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
The tip of 'next' will soon be rebuilt on top of the current 'master'.
This will be the last "What's cooking" message in year 2009 ;-)
--------------------------------------------------
[New Topics]
* cc/reset-more (2009-12-30) 4 commits
- reset: use "unpack_trees()" directly instead of "git read-tree"
- reset: add a few tests for "git reset --merge"
- Documentation: reset: add some tables to describe the different options
- reset: improve mixed reset error message when in a bare repo
Resurrected from "Ejected" category. Haven't looked at it yet myself,
though...
* bg/maint-remote-update-default (2009-12-31) 1 commit
- Fix "git remote update" with remotes.defalt set
* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
* jc/rerere (2009-12-04) 1 commit
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2009-12-30 at de97679)
+ reset: unbreak hard resets with GIT_WORK_TREE
* jk/push-to-delete (2009-12-30) 1 commit
- builtin-push: add --delete as syntactic sugar for :foo
* jk/run-command-use-shell (2009-12-30) 6 commits
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
- run-command: optimize out useless shell calls
- run-command: convert simple callsites to use_shell
- run-command: add "use shell" option
* mm/config-path (2009-12-30) 1 commit
- builtin-config: add --path option doing ~ and ~user expansion.
* pm/cvs-environ (2009-12-30) 1 commit
- CVS Server: Support reading base and roots from environment
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
- archive: complain about path specs that don't match anything
* so/cvsserver-update (2009-12-07) 1 commit
- cvsserver: make the output of 'update' more compatible with cvs.
* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
- clone: set transport->verbose when -v/--verbose is used
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress
* tc/smart-http-restrict (2009-12-30) 3 commits
- Smart-http tests: Test http-backend without curl or a webserver
- Smart-http tests: Break test t5560-http-backend into pieces
- Smart-http: check if repository is OK to export before serving it
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
- bash completion: factor submodules into dirty state
--------------------------------------------------
[Cooking]
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
* js/filter-branch-prime (2009-12-15) 1 commit
- filter-branch: remove an unnecessary use of 'git read-tree'
* mg/tag-d-show (2009-12-10) 1 commit
- tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
- octopus: remove dead code
- octopus: reenable fast-forward merges
- octopus: make merge process simpler to follow
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2009-12-24 at ff4d1d4)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
* bg/maint-add-all-doc (2009-12-07) 4 commits
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2009-12-29 at c89a730)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2009-12-30 at e143bc9)
+ Remove http.authAny
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2009-12-31 at 442ff22)
+ grep: do not do external grep on skip-worktree entries
(merged to 'next' on 2009-12-24 at 1fa9ff3)
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[Ejected]
* il/exec-error-report (2009-12-30) 2 commits
. Improve transport helper exec failure reporting
. Report exec errors from run-command
Freezes "git log" or anything that uses pager; J6t made quite a many good
suggestions. Expecting more rounds of reroll.
* je/send-email-no-subject (2009-08-05) 1 commit
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong.
* jc/grep-full-tree (2009-11-24) 1 commit
. grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #05; Mon, 28)
@ 2009-12-28 9:57 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-28 9:57 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
* sr/vcs-helper (2009-12-07) 14 commits
(merged to 'next' on 2009-12-07 at 8f041bc)
+ tests: handle NO_PYTHON setting
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-push-safety (2009-02-09) 2 commits
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jk/1.7.0-status (2009-12-11) 16 commits
(merged to 'next' on 2009-12-24 at e9929b3)
+ status/commit: do not suggest "reset HEAD <path>" while merging
+ commit/status: "git add <path>" is not necessarily how to resolve
+ commit/status: check $GIT_DIR/MERGE_HEAD only once
(merged to 'next' on 2009-12-08 at 9b57d84)
+ t7508-status: test all modes with color
+ t7508-status: status --porcelain ignores relative paths setting
(merged to 'next' on 2009-12-07 at 7723acf)
+ status: reduce duplicated setup code
+ status: disable color for porcelain format
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
--------------------------------------------------
[New Topics]
* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
- rerere: refactor rerere logic to make it independent from I/O
- rerere: remove silly 1024-byte line limit
- resolve-undo: teach "update-index --unresolve" to use resolve-undo info
- resolve-undo: "checkout -m path" uses resolve-undo information
- resolve-undo: allow plumbing to clear the information
- resolve-undo: basic tests
- resolve-undo: record resolved conflicts in a new index extension section
- builtin-merge.c: use standard active_cache macros
* js/filter-branch-prime (2009-12-15) 1 commit
- filter-branch: remove an unnecessary use of 'git read-tree'
* mg/tag-d-show (2009-12-10) 1 commit
- tag -d: print sha1 of deleted tag
* sb/maint-octopus (2009-12-11) 3 commits
- octopus: remove dead code
- octopus: reenable fast-forward merges
- octopus: make merge process simpler to follow
* il/exec-error-report (2009-12-24) 2 commits
- Improve transport helper exec failure reporting
- Report exec errors from run-command
--------------------------------------------------
[Cooking]
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2009-12-24 at ff4d1d4)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B
* tr/http-push-ref-status (2009-12-24) 6 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
- t5541-http-push.sh: add tests for non-fast-forward pushes
* bg/maint-add-all-doc (2009-12-07) 4 commits
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
* tr/http-updates (2009-12-01) 3 commits
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* nd/sparse (2009-12-14) 22 commits
(merged to 'next' on 2009-12-24 at 1fa9ff3)
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[Ejected]
* je/send-email-no-subject (2009-08-05) 1 commit
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong.
* jc/grep-full-tree (2009-11-24) 1 commit
. grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
* cc/reset-more (2009-12-08) 6 commits
. Documentation: reset: add some tables to describe the different options
. Documentation: reset: describe new "--keep-local-changes" option
. reset: add test cases for "--keep-local-changes" option
. reset: add option "--keep-local-changes" to "git reset"
. reset: use "unpack_trees()" directly instead of "git read-tree"
. reset: add a few tests for "git reset --merge"
The documentation is much clearer than the previous round in describing
what it does, but I find it a bit unclear in describing what it is _good_
for (iow, scenarios and use cases).
Breaks 'pu' and does not pass test on its own yet.
^ permalink raw reply [relevance 2%]
* Re: [PATCH] octopus: make merge process simpler to follow
2009-12-15 6:49 2% ` [PATCH] " Stephen Boyd
@ 2009-12-15 7:32 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-15 7:32 UTC (permalink / raw)
To: Stephen Boyd; +Cc: git, Junio C Hamano, Johannes Sixt, Jari Aalto
Stephen Boyd <bebarino@gmail.com> writes:
> Its not very easy to understand what heads are being merged given
> the current output of an octopus merge. Fix this by replacing the
> sha1 with the (usually) better description in GITHEAD_<SHA1>.
>
> Suggested-by: Jari Aalto <jari.aalto@cante.net>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> ---
>
> Thanks both. Here's a replacement. Let me know if you want a reroll.
Ah, thanks and sorry for having you do an extra work. I amended the
assignment further like thi,s but haven't got a chance to push the result out...
eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}
^ permalink raw reply [relevance 0%]
* [PATCH] octopus: make merge process simpler to follow
@ 2009-12-15 6:49 2% ` Stephen Boyd
2009-12-15 7:32 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Stephen Boyd @ 2009-12-15 6:49 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Sixt, Jari Aalto
Its not very easy to understand what heads are being merged given
the current output of an octopus merge. Fix this by replacing the
sha1 with the (usually) better description in GITHEAD_<SHA1>.
Suggested-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
Thanks both. Here's a replacement. Let me know if you want a reroll.
git-merge-octopus.sh | 11 +++++++----
t/t7602-merge-octopus-many.sh | 33 +++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 825c52c..417e8fb 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -61,12 +61,15 @@ do
exit 2
esac
+ eval pretty_name="\$GITHEAD_$SHA1"
+ : ${pretty_name:=$SHA1}
+
common=$(git merge-base --all $SHA1 $MRC) ||
- die "Unable to find common commit with $SHA1"
+ die "Unable to find common commit with $pretty_name"
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- echo "Already up-to-date with $SHA1"
+ echo "Already up-to-date with $pretty_name"
continue
;;
esac
@@ -81,7 +84,7 @@ do
# tree as the intermediate result of the merge.
# We still need to count this as part of the parent set.
- echo "Fast-forwarding to: $SHA1"
+ echo "Fast-forwarding to: $pretty_name"
git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree)
continue
@@ -89,7 +92,7 @@ do
NON_FF_MERGE=1
- echo "Trying simple merge with $SHA1"
+ echo "Trying simple merge with $pretty_name"
git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git write-tree 2>/dev/null)
if test $? -ne 0
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 01e5415..7377033 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -49,4 +49,37 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
done
'
+cat >expected <<\EOF
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c4
+Merge made by octopus.
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ create mode 100644 c4.c
+EOF
+
+test_expect_success 'merge output uses pretty names' '
+ git reset --hard c1 &&
+ git merge c2 c3 c4 >actual &&
+ test_cmp actual expected
+'
+
+cat >expected <<\EOF
+Already up-to-date with c4
+Trying simple merge with c5
+Merge made by octopus.
+ c5.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 c5.c
+EOF
+
+test_expect_success 'merge up-to-date output uses pretty names' '
+ git merge c4 c5 >actual &&
+ test_cmp actual expected
+'
test_done
--
1.6.6.rc2.5.g49666
^ permalink raw reply related [relevance 2%]
* Re: [PATCH 1/3] octopus: make merge process simpler to follow
2009-12-12 0:38 2% ` [PATCH 1/3] octopus: make merge process simpler to follow Stephen Boyd
@ 2009-12-12 8:53 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-12 8:53 UTC (permalink / raw)
To: Stephen Boyd; +Cc: git, Jari Aalto
Stephen Boyd <bebarino@gmail.com> writes:
> Its not very easy to understand what heads are being merged given
> the current output of an octopus merge. Fix this by replacing the
> sha1 with the (usually) better description in GITHEAD_<SHA1>.
>
> Suggested-by: Jari Aalto <jari.aalto@cante.net>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> ---
>
> Maybe this will work? At least it will replace the sha1 with
> whatever is given on the command line.
This shows what was given from the command line instead of the
commit object name. I think it makes sense to not even make this
dependent on any option. Also I don't think anybody misses the
commit object name in the output---after all, that is all internal
to git and is different from what the user gave us anyway (unless
the user did give us the full 40-char object name, in which case
the value of GITHEAD_<SHA1> would be that name, and we will show it,
which is also fine).
No, I haven't applied nor run it yet. The above is purely from my cursory
reading of the code.
Anyway, I'll keep this in my inbox or queue it on 'pu' if I had time.
^ permalink raw reply [relevance 0%]
* [PATCH 1/3] octopus: make merge process simpler to follow
@ 2009-12-12 0:38 2% ` Stephen Boyd
2009-12-12 8:53 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Stephen Boyd @ 2009-12-12 0:38 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Jari Aalto
Its not very easy to understand what heads are being merged given
the current output of an octopus merge. Fix this by replacing the
sha1 with the (usually) better description in GITHEAD_<SHA1>.
Suggested-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
Maybe this will work? At least it will replace the sha1 with
whatever is given on the command line.
git-merge-octopus.sh | 9 +++++----
t/t7602-merge-octopus-many.sh | 33 +++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 825c52c..1c8ee0a 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -61,12 +61,13 @@ do
exit 2
esac
+ pretty_name="$(eval echo \$GITHEAD_$SHA1)"
common=$(git merge-base --all $SHA1 $MRC) ||
- die "Unable to find common commit with $SHA1"
+ die "Unable to find common commit with $pretty_name"
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- echo "Already up-to-date with $SHA1"
+ echo "Already up-to-date with $pretty_name"
continue
;;
esac
@@ -81,7 +82,7 @@ do
# tree as the intermediate result of the merge.
# We still need to count this as part of the parent set.
- echo "Fast-forwarding to: $SHA1"
+ echo "Fast-forwarding to: $pretty_name"
git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree)
continue
@@ -89,7 +90,7 @@ do
NON_FF_MERGE=1
- echo "Trying simple merge with $SHA1"
+ echo "Trying simple merge with $pretty_name"
git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git write-tree 2>/dev/null)
if test $? -ne 0
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 01e5415..7377033 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -49,4 +49,37 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
done
'
+cat >expected <<\EOF
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c4
+Merge made by octopus.
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ create mode 100644 c4.c
+EOF
+
+test_expect_success 'merge output uses pretty names' '
+ git reset --hard c1 &&
+ git merge c2 c3 c4 >actual &&
+ test_cmp actual expected
+'
+
+cat >expected <<\EOF
+Already up-to-date with c4
+Trying simple merge with c5
+Merge made by octopus.
+ c5.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 c5.c
+EOF
+
+test_expect_success 'merge up-to-date output uses pretty names' '
+ git merge c4 c5 >actual &&
+ test_cmp actual expected
+'
test_done
--
1.6.6.rc1.45.g9aadbb
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Dec 2009, #04; Wed, 09)
@ 2009-12-10 7:11 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-10 7:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
As we are supposed to be in pre-release feature freeze, there is nothing
to see here ;-)
--------------------------------------------------
[Graduated to "master"]
* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.
(merged to 'next' on 2009-12-08 at 3c2c08a)
+ add-interactive: fix deletion of non-empty files
Fixes a regression in 1.6.5.3.
* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
(merged to 'next' on 2009-12-03 at 2ced03c)
+ pull: clarify advice for the unconfigured error case
Replaces old 'jn/rfc-pull-rebase-error-message' topic.
--------------------------------------------------
[New Topics]
* cc/reset-more (2009-12-08) 6 commits
- Documentation: reset: add some tables to describe the different options
- Documentation: reset: describe new "--keep-local-changes" option
- reset: add test cases for "--keep-local-changes" option
- reset: add option "--keep-local-changes" to "git reset"
- reset: use "unpack_trees()" directly instead of "git read-tree"
- reset: add a few tests for "git reset --merge"
The documentation is much clearer than the previous round in describing
what it does, but I find it a bit unclear in describing what it is _good_
for (iow, scenarios and use cases).
Breaks 'pu' and does not pass test on its own yet.
* tr/http-push-ref-status (2009-12-08) 3 commits
- transport-helper.c::push_refs(): emit "no refs" error message
- transport.c::transport_push(): make ref status affect return value
- refactor ref status logic for pushing
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
--------------------------------------------------
[Cooking]
* bg/maint-add-all-doc (2009-12-07) 4 commits.
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from all smart transports
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
(this branch uses early parts of sr/vcs-helper.)
Yet another round.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* ns/rebase-auto-squash (2009-12-08) 2 commits
- fixup! rebase -i --autosquash
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
Rerolled and under discussion.
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
Rerolled.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
Rerolled.
* tr/http-updates (2009-12-01) 3 commits
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This was to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens, but I think we should drop it.
Comments?
* sr/vcs-helper (2009-12-07) 14 commits
(merged to 'next' on 2009-12-07 at 8f041bc)
+ tests: handle NO_PYTHON setting
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
(this branch shares commits with il/vcs-helper.)
Should be among the first to graduate after 1.6.6 final.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
Comments?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-12-08) 13 commits.
(merged to 'next' on 2009-12-08 at 9b57d84)
+ t7508-status: test all modes with color
+ t7508-status: status --porcelain ignores relative paths setting
(merged to 'next' on 2009-12-07 at 7723acf)
+ status: reduce duplicated setup code
+ status: disable color for porcelain format
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that has disappeared.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
As I am contemplating of dropping jc/diff-whitespace-prepare, this should
also be dropped as well.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[Haven't been purged from 'pu' yet]
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #03; Tue, 08)
@ 2009-12-08 9:25 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-08 9:25 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[New Topics]
* bg/maint-add-all-doc (2009-12-07) 4 commits.
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files
I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
* il/vcs-helper (2009-12-06) 8 commits
- Remove special casing of http, https and ftp
- Support remote archive from external protocol helpers
- Support remote helpers implementing smart transports
- Support taking over transports
- Refactor git transport options parsing
- Pass unknown protocols to external protocol handlers
- Support mandatory capabilities
- Add remote helper debug mode
(this branch is related to sr/vcs-helper.)
Under active discussion and review; another round expected.
* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status
* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.
(merged to 'next' on 2009-12-08 at 3c2c08a)
+ add-interactive: fix deletion of non-empty files
Fixes a regression in 1.6.5.3.
* mm/diag-path-in-treeish (2009-12-07) 1 commit
- Detailed diagnosis when parsing an object name fails.
* ns/rebase-auto-squash (2009-12-08) 1 commit
- rebase -i --autosquash: auto-squash commits
(this branch uses mh/rebase-fixup.)
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
--------------------------------------------------
[Cooking]
* jh/notes (2009-12-07) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
Rerolled and under discussion.
* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
(merged to 'next' on 2009-12-03 at 2ced03c)
+ pull: clarify advice for the unconfigured error case
Replaces old 'jn/rfc-pull-rebase-error-message' topic.
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* mh/rebase-fixup (2009-12-07) 2 commits
- Add a command "fixup" to rebase --interactive
- t3404: Use test_commit to set up test repository
(this branch is used by ns/rebase-auto-squash.)
Initial round of "fixup" action that is similar to "squash" action in
"rebase -i" that excludes the commit log message from follow-up commits
when composing the log message for the updated one. Expected is a further
improvement to skip opening the editor if a pick is followed only by
"fixup" and no "squash".
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
Rerolled.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
Rerolled.
* tr/http-updates (2009-12-01) 3 commits
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This was to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens, but I think we should drop it.
Comments?
* sr/vcs-helper (2009-12-07) 14 commits
(merged to 'next' on 2009-12-07 at 8f041bc)
+ tests: handle NO_PYTHON setting
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
(this branch is related to il/vcs-helper.)
Should be among the first to graduate after 1.6.6 final.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
Comments?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-12-07) 11 commits.
(merged to 'next' on 2009-12-07 at 7723acf)
+ status: reduce duplicated setup code
+ status: disable color for porcelain format
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
As I am contemplating of dropping jc/diff-whitespace-prepare, this should
also be dropped as well.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #02; Sat, 05)
@ 2009-12-06 8:17 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-06 8:17 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[New Topics]
Note: Ilari's vcs-helper series hasn't been queued yet, as its first round
generated a healthy amount of discussion and he made it clear that the
second round is being prepared, addressing the comments given on the list.
Hopefully trivial coding style issues in the first round will also be
fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis
of the condition) in the second round.
* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.
(merged to 'next' on 2009-12-03 at 2ced03c)
+ pull: clarify advice for the unconfigured error case
Replaces old 'jn/rfc-pull-rebase-error-message' topic.
* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
- General --quiet improvements
* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
* mh/rebase-fixup (2009-12-05) 4 commits
- [squash to Add a command "fix"] Avoid "\(alternatives\|choices\)" in sed script
- Add a command "fix" to rebase --interactive.
- t3404: set a couple more tags in the original repository
- t3404: Better document the original repository layout
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* jh/notes (2009-12-02) 11 commits
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation
Rerolled (waiting for Acks).
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
--------------------------------------------------
[Cooking]
* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
- fast-import: allow for multiple --import-marks= arguments
- fast-import: test the new option command
- fast-import: add option command
- fast-import: add feature command
- fast-import: put marks reading in its own function
- fast-import: put option parsing code in separate functions
Rerolled.
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix to protect it from $IFS
but otherwise seemed good.
* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
Rerolled.
* tr/http-updates (2009-12-01) 3 commits
- Allow curl to rewind the RPC read buffer
- Add an option for using any HTTP authentication scheme, not only basic
- http: maintain curl sessions
There was a discussion on a better structure not to require rewinding in
the first place? I didn't follow it closely...
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This is to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens.
* sr/vcs-helper (2009-12-04) 13 commits
(merged to 'next' on 2009-12-03 at e45b562)
+ builtin-push: don't access freed transport->url
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
Should be among the first to graduate after 1.6.6 final.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-12-05) 9 commits.
(merged to 'next' on 2009-12-05 at 44dcefd)
+ status -s: obey color.status
+ builtin-commit: refactor short-status code into wt-status.c
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[I have been too busy to purge these]
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
. git-pull.sh --rebase: overhaul error handling when no candidates are found
Replaced.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Dec 2009, #01; Tue, 01)
@ 2009-12-01 22:10 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-12-01 22:10 UTC (permalink / raw)
To: git
I am this close to actually tagging 1.6.6-rc1, but I am reasonably sure
that I missed and did not pick up a few important fixes that should go
into it, so here is the current status.
What's cooking in git.git (Dec 2009, #01; Tue, 01)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[Graduated to "master"]
* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.
+ format-patch: add test for parsing of "--"
+ format-patch: fix parsing of "--" on the command line
* bw/diff-color-hunk-header (2009-11-27) 2 commits
(merged to 'next' on 2009-11-29 at c446977)
+ Give the hunk comment its own color
(merged to 'next' on 2009-11-27 at 42ab131)
+ emit_line(): don't emit an empty <SET><RESET> followed by a newline
* jc/maint-am-keep (2009-11-27) 1 commit.
(merged to 'next' on 2009-11-27 at 7663874)
+ Remove dead code from "git am"
* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
+ prepare send-email for smoother change of --chain-reply-to default
(this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
This starts warning about the change to --no-chain-reply-to
in 1.7.0 for smoother transition.
* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- shortlog: respect commit encoding
* fc/send-email-envelope (2009-11-26) 2 commits.
(merged to 'next' on 2009-11-27 at 2d0257d)
+ send-email: automatic envelope sender
+ t9001: test --envelope-sender option of send-email
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
(merged to 'next' on 2009-11-25 at 09d498f)
+ mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Jim Meyering sent a patch to do a subset of what this does; to allow
keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
to also teach "am" to pass the new -b option, but that is independent of
what Jim showed the need in real-world, so I think this can go in as-is.
* jn/gitweb-blame (2009-11-24) 8 commits.
(merged to 'next' on 2009-11-25 at 0a5b649)
+ gitweb.js: fix padLeftStr() and its usage
+ gitweb.js: Harden setting blamed commit info in incremental blame
+ gitweb.js: fix null object exception in initials calculation
+ gitweb: Minify gitweb.js if JSMIN is defined
+ gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
With two more changes to disable this by default to make it
suitable as "new feature with known breakages" for 1.6.6
* em/commit-claim (2009-11-04) 1 commit
(merged to 'next' on 2009-11-23 at b5df6fd)
+ commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
* cc/bisect-doc (2009-11-08) 1 commit
(merged to 'next' on 2009-11-27 at c46d648)
+ Documentation: add "Fighting regressions with git bisect" article
* jc/pretty-lf (2009-10-04) 1 commit.
(merged to 'next' on 2009-11-27 at 73651c4)
+ Pretty-format: %[+-]x to tweak inter-item newlines
--------------------------------------------------
[New Topics]
* ap/merge-backend-opts (2008-07-18) 6 commits
- Document that merge strategies can now take their own options
- Extend merge-subtree tests to test -Xsubtree=dir.
- Make "subtree" part more orthogonal to the rest of merge-recursive.
- Teach git-pull to pass -X<option> to git-merge
- git merge -X<option>
- git-merge-file --ours, --theirs
"git pull" patch needs sq-then-eval fix but otherwise seemed good.
* mo/bin-wrappers (2009-11-29) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Johan waits for an Ack from Shawn on "fast-import" one.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh. We won't have a
proper fix in 1.6.6.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Sverre is working on a re-roll to address comments from Shawn.
--------------------------------------------------
[Cooking]
* tr/http-updates (2009-11-27) 2 commits
- Add an option for using any HTTP authentication scheme, not only basic
- http: maintain curl sessions
It seems that this is still under discussion...
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This is to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens.
* sr/vcs-helper (2009-11-18) 12 commits
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
Should be among the first to graduate after 1.6.6 final.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others
much harder.
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
There were some test glitches reported and at least one test seems to
be broken in the sense that it is not testing what it is trying to.
Fix-up expected.
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-11-27) 7 commits.
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
As the title says.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise but for the output of "diff --git" headers.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #07; Sun, 29)
@ 2009-11-29 10:05 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-29 10:05 UTC (permalink / raw)
To: git
This will be the last update before deciding what should go in 1.6.6-rc1
and describes my current thinking.
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[New Topics]
* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.
- format-patch: add test for parsing of "--"
- format-patch: fix parsing of "--" on the command line
* bw/diff-color-hunk-header (2009-11-27) 2 commits
(merged to 'next' on 2009-11-29 at c446977)
+ Give the hunk comment its own color
(merged to 'next' on 2009-11-27 at 42ab131)
+ emit_line(): don't emit an empty <SET><RESET> followed by a newline
* jc/maint-am-keep (2009-11-27) 1 commit.
(merged to 'next' on 2009-11-27 at 7663874)
+ Remove dead code from "git am"
* tr/http-updates (2009-11-27) 2 commits
- Add an option for using any HTTP authentication scheme, not only basic
- http: maintain curl sessions
* jc/diff-whitespace-prepare (2009-11-28) 2 commits
- diff: flip the default diff.bwoutputonly to true
- diff: optionally allow traditional "-b/-w affects only output" semantics
(this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)
This is to redo the two -b/-w semantic changes to prepare the migration of
existing users before 1.7.0 happens.
* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits
- diff: disable diff.bwoutputonly warning
- diff: flip the diff.bwoutputonly default to false
(this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)
And this is to actually flip the default and eventually remove the warning.
* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit
- prepare send-email for smoother change of --chain-reply-to default
(this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)
Similarly, this is to start warning about the change to --no-chain-reply-to
in 1.7.0 for smoother transition.
* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit
- send-email: make --no-chain-reply-to the default
(this branch uses ns/send-email-no-chain-reply-to.)
And this is to actually flip the default in 1.7.0.
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Johan waits for an Ack from Shawn on "fast-import" one.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Sverre is working on a re-roll to address comments from Shawn.
--------------------------------------------------
[Cooking]
* sr/vcs-helper (2009-11-18) 12 commits
(merged to 'next' on 2009-11-27 at 83268ab)
+ Add Python support library for remote helpers
+ Basic build infrastructure for Python scripts
+ Allow helpers to report in "list" command that the ref is unchanged
+ Fix various memory leaks in transport-helper.c
+ Allow helper to map private ref names into normal names
+ Add support for "import" helper command
+ Allow specifying the remote helper in the url
+ Add a config option for remotes to specify a foreign vcs
+ Allow fetch to modify refs
+ Use a function to determine whether a remote is valid
+ Allow programs to not depend on remotes having urls
+ Fix memory leak in helper method for disconnect
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.
* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- shortlog: respect commit encoding
The fix is a maint material but the patch was against next, so I
back-rebased it myself. I tried to be careful but please double check the
result.
Perhaps merge it to 'master' before 1.6.6-rc1?
* fc/send-email-envelope (2009-11-26) 2 commits.
(merged to 'next' on 2009-11-27 at 2d0257d)
+ send-email: automatic envelope sender
+ t9001: test --envelope-sender option of send-email
Perhaps merge it to 'master' before 1.6.6-rc1?
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
(merged to 'next' on 2009-11-25 at 09d498f)
+ mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Jim Meyering sent a patch to do a subset of what this does; to allow
keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
to also teach "am" to pass the new -b option, but that is independent of
what Jim showed the need in real-world, so I think this can go in as-is.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others much
harder.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jn/gitweb-blame (2009-11-24) 8 commits.
(merged to 'next' on 2009-11-25 at 0a5b649)
+ gitweb.js: fix padLeftStr() and its usage
+ gitweb.js: Harden setting blamed commit info in incremental blame
+ gitweb.js: fix null object exception in initials calculation
+ gitweb: Minify gitweb.js if JSMIN is defined
+ gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with further fixes. As this does not seem to break existing
features, I am inclined to say that we push this out early, as a new
feature with known breakages, to give it wider audience.
* em/commit-claim (2009-11-04) 1 commit
(merged to 'next' on 2009-11-23 at b5df6fd)
+ commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I am not sure if the option name does a good job at explaining it to the
end users, but I think the code and feature is solid.
Perhaps merge it to 'master' before 1.6.6-rc1?
* cc/bisect-doc (2009-11-08) 1 commit
(merged to 'next' on 2009-11-27 at c46d648)
+ Documentation: add "Fighting regressions with git bisect" article
Perhaps merge it to 'master' before 1.6.6-rc1?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jc/pretty-lf (2009-10-04) 1 commit.
(merged to 'next' on 2009-11-27 at 73651c4)
+ Pretty-format: %[+-]x to tweak inter-item newlines
Perhaps merge it to 'master' before 1.6.6-rc1?
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-11-27) 7 commits.
(merged to 'next' on 2009-11-27 at 91691ec)
+ t7508-status.sh: Add tests for status -s
+ status -s: respect the status.relativePaths option
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a
few commits at the tip, as "docs: affects only long format" describes a
limitation that will disappear soon.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change,
and jc/diff-whitespace-prepare topic is meant to ease the transition.
* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
(this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)
Likewise.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[Reverted from 'next']
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #06; Wed, 25)
@ 2009-11-26 1:03 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-26 1:03 UTC (permalink / raw)
To: git
I wanted to do a 1.6.6-rc1 but somehow ended up spending too much time in
mail compose buffer instead of in C-mode today. There are a few topics
that are in "stalled" state that may be worthy of being in 1.6.6.
We should start updating the Release Notes to make the 1.7.0 warning a bit
more visible.
-- >8 --
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* "git status" won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
--------------------------------------------------
[Graduated to "master"]
* bg/fetch-multi (2009-11-10) 9 commits.
(merged to 'next' on 2009-11-21 at 282f464)
+ Re-implement 'git remote update' using 'git fetch'
+ builtin-fetch: add --dry-run option
+ builtin-fetch: add --prune option
+ teach warn_dangling_symref to take a FILE argument
+ remote: refactor some logic into get_stale_heads()
+ Add missing test for 'git remote update --prune'
+ Add the configuration option skipFetchAll
+ Teach the --multiple option to 'git fetch'
+ Teach the --all option to 'git fetch'
* bg/apply-doc (2009-11-22) 4 commits
(merged to 'next' on 2009-11-22 at b42fece)
+ apply: Use the term "working tree" consistently
+ apply: Format all options using back-quotes
+ apply: apply works outside a repository
+ Clarify and correct -z
* cc/replace (2009-11-19) 3 commits
(merged to 'next' on 2009-11-21 at 2aaf84b)
+ Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
+ Documentation: fix typos and spelling in replace documentation
+ replace: use a GIT_NO_REPLACE_OBJECTS env variable
* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
(merged to 'next' on 2009-11-22 at c0f64c2)
+ user-manual: Document that "git merge" doesn't like uncommited changes.
+ merge-recursive: point the user to commit when file would be overwritten.
* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+ git-count-objects: Fix a disk-space under-estimate on Cygwin
* rs/color-escape-has-zero-width (2009-11-23) 1 commit
+ Teach %w() that color escape codes have zero width
* jc/log-stdin (2009-11-23) 5 commits
(merged to 'next' on 2009-11-23 at ea71363)
+ Add trivial tests for --stdin option to log family
(merged to 'next' on 2009-11-21 at c3e2e52)
+ Make --stdin option to "log" family read also pathspecs
+ setup_revisions(): do not call get_pathspec() too early
+ Teach --stdin option to "log" family
+ read_revision_from_stdin(): use strbuf
* mr/gitweb-snapshot (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-21 at e825ad9)
+ gitweb: Smarter snapshot names
+ gitweb: Document current snapshot rules via new tests
+ t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
* rs/work-around-grep-opt-insanity (2009-11-23) 2 commits.
(merged to 'next' on 2009-11-25 at bf972d8)
+ Protect scripted Porcelains from GREP_OPTIONS insanity
+ mergetool--lib: simplify guess_merge_tool()
--------------------------------------------------
[New Topics]
* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits
(merged to 'next' on 2009-11-25 at 8aa62a0)
+ Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
This is a revert of the tip one I merged prematurely to 'next'. The real
fix from Ramsay is already in 'master'.
* jc/grep-full-tree (2009-11-24) 1 commit.
- grep: --full-tree
We probably would want test, doc and a configuration variable to make it
default (or non-default) before we can merge it to 'master'.
* uk/maint-shortlog-encoding (2009-11-25) 1 commit.
- shortlog: respect commit encoding
The fix is a maint material but the patch was against next, so I
back-rebased it myself. I tried to be careful but please double check the
result.
Perhaps merge it to 'master' before 1.6.6-rc1?
--------------------------------------------------
[Stalled]
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* fc/send-email-envelope (2009-11-22) 1 commit.
- t9001: test --envelope-sender option of send-email
The new feature itself looked promising; this is just an unrelated test
patch.
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again, and looking good. Perhaps Daniel has some comments?
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Johan waits for an Ack from Shawn on "fast-import" one.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
I do not think we reached a concensus for solving conflicts between "give
them rope" and "protect users from clearly meaningless combinations". The
author obviously is for the latter (and I am inclined to agree); Dscho
seems to think otherwise.
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Sverre is working on a re-roll to address comments from Shawn.
--------------------------------------------------
[Cooking]
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
(merged to 'next' on 2009-11-25 at 09d498f)
+ mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Jim Meyering sent a patch to do a subset of what this does; to allow
keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need
to also teach "am" to pass the new -b option, but that is independent of
what Jim showed the need in real-world, so I think this can go in as-is.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
I've been using the first one for a while myself but do not see many users
want this (yet); the new feature is not urgent anyway.
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
I do not particularly like a configuration like this that changes the
behaviour of a command in a drastic way---it will make helping others much
harder.
Perhaps merge it to 'master' before 1.6.6-rc1?
* jn/gitweb-blame (2009-11-24) 8 commits.
(merged to 'next' on 2009-11-25 at 0a5b649)
+ gitweb.js: fix padLeftStr() and its usage
+ gitweb.js: Harden setting blamed commit info in incremental blame
+ gitweb.js: fix null object exception in initials calculation
+ gitweb: Minify gitweb.js if JSMIN is defined
+ gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with further fixes. As this does not seem to break existing
features, I am inclined to say that we push this out early, as a new
feature with known breakages, to give it wider audience.
* em/commit-claim (2009-11-04) 1 commit
(merged to 'next' on 2009-11-23 at b5df6fd)
+ commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I am not sure if the option name does a good job at explaining it to the
end users, but I think the code and feature is solid.
Perhaps merge it to 'master' before 1.6.6-rc1?
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Nobody seems to think this should go to Documentation/technical instead,
so unless I hear otherwise, we will have it as-is in 'next' shortly.
Perhaps merge it to 'master' before 1.6.6-rc1?
* nd/sparse (2009-11-25) 20 commits.
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
+ unpack-trees(): ignore worktree check outside checkout area
+ unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ unpack-trees.c: generalize verify_* functions
+ unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ Introduce "sparse checkout"
+ dir.c: export excluded_1() and add_excludes_from_file_1()
+ excluded_1(): support exclude files in index
+ unpack-trees(): carry skip-worktree bit over in merged_entry()
+ Read .gitignore from index if it is skip-worktree
+ Avoid writing to buffer in add_excludes_from_file_1()
+ Teach Git to respect skip-worktree bit (writing part)
+ Teach Git to respect skip-worktree bit (reading part)
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before
1.6.6?
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
. git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. It appears nobody wants to have this, so I dropped it.
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
^ permalink raw reply [relevance 2%]
* Re: Commiting changes onto more than one branch
@ 2009-11-25 16:50 3% ` Jakub Narebski
0 siblings, 0 replies; 200+ results
From: Jakub Narebski @ 2009-11-25 16:50 UTC (permalink / raw)
To: Mike Jarmy; +Cc: git
Mike Jarmy <mjarmy@gmail.com> writes:
> My question is this: How do I manage a checkin for a bugfix that
> affects, say, only branches v3, v4, and v5?
Take a look at "Resolving conflicts/dependencies between topic
branches early" blog post by Junio C Hamano (git maintainer) at
http://gitster.livejournal.com/27297.html
In short the solution is to create separate topic branch for a bugfix,
branching off earliest place where it would be relevant, then merge
this bugfix branch into all development branches you need
(e.g. maint-v3, maint-v4, maint-v5, master).
This means:
$ git checkout -b fix-frobulator--issue-1235 maint-v3
<create commit or series of commits>
$ git checkout maint-v3
$ git merge fix-frobulator--issue-1235
<resolve conflicts if any>
$ git checkout maint-v4
$ git merge fix-frobulator--issue-1235
<resolve conflicts if any>
[...]
--
Jakub Narebski
Poland
ShadeHawk on #git
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Nov 2009, #05; Sun, 22)
@ 2009-11-23 6:16 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-23 6:16 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* "git send-email" won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
* "git diff -w/-b" won't even produce "diff --git" header when all changes
are about whitespaces.
http://thread.gmane.org/gmane.comp.version-control.git/133256
Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of
patches sent today but they didn't arraive before I started today's
integration cycle and are left out from today's tree.
--------------------------------------------------
[Graduated to "master"]
* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.
(merged to 'next' on 2009-11-21 at dba8141)
+ git am/mailinfo: Don't look at in-body headers when rebasing
* rj/maint-t9700 (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-21 at 29e149b)
+ t9700-perl-git.sh: Fix a test failure on Cygwin
* jn/faster-completion-startup (2009-11-17) 1 commit.
+ Speed up bash completion loading
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
+ Update 'git remote update' usage string to match man page.
* tc/format-attribute (2009-11-14) 1 commit
+ Check the format of more printf-type functions
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
(merged to 'next' on 2009-11-16 at 5b5a93f)
+ diffcore-break: save cnt_data for other phases
+ diffcore-break: free filespec data as we go
* bc/grep-i-F (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-17 at a9b138c)
+ grep: Allow case insensitive search of fixed-strings
* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 7ba213d)
+ Expand ~ and ~user in core.excludesfile, commit.template
* pb/maint-use-custom-perl (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 1ee8d46)
+ Make sure $PERL_PATH is defined when the test suite is run.
* th/remote-usage (2009-11-16) 1 commit.
+ git remote: Separate usage strings for subcommands
* mo/maint-crlf-doc (2009-11-14) 1 commit.
(merged to 'next' on 2009-11-17 at abd9133)
+ core.autocrlf documentation: mention the crlf attribute
* rj/cygwin-msvc (2009-11-09) 2 commits.
+ MSVC: Add support for building with NO_MMAP
+ Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* jn/help-everywhere (2009-11-09) 21 commits
(merged to 'next' on 2009-11-17 at 3a2dffe)
+ diff --no-index: make the usage string less scary
+ merge-{recursive,subtree}: use usagef() to print usage
+ Introduce usagef() that takes a printf-style format
+ Let 'git <command> -h' show usage without a git dir
+ Show usage string for 'git http-push -h'
+ Let 'git http-fetch -h' show usage outside any git repository
+ Show usage string for 'git stripspace -h'
+ Show usage string for 'git unpack-file -h'
+ Show usage string for 'git show-index -h'
+ Show usage string for 'git rev-parse -h'
+ Show usage string for 'git merge-one-file -h'
+ Show usage string for 'git mailsplit -h'
+ Show usage string for 'git imap-send -h'
+ Show usage string for 'git get-tar-commit-id -h'
+ Show usage string for 'git fast-import -h'
+ Show usage string for 'git check-ref-format -h'
+ Show usage string for 'git show-ref -h'
+ Show usage string for 'git merge-ours -h'
+ Show usage string for 'git commit-tree -h'
+ Show usage string for 'git cherry -h'
+ Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
(merged to 'next' on 2009-11-17 at cd35125)
+ http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
(merged to 'next' on 2009-11-17 at 72f6c3b)
+ Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
* jn/gitweb-log-history (2009-11-13) 3 commits
(merged to 'next' on 2009-11-17 at d225f7d)
+ gitweb: Make 'history' view (re)use git_log_generic()
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
+ gitweb: Refactor 'log' action generation, adding git_log_body()
* rg/doc-workflow (2009-11-17) 1 commit.
+ Add branch management for releases to gitworkflows
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
(merged to 'next' on 2009-11-17 at c383204)
+ ls-tree: migrate to parse-options
+ t3101: test more ls-tree options
* jl/submodule-add-noname (2009-09-22) 1 commit.
(merged to 'next' on 2009-11-15 at 3a77d01)
+ git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sc/protocol-doc (2009-11-03) 1 commit.
(merged to 'next' on 2009-11-15 at 32d6de8)
+ Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
(merged to 'next' on 2009-11-15 at 79c6a1d)
+ filter-branch: nearest-ancestor rewriting outside subdir filter
+ filter-branch: stop special-casing $filter_subdir argument
* bg/format-patch-doc-update (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-17 at 68b9056)
+ format-patch: Add "--no-stat" as a synonym for "-p"
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Always generate a patch
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
+ Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
* jn/editor-pager (2009-10-30) 9 commits
(merged to 'next' on 2009-11-15 at 7f3e3ae)
+ Provide a build time default-pager setting
+ Provide a build time default-editor setting
+ am -i, git-svn: use "git var GIT_PAGER"
+ add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
+ Teach git var about GIT_PAGER
+ Teach git var about GIT_EDITOR
+ Suppress warnings from "git var -l"
+ Do not use VISUAL editor on dumb terminals
+ Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
(merged to 'next' on 2009-11-15 at e86a8c9)
+ configure: add settings for gitconfig, editor and pager
+ configure: add macro to set arbitrary make variables
* sp/smart-http (2009-11-14) 37 commits
(merged to 'next' on 2009-11-17 at 11067eb)
+ http-backend: Let gcc check the format of more printf-type functions.
+ http-backend: Fix access beyond end of string.
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
--------------------------------------------------
[New Topics]
* bg/apply-doc (2009-11-22) 4 commits
(merged to 'next' on 2009-11-22 at b42fece)
+ apply: Use the term "working tree" consistently
+ apply: Format all options using back-quotes
+ apply: apply works outside a repository
+ Clarify and correct -z
* cc/replace (2009-11-19) 3 commits
(merged to 'next' on 2009-11-21 at 2aaf84b)
+ Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
+ Documentation: fix typos and spelling in replace documentation
+ replace: use a GIT_NO_REPLACE_OBJECTS env variable
* fc/send-email-envelope (2009-11-22) 1 commit.
- t9001: test --envelope-sender option of send-email
The new feature itself looked promising; this is just an unrelated test
patch.
* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
(merged to 'next' on 2009-11-21 at 3375bf4)
+ No diff -b/-w output for all-whitespace changes
* jc/checkout-merge-base (2009-11-20) 2 commits
- "rebase --onto A...B" replays history on the merge base between A and B
- "checkout A...B" switches to the merge base between A and B
* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
(merged to 'next' on 2009-11-22 at c0f64c2)
+ user-manual: Document that "git merge" doesn't like uncommited changes.
+ merge-recursive: point the user to commit when file would be overwritten.
* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
(merged to 'next' on 2009-11-22 at 4ba5880)
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
+ git-count-objects: Fix a disk-space under-estimate on Cygwin
* rs/color-escape-has-zero-width (2009-11-23) 1 commit
- Teach %w() that color escape codes have zero width
* tr/reset-checkout-patch (2009-11-19) 1 commit.
(merged to 'next' on 2009-11-22 at b224950)
+ {checkout,reset} -p: make patch direction configurable
--------------------------------------------------
[Stalled]
* jc/fix-tree-walk (2009-10-22) 8 commits
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong. Sigh...
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* jh/notes (2009-11-20) 10 commits
- Add more testcases to test fast-import of notes
- Rename t9301 to t9350, to make room for more fast-import tests
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
Early part has been lived in 'next' for a while and has graduated. This
is a reroll of the remainder. Is everybody happy with merging this to
'next'? I saw some checkpatch style violations, but didn't find anything
objectionable in the logic.
* jn/gitweb-blame (2009-11-19) 6 commits.
- gitweb.js: fix null object exception in initials calculation
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame, with a few recent fixes.
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
(merged to 'next' on 2009-11-21 at fadaf7b)
+ rebase: refuse to rebase with -s ours
* jc/log-stdin (2009-11-20) 4 commits
(merged to 'next' on 2009-11-21 at c3e2e52)
+ Make --stdin option to "log" family read also pathspecs
+ setup_revisions(): do not call get_pathspec() too early
+ Teach --stdin option to "log" family
+ read_revision_from_stdin(): use strbuf
Still no tests yet but with docs from Peff.
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/fetch-multi (2009-11-10) 9 commits.
(merged to 'next' on 2009-11-21 at 282f464)
+ Re-implement 'git remote update' using 'git fetch'
+ builtin-fetch: add --dry-run option
+ builtin-fetch: add --prune option
+ teach warn_dangling_symref to take a FILE argument
+ remote: refactor some logic into get_stale_heads()
+ Add missing test for 'git remote update --prune'
+ Add the configuration option skipFetchAll
+ Teach the --multiple option to 'git fetch'
+ Teach the --all option to 'git fetch'
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again. Is everybody happy with merging this to 'next'?
* mr/gitweb-snapshot (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-21 at e825ad9)
+ gitweb: Smarter snapshot names
+ gitweb: Document current snapshot rules via new tests
+ t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Soon in 'master'.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
(merged to 'next' on 2009-11-21 at 884bb56)
+ docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #04; Tue, 17)
@ 2009-11-18 7:53 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-18 7:53 UTC (permalink / raw)
To: git
I'd like to tag 1.6.6-rc0 this coming weekend with most topics on 'next'
(and some from 'pu'), so that we can do the final 1.6.6 before the end of
the year.
It is likely that I'll be offline for most of the day tomorrow, even
though it will be my git Wednesday.
-- >8 --
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
I wasn't fully functioning for the past few days, so this round we have
only added new topics and new patches to existing ones, without changing
the status of individual topics very much.
--------------------------------------------------
[Graduated to "master"]
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
(merged to 'next' on 2009-11-06 at d70f646)
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
* js/maint-diff-color-words (2009-10-30) 3 commits.
(merged to 'next' on 2009-11-10 at 5619714)
+ diff --color-words: bit of clean-up
+ diff --color-words -U0: fix the location of hunk headers
+ t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
I do not do p4 nor use difftool, so it's much easier for me to merge this
to 'master' and wait for anybody to scream if there is breakage.
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* rs/pretty-wrap (2009-11-08) 2 commits
(merged to 'next' on 2009-11-08 at 8973fd8)
+ log --format: don't ignore %w() at the start of format string
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
* tz/maint-rpm (2009-11-11) 1 commit.
+ Makefile: Ensure rpm packages can be read by older rpm versions
* np/maint-sideband-favor-status (2009-11-11) 1 commit.
(merged to 'next' on 2009-11-15 at 3ecd874)
+ give priority to progress messages
* sb/tutorial-test (2009-11-06) 4 commits
(merged to 'next' on 2009-11-15 at 5c82651)
+ t1200: prepare for merging with Fast-forward bikeshedding
+ t1200: further modernize test script style
+ t1200: Make documentation and test agree
+ t1200: cleanup and modernize test style
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
--------------------------------------------------
[New Topics]
* jn/faster-completion-startup (2009-11-17) 1 commit.
- Speed up bash completion loading
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
- Update 'git remote update' usage string to match man page.
* tr/maint-merge-ours-clarification (2009-11-15) 3 commits.
- rebase: refuse to rebase with -s ours
(merged to 'next' on 2009-11-17 at 3291125)
+ rebase docs: clarify --merge and --strategy
+ Documentation: clarify 'ours' merge strategy
* tc/format-attribute (2009-11-14) 1 commit
- Check the format of more printf-type functions
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
(merged to 'next' on 2009-11-16 at 5b5a93f)
+ diffcore-break: save cnt_data for other phases
+ diffcore-break: free filespec data as we go
* bc/grep-i-F (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-17 at a9b138c)
+ grep: Allow case insensitive search of fixed-strings
* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 7ba213d)
+ Expand ~ and ~user in core.excludesfile, commit.template
* pb/maint-use-custom-perl (2009-11-17) 1 commit.
(merged to 'next' on 2009-11-17 at 1ee8d46)
+ Make sure $PERL_PATH is defined when the test suite is run.
* th/remote-usage (2009-11-16) 1 commit.
- git remote: Separate usage strings for subcommands
* mo/maint-crlf-doc (2009-11-14) 1 commit.
(merged to 'next' on 2009-11-17 at abd9133)
+ core.autocrlf documentation: mention the crlf attribute
--------------------------------------------------
[Stalled]
* rj/cygwin-msvc (2009-11-09) 3 commits.
- Add explicit Cygwin check to guard WIN32 header inclusion
- MSVC: Add support for building with NO_MMAP
- Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
I think J6t was not happy with the tip one.
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
I somehow thought that the later API part was waiting for updates but
nothing seems to be happening.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Any progress or RFH?
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
Soon in 'master'.
* jn/help-everywhere (2009-11-09) 21 commits
(merged to 'next' on 2009-11-17 at 3a2dffe)
+ diff --no-index: make the usage string less scary
+ merge-{recursive,subtree}: use usagef() to print usage
+ Introduce usagef() that takes a printf-style format
+ Let 'git <command> -h' show usage without a git dir
+ Show usage string for 'git http-push -h'
+ Let 'git http-fetch -h' show usage outside any git repository
+ Show usage string for 'git stripspace -h'
+ Show usage string for 'git unpack-file -h'
+ Show usage string for 'git show-index -h'
+ Show usage string for 'git rev-parse -h'
+ Show usage string for 'git merge-one-file -h'
+ Show usage string for 'git mailsplit -h'
+ Show usage string for 'git imap-send -h'
+ Show usage string for 'git get-tar-commit-id -h'
+ Show usage string for 'git fast-import -h'
+ Show usage string for 'git check-ref-format -h'
+ Show usage string for 'git show-ref -h'
+ Show usage string for 'git merge-ours -h'
+ Show usage string for 'git commit-tree -h'
+ Show usage string for 'git cherry -h'
+ Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
There were unrelated but still worthy fixes, so I reordered some of them;
also the "usage()" change is different from the one that was posted (see
my comment in $gmane/132592).
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
(merged to 'next' on 2009-11-17 at cd35125)
+ http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
(merged to 'next' on 2009-11-17 at 72f6c3b)
+ Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
These two were originally part of the "help-everywhere" topic but
they can stand on their own.
* jc/log-stdin (2009-11-03) 1 commit
- Teach --stdin option to "log" family
This is not signed-off (see $gmane/131971 for list of things you can do to
help advancing this topic).
* jn/gitweb-log-history (2009-11-13) 3 commits
(merged to 'next' on 2009-11-17 at d225f7d)
+ gitweb: Make 'history' view (re)use git_log_generic()
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
+ gitweb: Refactor 'log' action generation, adding git_log_body()
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
I heard this needs at least retitling among other changes?
* rg/doc-workflow (2009-11-17) 4 commits.
- [Further RFC updates from Raman]
- [An RFC fix-up to further reword release section]
- Corrections to release management section in gitworkflows.txt
- Add branch management for releases to gitworkflows
The top three patches are meant to be squashed into the first one.
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
(merged to 'next' on 2009-11-17 at c383204)
+ ls-tree: migrate to parse-options
+ t3101: test more ls-tree options
* jl/submodule-add-noname (2009-09-22) 1 commit.
(merged to 'next' on 2009-11-15 at 3a77d01)
+ git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sc/protocol-doc (2009-11-03) 1 commit.
(merged to 'next' on 2009-11-15 at 32d6de8)
+ Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
(merged to 'next' on 2009-11-15 at 79c6a1d)
+ filter-branch: nearest-ancestor rewriting outside subdir filter
+ filter-branch: stop special-casing $filter_subdir argument
Updated again. Looked sane, except that the option might not be
necessary, but that can be fixed while in 'next'.
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/format-patch-doc-update (2009-11-07) 4 commits.
(merged to 'next' on 2009-11-17 at 68b9056)
+ format-patch: Add "--no-stat" as a synonym for "-p"
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Always generate a patch
Looked sensible, even though this may want to wait for 1.7.0. We'll see.
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic.
* bg/fetch-multi (2009-11-10) 9 commits.
- Re-implement 'git remote update' using 'git fetch'
- builtin-fetch: add --dry-run option
- builtin-fetch: add --prune option
- teach warn_dangling_symref to take a FILE argument
- remote: refactor some logic into get_stale_heads()
- Add missing test for 'git remote update --prune'
- Add the configuration option skipFetchAll
- Teach the --multiple option to 'git fetch'
- Teach the --all option to 'git fetch'
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* jn/editor-pager (2009-10-30) 9 commits
(merged to 'next' on 2009-11-15 at 7f3e3ae)
+ Provide a build time default-pager setting
+ Provide a build time default-editor setting
+ am -i, git-svn: use "git var GIT_PAGER"
+ add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
+ Teach git var about GIT_PAGER
+ Teach git var about GIT_EDITOR
+ Suppress warnings from "git var -l"
+ Do not use VISUAL editor on dumb terminals
+ Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
(merged to 'next' on 2009-11-15 at e86a8c9)
+ configure: add settings for gitconfig, editor and pager
+ configure: add macro to set arbitrary make variables
This will follow jn/editor-pager series.
* sr/vcs-helper (2009-11-18) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to report in "list" command that the ref is unchanged
- Fix various memory leaks in transport-helper.c
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Replaced again.
* mr/gitweb-snapshot (2009-11-07) 4 commits.
- gitweb: Smarter snapshot names
- gitweb: Document current snapshot rules via new tests
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced commits near the tip with recent updates.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* ks/precompute-completion (2009-11-15) 4 commits.
(merged to 'next' on 2009-11-15 at 23cdb96)
+ Revert ks/precompute-completion series
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Reverted out of 'next', to be replaced with jn/faster-completion-startup
topic.
* sp/smart-http (2009-11-14) 37 commits
(merged to 'next' on 2009-11-17 at 11067eb)
+ http-backend: Let gcc check the format of more printf-type functions.
+ http-backend: Fix access beyond end of string.
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #03; Sun, 15)
@ 2009-11-15 10:23 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-15 10:23 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planned changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
I wasn't fully functioning for the past few days, so this round we have
only added new topics and new patches to existing ones, without changing
the status of individual topics very much.
--------------------------------------------------
[Graduated to "master"]
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
(merged to 'next' on 2009-11-08 at 0943296)
+ format-patch: make "-p" suppress diffstat
(this branch is used by bg/format-patch-doc-update.)
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
(merged to 'next' on 2009-10-31 at 0e1ce6b)
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
Prepare ourselves before newer versions of OpenSSL hits more platforms.
* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-06 at 27b86ec)
+ gitweb: Fix blob linenr links in pathinfo mode
* bg/merge-ff-only (2009-10-29) 1 commit
(merged to 'next' on 2009-10-31 at b6b49aa)
+ Teach 'git merge' and 'git pull' the option --ff-only
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
(merged to 'next' on 2009-10-31 at 3a31fcc)
+ ls-files: unbreak "ls-files -i"
* tr/describe-advice (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 8084850)
+ describe: when failing, tell the user about options that work
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
--------------------------------------------------
[New Topics]
* jn/help-everywhere (2009-11-09) 21 commits
- diff --no-index: make the usage string less scary
- merge-{recursive,subtree}: use usagef() to print usage
- Introduce usagef() that takes a printf-style format
- Let 'git <command> -h' show usage without a git dir
- Show usage string for 'git http-push -h'
- Let 'git http-fetch -h' show usage outside any git repository
- Show usage string for 'git stripspace -h'
- Show usage string for 'git unpack-file -h'
- Show usage string for 'git show-index -h'
- Show usage string for 'git rev-parse -h'
- Show usage string for 'git merge-one-file -h'
- Show usage string for 'git mailsplit -h'
- Show usage string for 'git imap-send -h'
- Show usage string for 'git get-tar-commit-id -h'
- Show usage string for 'git fast-import -h'
- Show usage string for 'git check-ref-format -h'
- Show usage string for 'git show-ref -h'
- Show usage string for 'git merge-ours -h'
- Show usage string for 'git commit-tree -h'
- Show usage string for 'git cherry -h'
- Show usage string for 'git grep -h'
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
There were unrelated but still worthy fixes, so I reordered some of them;
also the "usage()" change is different from the one that was posted (see
my comment in $gmane/132592).
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
- http-fetch: add missing initialization of argv0_path
(this branch is used by jn/help-everywhere.)
* jn/remove-fetch--tool (2009-11-09) 1 commit
- Retire fetch--tool helper to contrib/examples
(this branch is used by jn/help-everywhere.)
These two were originally part of the "help-everywhere" topic but
they can stand on their own.
* jc/log-stdin (2009-11-03) 1 commit
- Teach --stdin option to "log" family
This is not signed-off (see $gmane/131971 for list of things you can do to
help advancing this topic).
* jn/gitweb-log-history (2009-11-13) 3 commits
- gitweb: Make 'history' view (re)use git_log_generic()
- gitweb: Refactor common parts of 'log' and 'shortlog' views
- gitweb: Refactor 'log' action generation, adding git_log_body()
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
- git-pull.sh --rebase: overhaul error handling when no candidates are found
* np/maint-sideband-favor-status (2009-11-11) 1 commit.
- give priority to progress messages
This looked obviously correct but I wasn't fully up to speed after being
ill for a few days, so it is queued in 'pu' with everything else.
* rg/doc-workflow (2009-11-14) 2 commits.
- Corrections to release management section in gitworkflows.txt
- Add branch management for releases to gitworkflows
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
- ls-tree: migrate to parse-options
- t3101: test more ls-tree options
* tz/maint-rpm (2009-11-11) 1 commit.
- Makefile: Ensure rpm packages can be read by older rpm versions
--------------------------------------------------
[Stalled]
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
Any objections against merging this to 'next'?
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
I somehow thought that the later API part was waiting for updates but
nothing seems to be happening.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Any progress or RFH?
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
It seemed to be moving again soon, but nothing has happened yet...
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* sc/protocol-doc (2009-11-03) 1 commit.
- Update packfile transfer protocol documentation
* tr/filter-branch (2009-11-10) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
Updated again. Looked sane, except that the option might not be
necessary. But that can be fixed while in 'next', so unless anybody
sees further issues, I'll move this to 'next' soon.
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions, but this needs to be
rethought.
* bg/format-patch-doc-update (2009-11-07) 4 commits
- format-patch: Add "--no-stat" as a synonym for "-p"
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Always generate a patch
Looked sensible, even though this may want to wait for 1.7.0. We'll see
when we merge this to 'next'. I tweaked the --no-stat patch with noneg
bit; please check for sanity.
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic.
* rj/cygwin-msvc (2009-11-09) 3 commits.
- Add explicit Cygwin check to guard WIN32 header inclusion
- MSVC: Add support for building with NO_MMAP
- Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
I think J6t was not happy with the tip one.
* bg/fetch-multi (2009-11-10) 9 commits
- Re-implement 'git remote update' using 'git fetch'
- builtin-fetch: add --dry-run option
- builtin-fetch: add --prune option
- teach warn_dangling_symref to take a FILE argument
- remote: refactor some logic into get_stale_heads()
- Add missing test for 'git remote update --prune'
- Add the configuration option skipFetchAll
- Teach the --multiple option to 'git fetch'
- Teach the --all option to 'git fetch'
This series from Björn Gustavsson contains 4 patches from Jay Soffian as
well. I haven't looked at the code very closely yet.
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
(merged to 'next' on 2009-11-06 at d70f646)
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
Looked Ok.
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
Any comments? Should it go to Documentation/technical instead?
* sb/tutorial-test (2009-11-06) 4 commits
- t1200: prepare for merging with Fast-forward bikeshedding
- t1200: further modernize test script style
- t1200: Make documentation and test agree
- t1200: cleanup and modernize test style
Ready for 'next', I think.
* jn/editor-pager (2009-10-30) 9 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Suppress warnings from "git var -l"
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
* bw/autoconf-more (2009-11-04) 2 commits
- configure: add settings for gitconfig, editor and pager
- configure: add macro to set arbitrary make variables
This will follow jn/editor-pager series.
* js/maint-diff-color-words (2009-10-30) 3 commits.
(merged to 'next' on 2009-11-10 at 5619714)
+ diff --color-words: bit of clean-up
+ diff --color-words -U0: fix the location of hunk headers
+ t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
I do not do p4 nor use difftool, so it's much easier for me to merge this
to 'master' and wait for anybody to scream if there is breakage. I'll do
so, unless I hear objections in a few days.
* sr/vcs-helper (2009-11-06) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to request the path to the .git directory
- Allow helpers to report in "list" command that the ref is unchanged
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Re-rolled series that contains Daniel's and Johan's.
Any comments? Is everybody happy?
* mr/gitweb-snapshot (2009-11-07) 4 commits.
- gitweb: Smarter snapshot names
- gitweb: Document current snapshot rules via new tests
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced commits near the tip with recent updates.
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
(merged to 'next' on 2009-11-15 at db0f967)
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
Soon in 'master'.
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
Soon in 'master'.
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
Soon in 'master'.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-11-08) 2 commits
(merged to 'next' on 2009-11-08 at 8973fd8)
+ log --format: don't ignore %w() at the start of format string
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
Soon in 'master'.
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
Soon in 'master'.
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
Soon in 'master'; carrying this in 'next' for too long is turning out to
be quite painful.
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
I didn't follow the discussion from the past few days closely, but I am
getting an impression that the consensus is we shouldn't precompute, so I
may have to revert this and replace with what's cooking on the list when
it stabilizes.
* sp/smart-http (2009-11-11) 35 commits
(merged to 'next' on 2009-11-15 at 2a326b2)
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
+ t5551-http-fetch: Work around broken Accept header in libcurl
+ t5551-http-fetch: Work around some libcurl versions
+ http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ Git-aware CGI to provide dumb HTTP transport
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
Soon in 'master', unless I hear objections from msys folks or imap-send
users.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
The latest update I didn't look at very closely but I had an impression
that it was touching very generic codepath that would affect non sparse
cases, iow the patch looked very scary (the entire series already is).
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #02; Sun, 08)
@ 2009-11-09 5:18 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-09 5:18 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[New Topics]
* bw/autoconf-more (2009-11-04) 2 commits
- configure: add settings for gitconfig, editor and pager
- configure: add macro to set arbitrary make variables
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions.
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
(merged to 'next' on 2009-11-08 at 0943296)
+ format-patch: make "-p" suppress diffstat
(this branch is used by bg/format-patch-doc-update.)
* bg/format-patch-doc-update (2009-11-07) 3 commits.
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Always generate a patch
(this branch uses jk/maint-format-patch-p-suppress-stat.)
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
(this branch is used by rj/cygwin-msvc.)
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic.
* rj/cygwin-msvc (2009-11-07) 3 commits.
- Add explicit Cygwin check to guard WIN32 header inclusion
- MSVC: Add support for building with NO_MMAP
- Makefile: keep MSVC and Cygwin configuration separate
(this branch uses rj/maint-simplify-cygwin-makefile.)
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
(merged to 'next' on 2009-10-31 at 0e1ce6b)
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
Prepare ourselves before newer versions of OpenSSL hits more platforms.
* bg/fetch-multi (2009-11-08) 4 commits.
- Re-implement 'git remote update' using 'git fetch'
- Add the configure variable skipFetchAll
- Teach the --multiple option to 'git fetch'
- Teach the --all option to 'git fetch'
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
(merged to 'next' on 2009-11-06 at d70f646)
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
* cc/bisect-doc (2009-11-08) 1 commit
- Documentation: add "Fighting regressions with git bisect" article
* jn/add-h-to-all-commands (2009-11-08) 1 commit.
- Show usage string for 'git grep -h'
* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
(merged to 'next' on 2009-11-06 at 27b86ec)
+ gitweb: Fix blob linenr links in pathinfo mode
* sb/tutorial-test (2009-11-06) 4 commits
- t1200: prepare for merging with Fast-forward bikeshedding
- t1200: further modernize test script style
- t1200: Make documentation and test agree
- t1200: cleanup and modernize test style
* pb/gitweb-no-project-list (2009-11-06) 3 commits.
. gitweb: Polish the content tags support
. gitweb: Support for no project list on gitweb front page
. gitweb: Refactor project list routines
I picked these up but didn't queue as Warthog9's comments made certain
amount of sense to me.
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-28) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t had some comments on this.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Seems to be moving again soon.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* bg/merge-ff-only (2009-10-29) 1 commit
(merged to 'next' on 2009-10-31 at b6b49aa)
+ Teach 'git merge' and 'git pull' the option --ff-only
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
(merged to 'next' on 2009-10-31 at 3a31fcc)
+ ls-files: unbreak "ls-files -i"
* jn/editor-pager (2009-10-30) 8 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
* js/maint-diff-color-words (2009-10-30) 3 commits.
- diff --color-words: bit of clean-up
- diff --color-words -U0: fix the location of hunk headers
- t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
* sc/protocol-doc (2009-10-29) 1 commit
- Update packfile transfer protocol documentation
There is the final draft posted, but I haven't picked it up yet.
* sr/vcs-helper (2009-11-06) 12 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to request the path to the .git directory
- Allow helpers to report in "list" command that the ref is unchanged
- Allow helper to map private ref names into normal names
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Re-rolled series that contains Daniel's and Johan's.
* tr/describe-advice (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 8084850)
+ describe: when failing, tell the user about options that work
* mr/gitweb-snapshot (2009-11-07) 4 commits.
- gitweb: Smarter snapshot names
- gitweb: Document current snapshot rules via new tests
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced commits near the tip with recent updates.
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-11-04) 4 commits.
(merged to 'next' on 2009-11-08 at 6220d55)
+ Revert "format-patch -p is now a no-op" series
(merged to 'next' on 2009-10-30 at e34a3db)
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Make implementation and documentation agree
This is now a no-op; jk/maint-format-patch-p-suppress-stat and
bg/format-patch-doc-update topics will replace this.
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-11-08) 2 commits
(merged to 'next' on 2009-11-08 at 8973fd8)
+ log --format: don't ignore %w() at the start of format string
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-11-04) 30 commits
(merged to 'next' on 2009-11-06 at 666837c)
+ http-backend: Test configuration options
+ http-backend: Use http.getanyfile to disable dumb HTTP serving
+ test smart http fetch and push
+ http tests: use /dumb/ URL prefix
+ set httpd port before sourcing lib-httpd
+ t5540-http-push: remove redundant fetches
+ Smart HTTP fetch: gzip requests
+ Smart fetch over HTTP: client side
+ Smart push over HTTP: client side
+ Discover refs via smart HTTP server when available
+ http-backend: more explict LocationMatch
+ http-backend: add example for gitweb on same URL
+ http-backend: use mod_alias instead of mod_rewrite
+ http-backend: reword some documentation
+ http-backend: add GIT_PROJECT_ROOT environment var
+ Smart fetch and push over HTTP: server side
+ Add stateless RPC options to upload-pack, receive-pack
+ Git-aware CGI to provide dumb HTTP transport
+ remote-helpers: return successfully if everything up-to-date
+ Move WebDAV HTTP push under remote-curl
+ remote-helpers: Support custom transport options
+ remote-helpers: Fetch more than one ref in a batch
+ fetch: Allow transport -v -v -v to set verbosity to 3
+ remote-curl: Refactor walker initialization
+ Add multi_ack_detailed capability to fetch-pack/upload-pack
+ Move "get_ack()" back to fetch-pack
+ fetch-pack: Use a strbuf to compose the want list
+ pkt-line: Make packet_read_line easier to debug
+ pkt-line: Add strbuf based functions
+ http-push: fix check condition on http.c::finish_http_pack_request()
v5 plus 3 more fix-up patches, started cooking in 'next'.
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* ne/rev-cache (2009-10-19) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu', so it has been ejected for now.
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
* db/vcs-helper-rest (2009-10-27) 7 commits.
. Fix memory leak in helper method for disconnect
. Allow helpers to report in "list" command that the ref is unchanged
. Add support for "import" helper command
. Add a config option for remotes to specify a foreign vcs
. Allow programs to not depend on remotes having urls
. Allow fetch to modify refs
. Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
* jc/log-stdin (2009-11-03) 1 commit
. Teach --stdin option to "log" family
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Nov 2009, #01; Wed, 04)
@ 2009-11-05 5:41 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-11-05 5:41 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[New Topics]
* bw/autoconf-more (2009-11-04) 2 commits
- configure: add settings for gitconfig, editor and pager
- configure: add macro to set arbitrary make variables
* em/commit-claim (2009-11-04) 1 commit
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
I just picked better bits from both versions.
* jk/maint-format-patch-p-suppress-stat (2009-11-04) 2 commits.
- format-patch: make "-p" suppress diffstat
- Revert "format-patch -p is now a no-op" series
(this branch uses bg/format-patch-p-noop.)
This corrects a mistake made soon after 1.6.0.
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
- Makefile: merge two Cygwin configuration sections into one
This is one of the most obviously correct bit from "Compiling on Cygwin
using MSVC fails" topic I didn't really look at. If J6t is Ok with the
series, I don't mind queueing the whole thing myself.
* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
(merged to 'next' on 2009-10-31 at 0e1ce6b)
+ imap-send.c: fix compiler warnings for OpenSSL 1.0
Prepare ourselves before newer versions of OpenSSL hits more platforms.
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-28) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t had some comments on this.
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu'.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Seems to be moving again soon.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* bg/merge-ff-only (2009-10-29) 1 commit
(merged to 'next' on 2009-10-31 at b6b49aa)
+ Teach 'git merge' and 'git pull' the option --ff-only
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
(merged to 'next' on 2009-10-31 at 3a31fcc)
+ ls-files: unbreak "ls-files -i"
* jn/editor-pager (2009-10-30) 8 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
* js/maint-diff-color-words (2009-10-30) 3 commits.
- diff --color-words: bit of clean-up
- diff --color-words -U0: fix the location of hunk headers
- t4034-diff-words: add a test for word diff without context
Fixes a corner case of running --color-words with -U0.
* sc/difftool-p4merge (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 194b5c5)
+ mergetool--lib: add p4merge as a pre-configured mergetool option
* sc/protocol-doc (2009-10-29) 1 commit
- Update packfile transfer protocol documentation
There is the final draft posted, but I haven't picked it up yet.
* sr/vcs-helper (2009-11-04) 13 commits
- Add Python support library for remote helpers
- Basic build infrastructure for Python scripts
- Allow helpers to request the path to the .git directory
- Allow helpers to report in "list" command that the ref is unchanged
- Honour the refspec when updating refs after import
- Write local refs written by the "import" helper command only once
- Add support for "import" helper command
- Allow specifying the remote helper in the url
- Add a config option for remotes to specify a foreign vcs
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Allow programs to not depend on remotes having urls
- Fix memory leak in helper method for disconnect
Supposed to replace db/vcs-helper-rest. Still does not pass tests in
'pu'.
* tr/describe-advice (2009-10-28) 1 commit
(merged to 'next' on 2009-10-31 at 8084850)
+ describe: when failing, tell the user about options that work
* mr/gitweb-snapshot (2009-10-29) 3 commits.
- gitweb: Smarter snapshot names
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced the tip with Jakub's updates.
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
(merged to 'next' on 2009-11-01 at 1f09ce9)
+ fetch: Speed up fetch of large numbers of refs
+ remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
(merged to 'next' on 2009-10-30 at e34a3db)
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Make implementation and documentation agree
(this branch is used by jk/maint-format-patch-p-suppress-stat.)
Will revert from 'next' by merging Peff's fix.
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-10-17) 1 commit
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* fc/doc-fast-forward (2009-10-24) 1 commit.
(merged to 'next' on 2009-11-01 at faaad90)
+ Use 'fast-forward' all over the place
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-11-04) 30 commits
- http-backend: Test configuration options
- http-backend: Use http.getanyfile to disable dumb HTTP serving
- test smart http fetch and push
- http tests: use /dumb/ URL prefix
- set httpd port before sourcing lib-httpd
- t5540-http-push: remove redundant fetches
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- remote-helpers: return successfully if everything up-to-date
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
- http-push: fix check condition on http.c::finish_http_pack_request()
v5 plus 3 more fix-up patches from today.
* ef/msys-imap (2009-10-22) 9 commits.
(merged to 'next' on 2009-10-31 at 8630603)
+ Windows: use BLK_SHA1 again
+ MSVC: Enable OpenSSL, and translate -lcrypto
+ mingw: enable OpenSSL
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ imap-send: build imap-send on Windows
+ imap-send: fix compilation-error on Windows
+ imap-send: use run-command API for tunneling
+ imap-send: use separate read and write fds
+ imap-send: remove useless uid code
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it, but the "temporarily" turned out to be very loooong. Sigh...
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
(merged to 'next' on 2009-11-01 at 948327a)
+ Add selftests verifying concatenation of multiple notes for the same commit
+ Refactor notes code to concatenate multiple notes annotating the same object
+ Add selftests verifying that we can parse notes trees with various fanouts
+ Teach the notes lookup code to parse notes trees with various fanout schemes
+ Teach notes code to free its internal data structures on request
+ Add '%N'-format for pretty-printing commit notes
+ Add flags to get_commit_notes() to control the format of the note string
+ t3302-notes-index-expensive: Speed up create_repo()
+ fast-import: Add support for importing commit notes
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #06; Fri, 30)
@ 2009-10-31 4:04 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-31 4:04 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
The tests do not pass with three series at the tip of tonight's 'pu' branch.
--------------------------------------------------
[Graduated to "master"]
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
* ja/fetch-doc (2009-10-22) 3 commits.
(merged to 'next' on 2009-10-22 at 8868407)
+ Documentation/merge-options.txt: order options in alphabetical groups
+ Documentation/git-pull.txt: Add subtitles above included option files
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
* tr/maint-roff-quote (2009-10-22) 1 commit.
(merged to 'next' on 2009-10-22 at 14c5631)
+ Quote ' as \(aq in manpages
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-22 at 592fff3)
+ bisect reset: Allow resetting to any commit, not just a branch
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
(merged to 'next' on 2009-10-22 at 90ccac6)
+ info/grafts: allow trailing whitespaces at the end of line
* jn/show-normalized-refs (2009-10-12) 3 commits.
(merged to 'next' on 2009-10-23 at 332aad3)
+ check-ref-format: simplify --print implementation
+ git check-ref-format --print
+ Add tests for git check-ref-format
* jc/checkout-auto-track (2009-10-18) 3 commits
(merged to 'next' on 2009-10-23 at ff7e8f3)
+ git checkout --no-guess
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
+ check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion.
* tr/stash-format (2009-10-19) 5 commits
(merged to 'next' on 2009-10-23 at 6c551c3)
+ stash list: drop the default limit of 10 stashes
+ stash list: use new %g formats instead of sed
+ Introduce new pretty formats %g[sdD] for reflog information
+ reflog-walk: refactor the branch@{num} formatting
+ Refactor pretty_print_commit arguments into a struct
* js/diff-verbose-submodule (2009-10-23) 2 commits.
(merged to 'next' on 2009-10-23 at e479773)
+ add tests for git diff --submodule
+ Add the --submodule option to the diff option family
--------------------------------------------------
[New Topics]
* bg/merge-ff-only (2009-10-29) 1 commit
- Teach 'git merge' and 'git pull' the option --ff-only
Soon in 'next'.
* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
- ls-files: unbreak "ls-files -i"
Soon in 'next'.
* jn/editor-pager (2009-10-30) 8 commits
- Provide a build time default-pager setting
- Provide a build time default-editor setting
- am -i, git-svn: use "git var GIT_PAGER"
- add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
- Teach git var about GIT_PAGER
- Teach git var about GIT_EDITOR
- Do not use VISUAL editor on dumb terminals
- Handle more shell metacharacters in editor names
Does not seem to pass t3404 by itself.
* js/maint-diff-color-words (2009-10-30) 3 commits.
- (pu) cleanup with diff_words_flush()
- diff --color-words -U0: fix the location of hunk headers
- t4034-diff-words: add a test for word diff without context
Replaces mh/maint-diff-color-words. The tip one is my "at least it would
be a bit more readable this way" patch without proper commit log message.
* sc/difftool-p4merge (2009-10-28) 1 commit
- mergetool--lib: add p4merge as a pre-configured mergetool option
Soon in 'next'.
* sc/protocol-doc (2009-10-29) 1 commit
- Update packfile transfer protocol documentation
Expecting replacement.
* sr/vcs-helper (2009-10-29) 19 commits
- .gitignore: add git-remote-cvs
- Refactor git_remote_cvs to a more generic git_remote_helpers
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
- Introduce <vcs>::<url> syntax for remote url
- Fix memory leak in helper method for disconnect
- Allow helpers to report in "list" command that the ref is unchanged
- Factor ref updating out of fetch_with_import
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
Supposed to replace db/vcs-helper-rest and jh/cvs-helper but expecting
replacement. Does not pass selftest yet (e.g. t9801).
* tr/describe-advice (2009-10-28) 1 commit
- describe: when failing, tell the user about options that work
Soon in 'next'.
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-28) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t has some comments on this.
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
The author indicated that there is another round coming. Does not seem to
pass the tests when merged to 'pu'.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Seems to be moving again soon.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* mr/gitweb-snapshot (2009-10-29) 3 commits.
- gitweb: Smarter snapshot names
- t/gitweb-lib.sh: Split gitweb output into headers and body
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Replaced the tip with Jakub's updates.
* jp/dirty-describe (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-30 at 19c7fc7)
+ Teach "git describe" --dirty option
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
- fetch: Speed up fetch of large numbers of refs
- remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
(merged to 'next' on 2009-10-30 at e34a3db)
+ format-patch documentation: Fix formatting
+ format-patch documentation: Remove diff options that are not useful
+ format-patch: Make implementation and documentation agree
* jk/gitignore-anchored (2009-10-26) 1 commit
(merged to 'next' on 2009-10-30 at 9391a93)
+ gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 2bd302f)
+ add-interactive: handle deletion of empty files
* jk/maint-push-config (2009-10-25) 1 commit.
(merged to 'next' on 2009-10-30 at 934e3c5)
+ push: always load default config
* lt/revision-bisect (2009-10-27) 1 commit.
(merged to 'next' on 2009-10-30 at 81ee52b)
+ Add '--bisect' revision machinery argument
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* rs/pretty-wrap (2009-10-17) 1 commit
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* js/log-rewrap (2009-10-18) 3 commits
(merged to 'next' on 2009-10-30 at 403bbfe)
+ Teach --wrap to only indent without wrapping
+ Add strbuf_add_wrapped_text() to utf8.[ch]
+ print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* fc/doc-fast-forward (2009-10-24) 1 commit.
- Use 'fast-forward' all over the place
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-10-30) 28 commits
- test smart http fetch and push
- http tests: use /dumb/ URL prefix
- set httpd port before sourcing lib-httpd
- t5540-http-push: remove redundant fetches
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- remote-helpers: return successfully if everything up-to-date
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
- http-push: fix check condition on http.c::finish_http_pack_request()
v5
* ef/msys-imap (2009-10-22) 9 commits.
- Windows: use BLK_SHA1 again
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
I think Johan indicated that early parts of it is ready for 'next', so I
may do so up to "Add selftests" one.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
* mh/maint-diff-color-words (2009-10-28) 3 commits
. diff: fix the location of hunk headers for "git diff --color-words -U0"
. diff: move the handling of the hunk header after the changed lines
. t4034-diff-words: add a test for word diff without context
Ejected; js/maint-diff-color-words replaces this.
* db/vcs-helper-rest (2009-10-27) 7 commits.
. Fix memory leak in helper method for disconnect
. Allow helpers to report in "list" command that the ref is unchanged
. Add support for "import" helper command
. Add a config option for remotes to specify a foreign vcs
. Allow programs to not depend on remotes having urls
. Allow fetch to modify refs
. Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
Ejected; sr/vcs-helper is supposed to replace these two.
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #05; Wed, 28)
@ 2009-10-28 21:11 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-28 21:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[Graduated to "master"]
* jc/fsck-default-full (2009-10-20) 1 commit
+ fsck: default to "git fsck --full"
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
+ Fix incorrect error check while reading deflated pack data
* jc/receive-pack-auto (2009-10-20) 2 commits.
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
+ gc --auto --quiet: make the notice a bit less verboase
* bg/clone-doc (2009-10-20) 1 commit.
+ git-clone.txt: Fix grammar and formatting
* iv/tar-lzma-xz (2009-10-20) 1 commit.
+ import-tars: Add support for tarballs compressed with lzma, xz
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
+ cvsimport: fix relative argument filenames
* sb/gitweb-link-author (2009-10-15) 1 commit
+ gitweb: linkify author/committer names with search
--------------------------------------------------
[New Topics]
* jp/dirty-describe (2009-10-21) 1 commit.
- Teach "git describe" --dirty option
Soon in 'next'.
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
- fetch: Speed up fetch of large numbers of refs
- remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Make implementation and documentation agree
* jk/gitignore-anchored (2009-10-26) 1 commit
- gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
- add-interactive: handle deletion of empty files
Soon in 'next'.
* jk/maint-push-config (2009-10-25) 1 commit.
- push: always load default config
Soon in 'next'.
* lt/revision-bisect (2009-10-27) 1 commit.
- Add '--bisect' revision machinery argument
* mh/maint-diff-color-words (2009-10-28) 3 commits
- diff: fix the location of hunk headers for "git diff --color-words -U0"
- diff: move the handling of the hunk header after the changed lines
- t4034-diff-words: add a test for word diff without context
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-21) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t already has some comments on this.
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
Jakub says the tip one needs updates.
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
The author indicated that there is another round coming.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
???
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
--------------------------------------------------
[Cooking]
* db/vcs-helper-rest (2009-10-27) 7 commits.
- Fix memory leak in helper method for disconnect
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
Queued a fix-up.
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
This depends on the above.
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
Soon in 'master'.
* ja/fetch-doc (2009-10-22) 3 commits.
(merged to 'next' on 2009-10-22 at 8868407)
+ Documentation/merge-options.txt: order options in alphabetical groups
+ Documentation/git-pull.txt: Add subtitles above included option files
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
Soon in 'master'.
* tr/maint-roff-quote (2009-10-22) 1 commit.
(merged to 'next' on 2009-10-22 at 14c5631)
+ Quote ' as \(aq in manpages
Soon in 'master'.
* rs/pretty-wrap (2009-10-17) 1 commit
- Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2009-10-18) 3 commits
- Teach --wrap to only indent without wrapping
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
Before discarding jc/strbuf-nested-expand, I cherry-picked the tip of it
to this series.
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-22 at 592fff3)
+ bisect reset: Allow resetting to any commit, not just a branch
Soon in 'master'.
* fc/doc-fast-forward (2009-10-24) 1 commit.
- Use 'fast-forward' all over the place
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
(merged to 'next' on 2009-10-22 at 90ccac6)
+ info/grafts: allow trailing whitespaces at the end of line
Soon in 'master'.
* jn/show-normalized-refs (2009-10-12) 3 commits.
(merged to 'next' on 2009-10-23 at 332aad3)
+ check-ref-format: simplify --print implementation
+ git check-ref-format --print
+ Add tests for git check-ref-format
Soon in 'master'.
* jc/checkout-auto-track (2009-10-18) 3 commits
(merged to 'next' on 2009-10-23 at ff7e8f3)
+ git checkout --no-guess
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
+ check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion.
Soon in 'master'.
* tr/stash-format (2009-10-19) 5 commits
(merged to 'next' on 2009-10-23 at 6c551c3)
+ stash list: drop the default limit of 10 stashes
+ stash list: use new %g formats instead of sed
+ Introduce new pretty formats %g[sdD] for reflog information
+ reflog-walk: refactor the branch@{num} formatting
+ Refactor pretty_print_commit arguments into a struct
Soon in 'master'.
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-10-25) 24 commits
- remote-helpers: return successfully if everything up-to-date
- update http tests according to remote-curl capabilities
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
Shawn plans another round of re-roll.
* ef/msys-imap (2009-10-22) 9 commits.
- Windows: use BLK_SHA1 again
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
* js/diff-verbose-submodule (2009-10-23) 2 commits.
(merged to 'next' on 2009-10-23 at e479773)
+ add tests for git diff --submodule
+ Add the --submodule option to the diff option family
Soon in 'master'.
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
I think Johan indicated that early parts of it is ready for 'next', so I
may do so up to "Add selftests" one.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Probably the first three should go to 'master' by now?
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #04; Wed, 21)
@ 2009-10-22 6:52 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-22 6:52 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[Graduated to "master"]
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-14 at 105f997)
+ gitweb: fix esc_param
(this branch is used by sb/gitweb-link-author.)
--------------------------------------------------
[New Topics]
* vl/git-gui (2009-10-16) 1 commit.
- git-gui: adjust the minimum height of diff pane for shorter screen height
Shawn?
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
* ja/fetch-doc (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
Helps 'git-fetch.{1,html}' without helping 'git-pull.{1,html}'.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-21) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this is even necessary, but since I already
wrote it and many people seem to be interested in UI and behaviour
warts,...
Some tests expect the traditional behaviour of silently ignoring --no-commit
upon fast-forward, and tonight's 'pu' does not pass them.
* jc/1.7.0-no-commit-no-ff (2009-10-21) 1 commit.
. git-merge: imply --no-ff when --no-commit is given
This is an alternative patch to the same issue.
* jc/fsck-default-full (2009-10-20) 1 commit
(merged to 'next' on 2009-10-21 at 1375192)
+ fsck: default to "git fsck --full"
Should be safe enough to be in 'master' soon.
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
- Fix incorrect error check while reading deflated pack data
This is the final round from 2009-10-21, not my earlier botched attempts.
* jc/receive-pack-auto (2009-10-20) 2 commits.
(merged to 'next' on 2009-10-21 at fef13ef)
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
+ gc --auto --quiet: make the notice a bit less verboase
* jp/dirty-describe (2009-10-21) 1 commit.
- Teach "git describe" --dirty option
Ack?
* tr/filter-branch (2009-10-21) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
- filter-branch: stop special-casing $filter_subdir argument
J6t already has some comments on this.
* tr/maint-roff-quote (2009-10-21) 2 commits.
- Document GNU_ROFF in Makefile
- Quote ' as \(aq in manpages
The doc may need to be clarified a bit more.
* bg/clone-doc (2009-10-20) 1 commit.
(merged to 'next' on 2009-10-21 at 3016736)
+ git-clone.txt: Fix grammar and formatting
Should be correct enough to be in 'master' soon.
* iv/tar-lzma-xz (2009-10-20) 1 commit.
(merged to 'next' on 2009-10-21 at cb0df8a)
+ import-tars: Add support for tarballs compressed with lzma, xz
Should be safe enough to be in 'master' soon.
* rs/pretty-wrap (2009-10-17) 1 commit
- Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap; is related to jc/strbuf-nested-expand.)
When it comes to design issues to keep unnecessary complexity out, I tend
to trust R辿ne (and Nico) a lot more than I trust myself. Tonight's 'pu'
queues this series instead of my "nested" one.
* sr/blame-incomplete (2009-10-19) 1 commit.
- blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
--------------------------------------------------
[Stalled]
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
I lost track of the discussion around the tip commit. The bottom one may
better go to 'master' regardless.
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5. If people want to replace this with improvements it
would be a good time to do so.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
* jc/strbuf-nested-expand (2009-10-18) 3 commits
. Teach --wrap to only indent without wrapping
. Add %[wrap(width,in1,in2)<<any-string>>%] implementation
. strbuf_nested_expand(): allow expansion to interrupt in the middle
(this branch uses js/log-rewrap; is related to rs/pretty-wrap.)
Ejected from 'pu' to let rs/pretty-wrap in as described above.
--------------------------------------------------
[Cooking]
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
Still unstable? Has an extra test squashed in; tonight's 'pu' does not
pass tests.
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
- bisect reset: Allow resetting to any commit, not just a branch
Soon in 'next'.
* fc/doc-fast-forward (2009-10-11) 1 commit.
- user-manual: use 'fast-forward'
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
- info/grafts: allow trailing whitespaces at the end of line
Soon in 'next'.
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-19 at 77824f2)
+ cvsimport: fix relative argument filenames
Should be safe enough to be in 'master' soon.
* jn/show-normalized-refs (2009-10-12) 3 commits.
- check-ref-format: simplify --print implementation
- git check-ref-format --print
- Add tests for git check-ref-format
This was for helping Porcelains like git-gui to sanely cope with user
input that has redundant // in refnames. Are potential users happy with
the series? I think this is ready for 'next'.
* sb/gitweb-link-author (2009-10-15) 1 commit
- gitweb: linkify author/committer names with search
Soon in 'next'.
* jc/checkout-auto-track (2009-10-18) 3 commits
- git checkout --no-guess
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
- check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion. Is everybody
happy with this kind of new user-friendliness? I think it is safe enough
to be queued to 'next'.
* tr/stash-format (2009-10-19) 5 commits
- stash list: drop the default limit of 10 stashes
- stash list: use new %g formats instead of sed
- Introduce new pretty formats %g[sdD] for reflog information
- reflog-walk: refactor the branch@{num} formatting
- Refactor pretty_print_commit arguments into a struct
Soon in 'next'.
* ks/precompute-completion (2009-10-05) 1 commit.
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Are people happy with this?
* sp/smart-http (2009-10-14) 17 commits
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
What's the doneness of this series?
* ef/msys-imap (2009-10-21) 8 commits.
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
Another re-roll. Waiting for an Ack from MSVC folks but otherwise it is
ready for 'next', I think.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2008-11-10) 2 commits
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by jc/strbuf-nested-expand and rs/pretty-wrap.)
Soon in 'next'; regardless of how wrapping is exposed to --pretty=format,
this code will be used, and it seems to be leak-free and reasonably done.
We _might_ want to cherry-pick the tip of jc/strbuf-nested-expand to this
series, though.
* js/diff-verbose-submodule (2009-10-14) 2 commits.
- add tests for git diff --submodule-summary
- Add the --submodule option to the diff option family
I should retitle and fix some comments in the tip commit (the tests have
already been adjusted to use the real option name), but otherwise I think
this is ready for 'next'.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Rebased so that it does not pull in anything else. Presumably it is ready
for next?
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame. Probably the first three should go to 'master' by now?
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #03; Mon, 19)
@ 2009-10-19 8:05 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-19 8:05 UTC (permalink / raw)
To: git
What's cooking in git.git (Oct 2009, #03; Mon, 19)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
--------------------------------------------------
[Graduated to "master"]
* jp/maint-send-email-fold (2009-10-08) 1 commit.
+ git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
(merged to 'next' on 2009-10-11 at 0ff2e96)
+ git-add--interactive: never skip files included in index
* dk/blame-el (2009-09-29) 1 commit.
+ git-blame.el: Change how blame information is shown.
* jn/gitweb-patch (2009-10-09) 1 commit.
+ gitweb: Do not show 'patch' link for merge commits
* mr/instaweb-cgid (2009-09-26) 1 commit.
(merged to 'next' on 2009-10-11 at 99bcfaf)
+ instaweb: support mod_cgid for apache2
* tf/doc-pt-br (2009-09-23) 1 commit.
+ Documentation: update pt-BR
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
definition is not widely distributed yet (it just hit the development
tree).
* bg/rebase-reword (2009-10-07) 2 commits.
+ rebase-i: fix reword when using a terminal editor
+ Teach 'rebase -i' the command "reword"
* jp/fetch-tag-match (2009-09-17) 1 commit.
+ fetch: Speed up fetch by rewriting find_non_local_tags
* jn/gitweb-show-size (2009-09-07) 1 commit.
+ gitweb: Add 'show-sizes' feature to show blob sizes in tree view
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
(merged to 'next' on 2009-10-11 at 7f34fb3)
+ diff -B: colour whitespace errors
+ diff.c: emit_add_line() takes only the rest of the line
+ diff.c: split emit_line() from the first char and the rest of the line
+ diff.c: shuffling code around
+ diff --whitespace: fix blank lines at end
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
+ diff --color: color blank-at-eof
+ diff --whitespace=warn/error: fix blank-at-eof check
+ diff --whitespace=warn/error: obey blank-at-eof
+ diff.c: the builtin_diff() deals with only two-file comparison
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
+ apply --whitespace=warn/error: diagnose blank at EOF
+ apply.c: split check_whitespace() into two
+ apply --whitespace=fix: detect new blank lines at eof correctly
+ apply --whitespace=fix: fix handling of blank lines at the eof
(this branch is used by jc/maint-blank-at-eof.)
This is a fix for an ancient bug (or inconsistent set of features); the
topic is based on an ancient codebase and is designed to be merged
upwards. jc/maint-blank-at-eof serves that purpose.
--------------------------------------------------
[New Topics]
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
- bisect reset: Allow resetting to any commit, not just a branch
* fc/doc-fast-forward (2009-10-11) 1 commit.
- user-manual: use 'fast-forward'
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-14 at 105f997)
+ gitweb: fix esc_param
(this branch is used by sb/gitweb-link-author.)
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
- info/grafts: allow trailing whitespaces at the end of line
* jc/strbuf-nested-expand (2009-10-18) 5 commits
- Teach --wrap to only indent without wrapping
- Add %[wrap(width,in1,in2)<<any-string>>%] implementation
- strbuf_nested_expand(): allow expansion to interrupt in the middle
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch uses js/log-rewrap.)
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-19 at 77824f2)
+ cvsimport: fix relative argument filenames
* jn/show-normalized-refs (2009-10-12) 3 commits.
- check-ref-format: simplify --print implementation
- git check-ref-format --print
- Add tests for git check-ref-format
* sb/gitweb-link-author (2009-10-14) 1 commit.
- gitweb: linkify author/committer names with search
(this branch uses gb/maint-gitweb-esc-param.)
* jc/checkout-auto-track (2009-10-18) 3 commits
- git checkout --nodwim
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
- check_filename(): make verify_filename() callable without dying
--------------------------------------------------
[Stalled]
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5. If people want to replace this with improvements it
would be a good time to do so.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
(this branch is used by jh/notes.)
Ejected from 'next' as fast-import folks still seem to be discussing with
how to proceed.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
Builds on db/vcs-helper.
--------------------------------------------------
[Cooking]
* tr/stash-format (2009-10-16) 5 commits
. stash list: drop the default limit of 10 stashes
. stash list: use new %g formats instead of sed
. Introduce new pretty formats %g[sdD] for reflog information
. reflog-walk: refactor the branch@{num} formatting
. Refactor pretty_print_commit arguments into a struct
Expecting a re-roll.
* ks/precompute-completion (2009-10-05) 1 commit.
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
* sp/smart-http (2009-10-14) 17 commits
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
- Discover refs via smart HTTP server when available
- Smart fetch and push over HTTP: server side
- Add stateless RPC options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Move WebDAV HTTP push under remote-curl
- remote-helpers: Support custom transport options
- remote-helpers: Fetch more than one ref in a batch
- fetch: Allow transport -v -v -v to set verbosity to 3
- remote-curl: Refactor walker initialization
- Add multi_ack_detailed capability to fetch-pack/upload-pack
- Move "get_ack()" back to fetch-pack
- fetch-pack: Use a strbuf to compose the want list
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
* ef/msys-imap (2009-10-13) 8 commits.
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
Is this good to go yet?
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2008-11-10) 2 commits
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by jc/strbuf-nested-expand.)
* js/diff-verbose-submodule (2009-10-14) 4 commits.
- add tests for git diff --submodule-summary
- fix output for deleted submodules in git diff --submodule-summary
- fix indentation depth for git diff --submodule-summary
- Add the --submodule-summary option to the diff option family
There was an attempted re-roll and it looked very promising with a minor
fix-up, but I ran out of time to pick it up and unilaterally tweaking it.
Waiting for a response.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
+ unpack_callback(): use unpack_failed() consistently
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
(this branch uses sr/gfi-options.)
Is this good for 'next' now?
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* ne/rev-cache (2009-09-07) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
This seems to break at least t6001 when merged to 'pu'.
* jg/log-format-body-indent (2009-09-19) 1 commit.
. git-log --format: Add %B tag with %B(x) option
Ejected from 'pu' as this is merely a short-hand for %[wrap(0,x,x)%b%].
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Oct 2009, #02; Sun, 11)
@ 2009-10-12 3:18 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-12 3:18 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
In 1.7.0, we plan to correct handful of warts in the interfaces everybody
agrees that they were mistakes. The resulting system may not be strictly
backward compatible. Currently planeed changes are:
* refuse push to update the checked out branch in a non-bare repo by
default
Make "git push" into a repository to update the branch that is checked
out fail by default. You can countermand this default by setting a
configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
* refuse push to delete the current branch by default
Make "git push $there :$killed" to delete the branch that is pointed at
by its HEAD fail by default. You can countermand this default by
setting a configuration variable in the receiving repository.
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
* git-send-email won't make deep threads by default
Many people said that by default when sending more than 2 patches the
threading git-send-email makes by default is hard to read, and they
prefer the default be one cover letter and each patch as a direct
follow-up to the cover letter. You can countermand this by setting a
configuration variable.
http://article.gmane.org/gmane.comp.version-control.git/109790
* git-status won't be "git-commit --dry-run" anymore
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
* "git-diff -w --exit-code" will exit success if only differences it
found are whitespace changes that are stripped away from the output.
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
As a post-release ritual, I've rebuilt 'next' on top of 'master'.
--------------------------------------------------
[Graduated to "master"]
* ch/am-header (2009-09-25) 2 commits
(merged to 'next' on 2009-09-25 at f86e197)
+ git-am: force egrep to use correct characters set
+ git-am: fixed patch_format detection according to RFC2822
* ef/msvc-noreturn (2009-09-30) 2 commits
(merged to 'next' on 2009-10-07 at 66137a0)
+ add NORETURN_PTR for function pointers
+ increase portability of NORETURN declarations
jk: This is the latest round and I think should be ready for at least
'next' (maybe even 'master' as it is really about the build and not about
functionality).
* fc/mutt-alias (2009-09-30) 1 commit
(merged to 'next' on 2009-10-07 at df7ac20)
+ send-email: fix mutt regex for grouped aliases
jk: Latest round that addressed comments. Ready for 'next' if not
'master'.
* jk/reflog-date (2009-09-24) 1 commit
(merged to 'next' on 2009-09-29 at 43d444a)
+ improve reflog date/number heuristic
--------------------------------------------------
[New Topics]
* jp/maint-send-email-fold (2009-10-08) 1 commit.
- git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
* ks/precompute-completion (2009-10-05) 1 commit.
- Speedup bash completion loading
* pv/maint-add-p-no-exclude (2009-10-10) 1 commit.
(merged to 'next' on 2009-10-11 at 0ff2e96)
+ git-add--interactive: never skip files included in index
* sp/smart-http (2009-10-08) 4 commits.
- Smart fetch and push over HTTP: server side
- Add smart-http options to upload-pack, receive-pack
- Git-aware CGI to provide dumb HTTP transport
- Document the HTTP transport protocol
--------------------------------------------------
[Stalled]
* sr/gfi-options (2009-09-06) 6 commits.
- fast-import: test the new option command
- fast-import: add option command
- fast-import: test the new feature command
- fast-import: add feature command
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
Ejected from 'next' as fast-import folks still seem to be discussing with
how to proceed.
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
The existing tests cover the positive case (i.e. as long as the user says
"yes" to the "do you really want to send this message that lacks subject",
the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
Builds on db/vcs-helper. There is a re-roll planned.
* ne/rev-cache (2009-09-07) 7 commits.
. support for commit grafts, slight change to general mechanism
. support for path name caching in rev-cache
. full integration of rev-cache into git, completed test suite
. administrative functions for rev-cache, start of integration into git
. support for non-commit object caching in rev-cache
. basic revision cache system, no integration or features
. man page and technical discussion for rev-cache
This seems to break at least t6001 when merged to 'pu'.
--------------------------------------------------
[Cooking]
* dk/blame-el (2009-09-29) 1 commit.
- git-blame.el: Change how blame information is shown.
Soon in 'next'.
* ef/msys-imap (2009-10-09) 8 commits.
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
- imap-send: build imap-send on Windows
- imap-send: fix compilation-error on Windows
- imap-send: use run-command API for tunneling
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
* jn/gitweb-patch (2009-10-09) 1 commit.
- gitweb: Do not show 'patch' link for merge commits
Soon in 'next'
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
* mr/instaweb-cgid (2009-09-26) 1 commit.
(merged to 'next' on 2009-10-11 at 99bcfaf)
+ instaweb: support mod_cgid for apache2
* tf/doc-pt-br (2009-09-23) 1 commit.
- Documentation: update pt-BR
The current AsciiDoc may barf on NOME and SINOPSE, as pt_BR language
definition is not widely distributed yet (it just hit the development
tree). Need to revert these headings (or change the length of the section
underlines to match the length of translated names).
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
I am not happy with this one yet. I am contemplating to introduce a new
syntax "%[magic(param)<anything>%]" to generalize expressions of this and
line wrapping features in an extensible way.
* js/log-rewrap (2008-11-10) 3 commits.
. Add "%w" to pretty formats, which rewraps the commit message
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
... and the first two from this series will be useful to implement an
example magic "wrap", e.g. "%[wrap(i,j,w)%s%+b%]".
* jg/log-format-body-indent (2009-09-19) 1 commit.
- git-log --format: Add %B tag with %B(x) option
I think we should redo this on top of the first two patches from
js/log-rewrap series; %B(x) is just a special case %B(x,x,0), no? If a
magic value 0 (or negative) given to wrap-width does not disable wrapping,
we probably should make it so.
* bg/rebase-reword (2009-10-07) 1 commit.
- Teach 'rebase -i' the command "reword"
Soon in 'next'
* js/diff-verbose-submodule (2009-10-04) 1 commit.
- Add the --submodule-summary option to the diff option family
Dscho sounded like he has some corrections after list comments, but I did
not pick up his interdiff in the middle.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
Dscho started an interesting discussion regarding the larger workflow in
which the "submodule add" is used. I think the patch itself makes sense
but at the same time it probably makes sense to also take the <path> and
infer the <repository> as Dscho suggested, probably in "git submodule
add", not in "git add" proper, at least initially.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh
- unpack_callback(): use unpack_failed() consistently
- unpack-trees: typofix
- diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy. I think the series is Ok for 'next'.
* jp/fetch-tag-match (2009-09-17) 1 commit.
- fetch: Speed up fetch by rewriting find_non_local_tags
I just queued this without reading nor thinking about it very much. I
personally liked my version that had far smaller number of lines changed
(which means I can be fairly certain that it did not introduce any
regression), but perhaps the majorly rewritten logic this patch gives us
may be easier to follow and maintain.
* jc/maint-blank-at-eof (2009-09-15) 0 commits.
(this branch uses jc/maint-1.6.0-blank-at-eof.)
The series does not have a commit of its own but is a preparation for
merging the original jc/1.6.0-maint-blank-at-eof topic to 'maint' and then
'master'
Soon in 'next'
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
- Refactor notes concatenation into a flexible interface for combining notes
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- Notes API: for_each_note(): Traverse the entire notes tree with a callback
- Notes API: get_note(): Return the note annotating the given object
- Notes API: add_note(): Add note objects to the internal notes tree structure
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Add selftests verifying concatenation of multiple notes for the same commit
- Refactor notes code to concatenate multiple notes annotating the same object
- Add selftests verifying that we can parse notes trees with various fanouts
- Teach the notes lookup code to parse notes trees with various fanout schemes
- Teach notes code to free its internal data structures on request
- Add '%N'-format for pretty-printing commit notes
- Add flags to get_commit_notes() to control the format of the note string
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Rerolled and queued.
* jn/gitweb-show-size (2009-09-07) 1 commit.
- gitweb: Add 'show-sizes' feature to show blob sizes in tree view
Soon in 'next'
* jc/maint-1.6.0-blank-at-eof (2009-09-14) 15 commits.
(merged to 'next' on 2009-10-11 at 7f34fb3)
+ diff -B: colour whitespace errors
+ diff.c: emit_add_line() takes only the rest of the line
+ diff.c: split emit_line() from the first char and the rest of the line
+ diff.c: shuffling code around
+ diff --whitespace: fix blank lines at end
+ core.whitespace: split trailing-space into blank-at-{eol,eof}
+ diff --color: color blank-at-eof
+ diff --whitespace=warn/error: fix blank-at-eof check
+ diff --whitespace=warn/error: obey blank-at-eof
+ diff.c: the builtin_diff() deals with only two-file comparison
+ apply --whitespace: warn blank but not necessarily empty lines at EOF
+ apply --whitespace=warn/error: diagnose blank at EOF
+ apply.c: split check_whitespace() into two
+ apply --whitespace=fix: detect new blank lines at eof correctly
+ apply --whitespace=fix: fix handling of blank lines at the eof
(this branch is used by jc/maint-blank-at-eof.)
This is a fix for an ancient bug (or inconsistent set of features); the
topic is based on an ancient codebase and is designed to be merged
upwards. jc/maint-blank-at-eof serves that purpose.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
- gitweb: Create links leading to 'blame_incremental' using JavaScript
(merged to 'next' on 2009-10-11 at 73c4a83)
+ gitweb: Colorize 'blame_incremental' view during processing
+ gitweb: Incremental blame (using JavaScript)
+ gitweb: Add optional "time to generate page" info in footer
Ajax-y blame.
* nd/sparse (2009-08-20) 19 commits.
- sparse checkout: inhibit empty worktree
- Add tests for sparse checkout
- read-tree: add --no-sparse-checkout to disable sparse checkout support
- unpack-trees(): ignore worktree check outside checkout area
- unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
- unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
- unpack-trees.c: generalize verify_* functions
- unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
- Introduce "sparse checkout"
- dir.c: export excluded_1() and add_excludes_from_file_1()
- excluded_1(): support exclude files in index
- unpack-trees(): carry skip-worktree bit over in merged_entry()
- Read .gitignore from index if it is skip-worktree
- Avoid writing to buffer in add_excludes_from_file_1()
- Teach Git to respect skip-worktree bit (writing part)
- Teach Git to respect skip-worktree bit (reading part)
- Introduce "skip-worktree" bit in index, teach Git to get/set this bit
- Add test-index-version
- update-index: refactor mark_valid() in preparation for new options
--------------------------------------------------
[For 1.7.0]
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
+ commit: support alternate status formats
+ status: add --porcelain output format
+ status: refactor format option parsing
+ status: refactor short-mode printing to its own function
(this branch uses jc/1.7.0-status.)
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage
+ git status: not "commit --dry-run" anymore
+ git stat -s: short status output
+ git stat: the beginning of "status that is not a dry-run of commit"
(this branch is used by jk/1.7.0-status.)
With this, "git status" is no longer "git commit --dry-run".
* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
(merged to 'next' on 2009-10-11 at 043acdf)
+ send-email: make --no-chain-reply-to the default
* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
(merged to 'next' on 2009-10-11 at 546c74d)
+ diff.c: fix typoes in comments
+ Make test case number unique
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits.
(merged to 'next' on 2009-10-11 at 81b8128)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
--------------------------------------------------
[I have been too busy to purge these]
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
Maybe some people care about this. I dunno.
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
Maybe some people care about this. I dunno.
* lt/read-directory (2009-05-15) 3 commits.
. Add initial support for pathname conversion to UTF-8
. read_directory(): infrastructure for pathname character set conversion
. Add 'fill_directory()' helper function for directory traversal
* cc/reset-merge (2009-09-16) 4 commits.
. reset: add test cases for "--merge-safe" option
. reset: add option "--merge-safe" to "git reset"
. reset: use "unpack_trees()" directly instead of "git read-tree"
. reset: add a few tests for "git reset --merge"
* cc/sequencer-rebase-i (2009-08-28) 15 commits.
. rebase -i: use "git sequencer--helper --cherry-pick"
. sequencer: add "--cherry-pick" option to "git sequencer--helper"
. sequencer: add "do_commit()" and related functions working on "next_commit"
. pick: libify "pick_help_msg()"
. revert: libify cherry-pick and revert functionnality
. rebase -i: use "git sequencer--helper --fast-forward"
. sequencer: let "git sequencer--helper" callers set "allow_dirty"
. sequencer: add "--fast-forward" option to "git sequencer--helper"
. sequencer: add "do_fast_forward()" to perform a fast forward
. rebase -i: use "git sequencer--helper --reset-hard"
. sequencer: add "--reset-hard" option to "git sequencer--helper"
. sequencer: add "reset_almost_hard()" and related functions
. rebase -i: use "git sequencer--helper --make-patch"
. sequencer: add "make_patch" function to save a patch
. sequencer: add "builtin-sequencer--helper.c"
* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
. Prepare 'traverse_trees()' for D/F conflict lookahead
^ permalink raw reply [relevance 2%]
* [PATCH] Aggressive three-way merge: fix D/F case
@ 2009-10-12 2:53 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-10-12 2:53 UTC (permalink / raw)
To: git
When the ancestor used to have a blob "P", your tree removed it, and the
tree you are merging with also removed it, the agressive three-way cleanly
merges to remove that blob. If the other tree added a new blob "P/Q"
while removing "P", it should also merge cleanly to remove "P" and create
"P/Q" (since neither the ancestor nor your tree could have had it, so it
is a typical "created in one").
The "aggressive" rule is not new anymore. Reword the stale comment.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* This fixes one problem in the 3-way merge with corrected tree/index
entry order the jc/fix-tree-walk topic exposes.
t/t6035-merge-dir-to-symlink.sh | 2 +-
unpack-trees.c | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index b9a280e..d1b2287 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -74,7 +74,7 @@ test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
git tag test2
'
-test_expect_failure 'merge should not have conflicts (resolve)' '
+test_expect_success 'merge should not have conflicts (resolve)' '
git reset --hard &&
git checkout baseline^0 &&
git merge -s resolve test2 &&
diff --git a/unpack-trees.c b/unpack-trees.c
index c424bab..ec12341 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -767,7 +767,8 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
remote = NULL;
}
- /* First, if there's a #16 situation, note that to prevent #13
+ /*
+ * First, if there's a #16 situation, note that to prevent #13
* and #14.
*/
if (!same(remote, head)) {
@@ -781,7 +782,8 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
}
}
- /* We start with cases where the index is allowed to match
+ /*
+ * We start with cases where the index is allowed to match
* something other than the head: #14(ALT) and #2ALT, where it
* is permitted to match the result instead.
*/
@@ -811,12 +813,13 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
if (!head && !remote && any_anc_missing)
return 0;
- /* Under the new "aggressive" rule, we resolve mostly trivial
+ /*
+ * Under the "aggressive" rule, we resolve mostly trivial
* cases that we historically had git-merge-one-file resolve.
*/
if (o->aggressive) {
- int head_deleted = !head && !df_conflict_head;
- int remote_deleted = !remote && !df_conflict_remote;
+ int head_deleted = !head;
+ int remote_deleted = !remote;
struct cache_entry *ce = NULL;
if (index)
--
1.6.5.59.g7e3f2
^ permalink raw reply related [relevance 2%]
* What's cooking in git.git (Aug 2009, #03; Thu, 20)
@ 2009-08-21 2:48 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-08-21 2:48 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
out the planned "push safety" change. 1.7.0 would be a good time to
introduce "justifiable" changes that are not strictly backward compatible.
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
--------------------------------------------------
[New Topics]
* aj/fix-read-tree-from-scratch (2009-08-17) 1 commit
(merged to 'next' on 2009-08-20 at 7a04133)
+ read-tree: Fix regression with creation of a new index file.
* as/maint-graph-interesting-fix (2009-08-18) 1 commit.
- graph API: fix bug in graph_is_interesting()
* jc/1.7.0-status (2009-08-15) 7 commits
- git-status: adjust tests
- git status: not "commit --dry-run" anymore
- git stat -s: short status output
- git stat: pathspec limits, unlike traditional "git status"
- git stat: show traditional status headers and trailers as well
- git stat: honor relative paths setting
- git stat: the beginning
(this branch uses jc/shortstatus.)
* jc/maint-checkout-index-to-prefix (2009-08-16) 1 commit
(merged to 'next' on 2009-08-20 at 2f6aea2)
+ check_path(): allow symlinked directories to checkout-index --prefix
* jc/maint-unpack-objects-strict (2009-08-13) 1 commit.
- Fix "unpack-objects --strict"
* jh/submodule-foreach (2009-08-20) 9 commits
(merged to 'next' on 2009-08-20 at 671bea4)
+ git clone: Add --recursive to automatically checkout (nested) submodules
+ t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
(merged to 'next' on 2009-08-18 at f4a881d)
+ git submodule status: Add --recursive to recurse into nested submodules
+ git submodule update: Introduce --recursive to update nested submodules
+ git submodule foreach: Add --recursive to recurse into nested submodules
+ git submodule foreach: test access to submodule name as '$name'
+ Add selftest for 'git submodule foreach'
+ git submodule: Cleanup usage string and add option parsing to cmd_foreach()
+ git submodule foreach: Provide access to submodule name, as '$name'
* jl/submodule-summary-diff-files (2009-08-15) 2 commits
(merged to 'next' on 2009-08-15 at 165bd8e)
+ Documentaqtion/git-submodule.txt: Typofix
(merged to 'next' on 2009-08-14 at a702e78)
+ git submodule summary: add --files option
* lh/short-decorate (2009-08-15) 1 commit
(merged to 'next' on 2009-08-18 at b8c1d96)
+ git-log: allow --decorate[=short|full]
* oa/stash-na (2009-08-11) 1 commit
(merged to 'next' on 2009-08-14 at 12c2e2b)
+ git stash: Give friendlier errors when there is nothing to apply
* sr/gfi-options (2009-08-13) 3 commits
- fast-import: test the new option command
- fast-import: add option command
- fast-import: put option parsing code in seperate functions
--------------------------------------------------
[Graduated to "master"]
* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits
+ git-am: print fair error message when format detection fails
+ am: allow individual e-mail files as input
It seems that the "not mbox but a single piece of e-mail" format was
something many people relied on. Hopefully this can also be sent
to 'maint'.
* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits
+ Correctly mark cover letters' encodings if they are not pure ASCII
+ Expose the has_non_ascii() function
* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
+ merge: indicate remote tracking branches in merge message
+ merge: fix incorrect merge message for ambiguous tag/branch
+ add tests for merge message headings
* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
+ clean: require double -f options to nuke nested git repository and
work tree
--------------------------------------------------
[Stalled]
* cc/sequencer-rebase-i (2009-08-05) 8 commits.
- rebase -i: use "git sequencer--helper --reset-hard"
- sequencer: add "--reset-hard" option to "git sequencer--helper"
- sequencer: add comments about reset_almost_hard()
- sequencer: add "reset_almost_hard()" and related functions
- rebase -i: use "git sequencer--helper --make-patch"
- sequencer: free memory used in "make_patch" function
- sequencer: add "make_patch" function to save a patch
- sequencer: add "builtin-sequencer--helper.c"
More sequencer updates. I didn't look at the latest round that had a
handful "oops, fix that earlier botch" patches, expecting a cleaner
reroll (which hasn't happened yet).
* pb/tracking (2009-07-16) 7 commits.
. branch.c: if remote is not config'd for branch, don't try delete push config
. branch, checkout: introduce autosetuppush
. move deletion of merge configuration to branch.c
. remote: add per-remote autosetupmerge and autosetuprebase configuration
. introduce a struct tracking_config
. branch: install_branch_config and struct tracking refactoring
. config: allow false and true values for branch.autosetuprebase
Has been ejected from 'pu' for some time, expecting a reroll.
* db/vcs-helper (2009-08-09) 17 commits
- Allow helpers to request marks for fast-import
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- transport-helper_init(): fix a memory leak in error path
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Use a clearer style to issue commands to remote helpers
(merged to 'next' on 2009-08-07 at f3533ba)
+ Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
+ Makefile: do not link three copies of git-remote-* programs
+ Makefile: git-http-fetch does not need expat
(merged to 'next' on 2009-08-06 at 15da79d)
+ http-fetch: Fix Makefile dependancies
+ Add transport native helper executables to .gitignore
(merged to 'next' on 2009-08-05 at 33d491e)
+ git-http-fetch: not a builtin
+ Use an external program to implement fetching with curl
+ Add support for external programs for handling native fetches
(this branch is used by jh/cvs-helper.)
There was a discussion that suggests that the use of colon ':' before vcs
helper name needs to be corrected. Nothing happened since.
* je/send-email-no-subject (2009-08-05) 1 commit
- send-email: confirm on empty mail subjects
This seems to break t9001. Near the tip of 'pu' I have a iffy
workaround.
--------------------------------------------------
[Cooking]
* ld/p4 (2009-07-30) 1 commit
(merged to 'next' on 2009-08-14 at 36d310d)
+ git-p4: stream from perforce to speed up clones
Should graduate to 'master' soon.
* mr/gitweb-xz (2009-08-06) 3 commits
(merged to 'next' on 2009-08-14 at b63b8e6)
+ gitweb: add support for XZ compressed snapshots
+ gitweb: update INSTALL regarding specific snapshot settings
+ gitweb: support to globally disable a snapshot format
Should graduate to 'master' soon.
* jh/cvs-helper (2009-08-18) 7 commits
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package
in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
(this branch uses db/vcs-helper.)
Builds on db/vcs-helper. The testing of Python part seemed to be
still fragile even with the latest fix on one of my boches with an
earlier round already installed, but I didn't look very deeply before
removing the older installation.
* jc/verify-pack-stat (2009-08-07) 1 commit
(merged to 'next' on 2009-08-10 at f80d0e9)
+ verify-pack --stat-only: show histogram without verifying
* lt/block-sha1 (2009-08-17) 4 commits
(merged to 'next' on 2009-08-18 at 67a1ce8)
+ remove ARM and Mozilla SHA1 implementations
+ block-sha1: guard gcc extensions with __GNUC__
+ make sure byte swapping is optimal for git
+ block-sha1: make the size member first in the context struct
Finishing touches ;-) There were a few Solaris portability patches
floated around that I didn't pick up, waiting for them to finalize.
* nd/sparse (2009-08-11) 8 commits
. --sparse for porcelains
. Support sparse checkout in unpack_trees() and read-tree
. unpack-trees.c: generalize verify_* functions
. dir.c: export excluded_1() and add_excludes_from_file_1()
. excluded_1(): support exclude "directories" in index
. Read .gitignore from index if it is assume-unchanged
. Avoid writing to buffer in add_excludes_from_file_1()
(merged to 'next' on 2009-08-20 at ea167d7)
+ Prevent diff machinery from examining assume-unchanged entries on worktree
The first one was an independent fix; the rest will be discarded and
replaced with the "return of no-checkout" series.
* bc/mailsplit-cr-at-eol (2009-08-04) 4 commits
(merged to 'next' on 2009-08-06 at 6bc7c5c)
+ Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
+ builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
+ builtin-mailinfo,builtin-mailsplit: use strbufs
+ strbuf: add new function strbuf_getwholeline()
Will merge.
* gb/apply-ignore-whitespace (2009-08-04) 1 commit
(merged to 'next' on 2009-08-06 at 59e2c86)
+ git apply: option to ignore whitespace differences
Will merge.
* cc/replace (2009-05-27) 14 commits.
(merged to 'next' on 2009-08-02 at b9c4bc0)
+ t6050: check pushing something based on a replaced commit
+ Documentation: add documentation for "git replace"
+ Add git-replace to .gitignore
+ builtin-replace: use "usage_msg_opt" to give better error messages
+ parse-options: add new function "usage_msg_opt"
+ builtin-replace: teach "git replace" to actually replace
+ Add new "git replace" command
+ environment: add global variable to disable replacement
+ mktag: call "check_sha1_signature" with the replacement sha1
+ replace_object: add a test case
+ object: call "check_sha1_signature" with the replacement sha1
+ sha1_file: add a "read_sha1_file_repl" function
+ replace_object: add mechanism to replace objects found in "refs/replace/"
+ refs: add a "for_each_replace_ref" function
Will merge.
* jc/1.7.0-diff-whitespace-only-status (2009-05-23) 2 commits.
(merged to 'next' on 2009-08-02 at 9c08420)
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
For 1.7.0. This changes exit code from "git diff --ignore-whitespace" and
friends when there is no actual output. It is a backward incompatible
change, but we could argue that it is a bugfix.
* jc/1.7.0-push-safety (2009-02-09) 2 commits
(merged to 'next' on 2009-08-02 at 38b82fe)
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via push
For 1.7.0.
* jn/gitweb-blame (2009-08-06) 3 commits
- gitweb: Create links leading to 'blame_incremental' using JavaScript
- gitweb: Incremental blame (WIP)
- gitweb: Add optional "time to generate page" info in footer
* jc/shortstatus (2009-08-15) 11 commits
(merged to 'next' on 2009-08-15 at 7e40766)
+ git commit --dry-run -v: show diff in color when asked
+ Documentation/git-commit.txt: describe --dry-run
(merged to 'next' on 2009-08-12 at 53bda17)
+ wt-status: collect untracked files in a separate "collect" phase
+ Make git_status_config() file scope static to builtin-commit.c
+ wt-status: move wt_status_colors[] into wt_status structure
+ wt-status: move many global settings to wt_status structure
+ commit: --dry-run
(merged to 'next' on 2009-08-06 at fe8cb94)
+ status: show worktree status of conflicted paths separately
+ wt-status.c: rework the way changes to the index and work tree are summarized
+ diff-index: keep the original index intact
+ diff-index: report unmerged new entries
(this branch is used by jc/1.7.0-status.)
Will cook for a bit more and then merge.
* jh/notes (2009-07-29) 8 commits.
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- First draft of notes tree parser with support for fanout subtrees
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
The cvs-helper series depends on this one.
* tr/reset-checkout-patch (2009-08-18) 8 commits.
(merged to 'next' on 2009-08-18 at e465bb3)
+ tests: disable interactive hunk selection tests if perl is not available
(merged to 'next' on 2009-08-16 at 67896c4)
+ DWIM 'git stash save -p' for 'git stash -p'
+ Implement 'git stash save --patch'
+ Implement 'git checkout --patch'
+ Implement 'git reset --patch'
+ builtin-add: refactor the meat of interactive_add()
+ Add a small patch-mode testing library
+ git-apply--interactive: Refactor patch mode code
(this branch uses js/stash-dwim.)
There was a discussion on better DWIMmery to (1) forbid "git stash save
--anything-with-dash" and (2) redirect with any option "git stash --opt"
to "git stash save --opt", to keep it flexible and safe at the same time.
I think it is a sane thing to do.
* js/stash-dwim (2009-07-27) 1 commit.
(merged to 'next' on 2009-08-16 at 67896c4)
+ Make 'git stash -k' a short form for 'git stash save --keep-index'
(this branch is used by tr/reset-checkout-patch.)
* jc/log-tz (2009-03-03) 1 commit.
- Allow --date=local --date=other-format to work as expected
* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
- mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
--------------------------------------------------
[I have been too busy to purge these]
* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
. Fix for a merge where a branch has an F->D transition
. Add a reminder test case for a merge with F/D transition
* jc/merge-convert (2009-01-26) 1 commit.
. git-merge-file: allow converting the results for the work tree
* lt/read-directory (2009-05-15) 3 commits.
. Add initial support for pathname conversion to UTF-8
. read_directory(): infrastructure for pathname character set conversion
. Add 'fill_directory()' helper function for directory traversal
* ne/rev-cache (2009-08-17) 6 commits
. support for path name caching of blobs/trees in rev-cache
. full integration of rev-cache into git's revision walker, completed test suite
. administrative functions for rev-cache, and start of integration into git
. non-commit object support for rev-cache
. bare minimum revision cache system, no integration with git
. revision caching documentation: man page and technical discussion
* ps/blame (2009-03-12) 1 commit.
. blame.c: start libifying the blame infrastructure
^ permalink raw reply [relevance 2%]
* What's cooking in git.git (Aug 2009, #02; Wed, 12)
@ 2009-08-13 2:14 2% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-08-13 2:14 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the branches, but I am still
holding onto them.
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
out the planned "push safety" change. 1.7.0 would be a good time to
introduce "justifiable" changes that are not strictly backward compatible.
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
----------------------------------------------------------------
[New Topics]
* ld/p4 (Thu Jul 30 00:13:46 2009 +0100) 1 commit
- git-p4: stream from perforce to speed up clones
Waiting for Ack/Nack from stakeholders. Probably I should merge this to
'next' soon, keep it there for a week and see if anybody screams, aka
"Nack now or forever hold your peace" ;-).
* mr/gitweb-xz (Thu Aug 6 10:28:25 2009 -0400) 3 commits
- gitweb: add support for XZ compressed snapshots
- gitweb: update INSTALL regarding specific snapshot settings
- gitweb: support to globally disable a snapshot format
This should be safe as long as it does not silently enable itself for
folks who merely updated gitweb to this version without explicitly asking
for the new format (but I do not remember if that is what the patch does).
* jh/cvs-helper (Wed Aug 12 02:13:51 2009 +0200) 4 commits
- Add simple selftests of git-remote-cvs functionality
- Third draft of CVS remote helper program
- Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
Builds on db/vcs-helper. The last round failed its own selftest for me,
but this one seems to be Ok. Documentation/git-remote-cvs.txt needs to be
fixed to build, though.
* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits
+ git-am: print fair error message when format detection fails
+ am: allow individual e-mail files as input
It seems that the "not mbox but a single piece of e-mail" format was
something many people relied on. I'm cooking this in 'next', and
hopefully it can graduate both to 'master' and 'maint'.
* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits
+ Correctly mark cover letters' encodings if they are not pure ASCII
+ Expose the has_non_ascii() function
* jc/verify-pack-stat (Fri Aug 7 15:45:30 2009 -0700) 2 commits
+ verify-pack --stat-only: show histogram without verifying
+ Merge branch 'maint' into jc/verify-pack-stat
* lt/block-sha1 (Wed Aug 12 15:47:55 2009 -0400) 15 commits
+ block-sha1: support for architectures with memory alignment
restrictions
+ block-sha1: split the different "hacks" to be individually
selected
+ block-sha1: move code around
+ block-sha1: improve code on large-register-set machines
+ block-sha1: improved SHA1 hashing
+ block-sha1: perform register rotation using cpp
+ block-sha1: get rid of redundant 'lenW' context
+ block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in
round 3
+ block-sha1: macroize the rounds a bit further
+ block-sha1: re-use the temporary array as we calculate the SHA1
+ block-sha1: make the 'ntohl()' part of the first SHA1 loop
+ block-sha1: minor fixups
+ block-sha1: try to use rol/ror appropriately
+ block-sha1: undo ctx->size change
+ Add new optimized C 'block-sha1' routines
Linus's "written in C, faster than handcrafted asm" SHA-1 implementation
with clean-up and ARM support from Nico.
* nd/sparse (Tue Aug 11 22:44:06 2009 +0700) 8 commits
. --sparse for porcelains
. Support sparse checkout in unpack_trees() and read-tree
. unpack-trees.c: generalize verify_* functions
. dir.c: export excluded_1() and add_excludes_from_file_1()
. excluded_1(): support exclude "directories" in index
. Read .gitignore from index if it is assume-unchanged
. Avoid writing to buffer in add_excludes_from_file_1()
. Prevent diff machinery from examining assume-unchanged entries on
worktree
Privately applied but not yet queued to 'pu', expecting a minor reroll
near the tip.
* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
+ merge: indicate remote tracking branches in merge message
+ merge: fix incorrect merge message for ambiguous tag/branch
+ add tests for merge message headings
----------------------------------------------------------------
[Graduated to "master"]
* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit
- gitweb: parse_commit_text encoding fix
* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit
- merge-recursive: don't segfault while handling rename clashes
* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits
+ run-command.c: squelch a "use before assignment" warning
+ receive-pack: remove unnecessary run_status report
+ run_command: report failure to execute the program, but optionally
don't
+ run_command: encode deadly signal number in the return value
+ run_command: report system call errors instead of returning error
codes
+ run_command: return exit code as positive value
+ MinGW: simplify waitpid() emulation macros
* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
+ grep: Add --max-depth option.
* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits
+ git-checkout: be careful about untracked symlinks
+ lstat_cache: guard against full match of length of 'name'
parameter
+ Demonstrate bugs when a directory is replaced with a symlink
----------------------------------------------------------------
[In 'next']
* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits
+ Allow mailsplit (and hence git-am) to handle mails with CRLF line-
endings
+ builtin-mailsplit.c: remove read_line_with_nul() since it is no
longer used
+ builtin-mailinfo,builtin-mailsplit: use strbufs
+ strbuf: add new function strbuf_getwholeline()
* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit
+ git apply: option to ignore whitespace differences
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
+ t6050: check pushing something based on a replaced commit
+ Documentation: add documentation for "git replace"
+ Add git-replace to .gitignore
+ builtin-replace: use "usage_msg_opt" to give better error messages
+ parse-options: add new function "usage_msg_opt"
+ builtin-replace: teach "git replace" to actually replace
+ Add new "git replace" command
+ environment: add global variable to disable replacement
+ mktag: call "check_sha1_signature" with the replacement sha1
+ replace_object: add a test case
+ object: call "check_sha1_signature" with the replacement sha1
+ sha1_file: add a "read_sha1_file_repl" function
+ replace_object: add mechanism to replace objects found in
"refs/replace/"
+ refs: add a "for_each_replace_ref" function
* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
+ diff: Rename QUIET internal option to QUICK
+ diff: change semantics of "ignore whitespace" options
This changes exit code from "git diff --ignore-whitespace" and friends
when there is no actual output. It is a backward incompatible change, but
we could argue that it is a bugfix.
* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
+ Refuse deleting the current branch via push
+ Refuse updating the current branch in a non-bare repository via
push
----------------------------------------------------------------
[In 'pu']
* jn/gitweb-blame (Thu Aug 6 19:11:52 2009 +0200) 14 commits
- gitweb: Create links leading to 'blame_incremental' using
JavaScript
- gitweb: Incremental blame (proof of concept)
- gitweb: Add optional "time to generate page" info in footer
+ Revert the four topmost commits from jn/gitweb-blame topic
+ gitweb: Create links leading to 'blame_incremental' using
JavaScript
+ gitweb: Incremental blame (proof of concept)
+ gitweb: Add optional "time to generate page" info in footer
+ gitweb: Add -partial_query option to href() subroutine
+ gitweb: Use light/dark for class names also in 'blame' view
+ gitweb: Add author initials in 'blame' view, a la "git gui blame"
+ gitweb: Mark commits with no "previous" in 'blame' view
+ gitweb: Use "previous" header of git-blame -p in 'blame' view
+ gitweb: Mark boundary commits in 'blame' view
+ gitweb: Make .error style generic
I haven't picked up Jakub's replacement to the second one from the tip.
We probably should merge up to "Use light/dark" (aef3768) to 'master' and
start the rest over.
* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
+ clean: require double -f options to nuke nested git repository and
work tree
This probably should go in 'master' soonish.
* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 12 commits
- git stat -s: short status output
- git stat: pathspec limits, unlike traditional "git status"
- git stat: the beginning
+ wt-status: collect untracked files in a separate "collect" phase
+ Make git_status_config() file scope static to builtin-commit.c
+ wt-status: move wt_status_colors[] into wt_status structure
+ wt-status: move many global settings to wt_status structure
+ commit: --dry-run
+ status: show worktree status of conflicted paths separately
+ wt-status.c: rework the way changes to the index and work tree are
summarized
+ diff-index: keep the original index intact
+ diff-index: report unmerged new entries
Slowly progressing. I've addressed issues pointed out by Jeff in his
review, and hopefully the whole thing would be ready to go.
* db/vcs-helper (Sun Aug 9 15:28:28 2009 -0400) 17 commits
- Allow helpers to request marks for fast-import
- Allow helpers to report in "list" command that the ref is
unchanged
- Add support for "import" helper command
- transport-helper_init(): fix a memory leak in error path
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
- Use a clearer style to issue commands to remote helpers
+ Makefile: install hardlinks for git-remote-<scheme> supported by
libcurl if possible
+ Makefile: do not link three copies of git-remote-* programs
+ Makefile: git-http-fetch does not need expat
+ http-fetch: Fix Makefile dependancies
+ Add transport native helper executables to .gitignore
+ git-http-fetch: not a builtin
+ Use an external program to implement fetching with curl
+ Add support for external programs for handling native fetches
This consolidates various previous rounds from Daniel and Johan. It seems
that the use of colon ':' before vcs helper name needs to be corrected
before this series can go further.
* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit
- send-email: confirm on empty mail subjects
This seems to break t9001. Near the tip of 'pu' I have a iffy workaround.
* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
- t3302-notes-index-expensive: Speed up create_repo()
- fast-import: Add support for importing commit notes
- First draft of notes tree parser with support for fanout subtrees
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
* cc/sequencer-rebase-i (Wed Aug 5 22:53:00 2009 +0200) 8 commits
- rebase -i: use "git sequencer--helper --reset-hard"
- sequencer: add "--reset-hard" option to "git sequencer--helper"
- sequencer: add comments about reset_almost_hard()
- sequencer: add "reset_almost_hard()" and related functions
- rebase -i: use "git sequencer--helper --make-patch"
- sequencer: free memory used in "make_patch" function
- sequencer: add "make_patch" function to save a patch
- sequencer: add "builtin-sequencer--helper.c"
More sequencer updates. I didn't look at the latest round that had a
handful "oops, fix that earlier botch" patches, expecting a cleaner
reroll.
* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
- mailinfo: -b option keeps [bracketed] strings that is not a
[PATCH] marker
* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits
- DWIM 'git stash save -p' for 'git stash -p'
- Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
- Make 'git stash -k' a short form for 'git stash save --keep-index'
- Implement 'git stash save --patch'
- Implement 'git checkout --patch'
- Implement 'git reset --patch'
- builtin-add: refactor the meat of interactive_add()
- git-apply--interactive: Refactor patch mode code
Progress?
* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit
- Make 'git stash -k' a short form for 'git stash save --keep-index'
This should be merged to 'next' soonish, but I keep forgetting.
* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
. branch.c: if remote is not config'd for branch, don't try delete
push config
. branch, checkout: introduce autosetuppush
. move deletion of merge configuration to branch.c
. remote: add per-remote autosetupmerge and autosetuprebase
configuration
. introduce a struct tracking_config
. branch: install_branch_config and struct tracking refactoring
. config: allow false and true values for branch.autosetuprebase
Has been ejected from 'pu' for some time, expecting a reroll.
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
^ permalink raw reply [relevance 2%]
* Re: [PATCH] merge: indicate remote tracking branches in merge message
2009-08-09 10:07 0% ` [PATCH] merge: indicate remote tracking branches in merge message Jeff King
@ 2009-08-09 19:36 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-08-09 19:36 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff.net> writes:
> On Sun, Aug 09, 2009 at 06:00:45AM -0400, Jeff King wrote:
>
>> [1/3] add tests for merge message headings
>> [2/3] merge: fix incorrect merge message for ambiguous tag/branch
>> [3/3] merge: indicate remote tracking branches in merge message
>
> And here is the 4/3 you mentioned earlier:
>
> -- >8 --
> Subject: [PATCH] merge: describe tags as such in merge message
>
> Previously, merging a tag directly via "git merge tag" would
> get you the message "Merge commit 'tag'". It is a little
> more descriptive to note that it was actually a tag (i.e.,
> "Merge tag 'tag'").
Maybe "Merge version 'v1.6.3'" or "Merge commit tagged as 'v1.6.3'"?
I dunno.
^ permalink raw reply [relevance 0%]
* Re: [PATCH] merge: indicate remote tracking branches in merge message
2009-08-09 10:00 3% ` Jeff King
2009-08-09 10:02 2% ` [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch Jeff King
@ 2009-08-09 10:07 0% ` Jeff King
2009-08-09 19:36 0% ` Junio C Hamano
1 sibling, 1 reply; 200+ results
From: Jeff King @ 2009-08-09 10:07 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Sun, Aug 09, 2009 at 06:00:45AM -0400, Jeff King wrote:
> [1/3] add tests for merge message headings
> [2/3] merge: fix incorrect merge message for ambiguous tag/branch
> [3/3] merge: indicate remote tracking branches in merge message
And here is the 4/3 you mentioned earlier:
-- >8 --
Subject: [PATCH] merge: describe tags as such in merge message
Previously, merging a tag directly via "git merge tag" would
get you the message "Merge commit 'tag'". It is a little
more descriptive to note that it was actually a tag (i.e.,
"Merge tag 'tag'").
Signed-off-by: Jeff King <peff@peff.net>
---
builtin-merge.c | 5 +++++
t/t7608-merge-messages.sh | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index f4de73f..db74901 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -380,6 +380,11 @@ static void merge_name(const char *remote, struct strbuf *msg)
sha1_to_hex(branch_head), remote);
goto cleanup;
}
+ if (!prefixcmp(found_ref, "refs/tags/")) {
+ strbuf_addf(msg, "%s\t\ttag '%s' of .\n",
+ sha1_to_hex(branch_head), remote);
+ goto cleanup;
+ }
}
/* See if remote matches <name>^^^.. or <name>~<number> */
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 28d5679..3ee0983 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
git checkout master &&
test_commit master-3 &&
git merge tag-1 &&
- check_oneline "Merge commit Qtag-1Q"
+ check_oneline "Merge tag Qtag-1Q"
'
test_expect_success 'ambiguous tag' '
@@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
git checkout master &&
test_commit master-4 &&
git merge ambiguous &&
- check_oneline "Merge commit QambiguousQ"
+ check_oneline "Merge tag QambiguousQ"
'
test_expect_success 'remote branch' '
--
1.6.4.178.g7a987
^ permalink raw reply related [relevance 0%]
* [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch
2009-08-09 10:00 3% ` Jeff King
@ 2009-08-09 10:02 2% ` Jeff King
2009-08-09 10:07 0% ` [PATCH] merge: indicate remote tracking branches in merge message Jeff King
1 sibling, 0 replies; 200+ results
From: Jeff King @ 2009-08-09 10:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
If we have both a tag and a branch named "foo", then calling
"git merge foo" will warn about the ambiguous ref, but merge
the tag.
When generating the commit message, though, we simply
checked whether "refs/heads/foo" existed, and if it did,
assumed it was a branch. This led to the statement "Merge
branch 'foo'" in the commit message, which is quite wrong.
Instead, we should use dwim_ref to find the actual ref used,
and describe it appropriately.
In addition to the test in t7608, we must also tweak the
expected output of t4202, which was accidentally triggering
this bug.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin-merge.c | 15 +++++++--------
t/t4202-log.sh | 4 ++--
t/t7608-merge-messages.sh | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c
index 82b5466..f7db148 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -358,6 +358,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
struct strbuf buf = STRBUF_INIT;
struct strbuf bname = STRBUF_INIT;
const char *ptr;
+ char *found_ref;
int len, early;
strbuf_branchname(&bname, remote);
@@ -368,14 +369,12 @@ static void merge_name(const char *remote, struct strbuf *msg)
if (!remote_head)
die("'%s' does not point to a commit", remote);
- strbuf_addstr(&buf, "refs/heads/");
- strbuf_addstr(&buf, remote);
- resolve_ref(buf.buf, branch_head, 0, NULL);
-
- if (!hashcmp(remote_head->sha1, branch_head)) {
- strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
- sha1_to_hex(branch_head), remote);
- goto cleanup;
+ if (dwim_ref(remote, strlen(remote), branch_head, &found_ref) > 0) {
+ if (!prefixcmp(found_ref, "refs/heads/")) {
+ strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
+ sha1_to_hex(branch_head), remote);
+ goto cleanup;
+ }
}
/* See if remote matches <name>^^^.. or <name>~<number> */
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 48e0088..1e952ca 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -320,11 +320,11 @@ test_expect_success 'set up more tangled history' '
'
cat > expect <<\EOF
-* Merge branch 'reach'
+* Merge commit 'reach'
|\
| \
| \
-*-. \ Merge branches 'octopus-a' and 'octopus-b'
+*-. \ Merge commit 'octopus-a'; commit 'octopus-b'
|\ \ \
* | | | seventh
| | * | octopus-b
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 9d10583..81ced8a 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -38,7 +38,7 @@ test_expect_success 'merge tag' '
check_oneline "Merge commit Qtag-1Q"
'
-test_expect_failure 'ambiguous tag' '
+test_expect_success 'ambiguous tag' '
git checkout -b ambiguous master &&
test_commit ambiguous &&
git checkout master &&
--
1.6.4.178.g7a987
^ permalink raw reply related [relevance 2%]
* Re: [PATCH] merge: indicate remote tracking branches in merge message
@ 2009-08-09 10:00 3% ` Jeff King
2009-08-09 10:02 2% ` [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch Jeff King
2009-08-09 10:07 0% ` [PATCH] merge: indicate remote tracking branches in merge message Jeff King
0 siblings, 2 replies; 200+ results
From: Jeff King @ 2009-08-09 10:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Sun, Aug 09, 2009 at 05:14:43AM -0400, Jeff King wrote:
> In t4202, we have a branch name and a tag name that are the same
> (octopus-a), and we "git merge octopus-a". This actually merges the tag,
> but because the branch name existed, we write "Merge branch 'octopus-a'"
> in the log, which is not true. With your patch, it does the right thing
> and says "Merge commit 'octopus-a'".
>
> The simple thing is to just update the "expect" text. Though the current
> behavior does show off the ability to collape the two branches and say
>
> Merge branches 'octopus-a' and 'octopus-b'
>
> instead of
>
> Merge commit 'octopus-a'; commit 'octopus-b'
Thinking about it for a few seconds, it's silly to try to test something
that happens to occur in a totally unrelated test. The right thing to do
is to write actual tests for this area, fix the bug, and then add the
new feature. So how about this series:
[1/3] add tests for merge message headings
[2/3] merge: fix incorrect merge message for ambiguous tag/branch
[3/3] merge: indicate remote tracking branches in merge message
-Peff
^ permalink raw reply [relevance 3%]
* What's cooking in git.git (Jun 2009, #01; Fri, 12)
@ 2009-06-12 9:11 3% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2009-06-12 9:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the branches, but I am still
holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
Unfortunately I am unusually short of time these days, and some of the
topics unfortunately got less "final review before deciding to merge up"
than I would have liked to give them. This message itself has more
"please comment/review" requests than usual.
----------------------------------------------------------------
[New Topics]
* tr/die_errno (Mon Jun 8 23:02:20 2009 +0200) 4 commits
- Use die_errno() instead of die() when checking syscalls
- Convert existing die(..., strerror(errno)) to die_errno()
- die_errno(): double % in strerror() output just in case
- Introduce die_errno() that appends strerror(errno) to die()
I didn't check the individual conversion from die() to die_errno()
in this latest round; comments?
* cb/maint-no-double-merge (Mon Jun 1 11:20:56 2009 +0200) 1 commit
+ refuse to merge during a merge
Will merge to 'master' soonish.
* sp/msysgit (Thu Jun 11 22:56:12 2009 +0200) 13 commits
+ compat/ has subdirectories: do not omit them in 'make clean'
+ Fix typo in nedmalloc warning fix
+ MinGW: Teach Makefile to detect msysgit and apply specific
settings
+ Fix warnings in nedmalloc when compiling with GCC 4.4.0
+ Add custom memory allocator to MinGW and MacOS builds
+ MinGW readdir reimplementation to support d_type
+ connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
+ git: browsing paths with spaces when using the start command
+ MinGW: fix warning about implicit declaration of _getch()
+ test-chmtime: work around Windows limitation
+ Work around a regression in Windows 7, causing erase_in_line() to
crash sometimes
+ Quiet make: do not leave Windows behind
+ MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
A silly typo I failed to spot was fixed by J6t; should be ready for
'master' now.
* mh/master-send-email (Sun Jun 7 23:40:52 2009 +0200) 8 commits
- send-email: fix a typo in a comment
- Merge branch 'mh/maint-send-email' into mh/master-send-email
- Merge branch 'mh/master-send-email-threaded-fix' into mh/master-
send-email
- add a test for git-send-email for threaded mails without chain-
reply-to
- send-email: fix threaded mails without chain-reply-to
- doc/send-email: clarify the behavior of --in-reply-to with --no-
thread
- send-email: fix non-threaded mails
- add a test for git-send-email for non-threaded mails
The author seems to have a better organization than the way I queued this
topic, so I am holding off merging it to 'next' yet. My goal was to have
two topics, one eventually mergeable to 'maint', the other to 'master'.
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
- fix handling of iconv configuration options
Will merge to 'next' soon.
* rc/maint-http-local-slot-fix (Sat Jun 6 16:43:26 2009 +0800) 1 commit
+ http*: cleanup slot->local after fclose
* sb/parse-options-integer (Thu Jun 4 16:43:57 2009 -0700) 2 commits
+ parse-options: simplify usage argh handling
+ parse-options: make OPT_INTEGER's argh explicit
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
- parse-remote: remove unused functions
- parse-remote: support default reflist in get_remote_merge_branch
- parse-remote: function to get the tracking branch to be merge
Will merge to 'next' soon, but it would be nice if we can fix the
"currently works only for the default mapping" before it goes to
'master'.
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
- Shift object enumeration out of upload-pack
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
- http.c: add http.sslCertNoPass option
- http.c: prompt for SSL client certificate password
I think "sslCertNoPass" is a mistake. We should aim for the ideal (i.e.
detect when we do not need passphrase), and live with a configuration
kludge until the code achives the ideal (i.e. "needPass" to trigger the
new codepath to ask for passphrase), _if_ that ideal is achievable. And
in this particular case, I think the ideal is not rocket science.
* mg/pushurl (Tue Jun 9 18:01:38 2009 +0200) 5 commits
- builtin-remote: Make "remote -v" display push urls
- builtin-remote: Show push urls as well
- technical/api-remote: Describe new struct remote member pushurl
- t5516: Check pushurl config setting
- Allow push and fetch urls to be different
Will merge to 'next' soon.
----------------------------------------------------------------
[Graduated to "master"]
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
+ Documentation: teach stash/pop workflow instead of stash/apply
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
+ diff: generate pretty filenames in prep_temp_blob()
+ compat: add a basename() compatibility function
+ compat: add a mkstemps() compatibility function
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
+ Change xdl_merge to generate output even for null merges
+ t6023: merge-file fails to output anything for a degenerate merge
----------------------------------------------------------------
[Will merge to "master" soon]
* bc/solaris (Sun Jun 7 07:40:29 2009 +0200) 10 commits
- configure: test whether -lresolv is needed
+ Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
+ git-compat-util.h: avoid using c99 flex array feature with Sun
compiler 5.8
+ Makefile: add section for SunOS 5.7
+ Makefile: introduce SANE_TOOL_PATH for prepending required
elements to PATH
+ Makefile: define __sun__ on SunOS
+ git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
+ On Solaris choose the OLD_ICONV iconv() declaration based on the
UNIX spec
+ Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
arguments
+ Makefile: use /usr/ucb/install on SunOS platforms rather than
ginstall
We saw some success report with Sun's c99 compiler, which would allow us
to include the last remaining patch from Brandon with updates. I lost
track of the status of the tip patch for autoconf. Is it ready to go?
Comments from Solaris folks are appreciated.
* cb/match_refs_internal_tail (Sun May 31 16:26:48 2009 +0200) 1 commit
+ match_refs: search ref list tail internally
* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit
+ git-cvsexportcommit can't commit files which have been removed
from CVS
* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit
+ for-each-ref: Do not lookup objects when they will not be used
I think this makes sense, except that I have this nagging feeling that its
use of for_each_rawref() where the original used for_each_ref() may have
some unintended side effects in corner cases.
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 3 commits
- git-submodule: add support for --merge.
+ Rename submodule.<name>.rebase to submodule.<name>.update
+ git-submodule: add support for --rebase.
I think people do not have issues with the first two, even though some
might still argue that "update --merge" is not a good mode of
operation.
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
+ mergetool--lib: add support for araxis merge
* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
+ t6030: test skipping away from an already skipped commit
+ bisect: when skipping, choose a commit away from a skipped commit
+ bisect: add parameters to "filter_skipped"
+ bisect: display first bad commit without forking a new process
+ bisect: drop unparse_commit() and use clear_commit_marks()
Regardless of metrics, this is an improvement from the current one. Will
merge to 'master', and let the finer details taken care of later.
* rc/http-push (Sat Jun 6 16:44:02 2009 +0800) 24 commits
+ http*: add helper methods for fetching objects (loose)
+ http*: add helper methods for fetching packs
+ http: use new http API in fetch_index()
+ http*: add http_get_info_packs
+ http-push.c::fetch_symref(): use the new http API
+ http-push.c::remote_exists(): use the new http API
+ http.c::http_fetch_ref(): use the new http API
+ transport.c::get_refs_via_curl(): use the new http API
+ http.c: new functions for the http API
+ http: create function end_url_with_slash
+ http*: move common variables and macros to http.[ch]
+ transport.c::get_refs_via_curl(): do not leak refs_url
+ Don't expect verify_pack() callers to set pack_size
+ http-push: do not SEGV after fetching a bad pack idx file
+ http*: copy string returned by sha1_to_hex
+ http-walker: verify remote packs
+ http-push, http-walker: style fixes
+ t5550-http-fetch: test fetching of packed objects
+ http-push: fix missing "#ifdef USE_CURL_MULTI" around
"is_running_queue"
+ http-push: send out fetch requests on queue
+ t5540-http-push: test fetching of packed objects
+ t5540-http-push: test fetching of loose objects
+ Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
+ http*: cleanup slot->local after fclose
I do not use http-push myself, and as I said, I have shortage of git time
in recent weeks, so these are not as carefully reviewed as usual; but
RCTay is proving to be a very reliable HTTP guy I can trust, so unless
there are regression reports from people who actually use http-push, this
will be in 'master' soon.
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits
- Teach "-m <msg>" and "-F <file>" to "git notes edit"
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
Dscho asked about the performance implications of this; I do not think I
saw any progress on that yet...
* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits
- Add initial support for pathname conversion to UTF-8
- read_directory(): infrastructure for pathname character set
conversion
- Add 'fill_directory()' helper function for directory traversal
Before adding the real "conversion", this needs a few real fixups, I
think. For example there is one hardcoded array that is used without
bounds check.
* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
- Fix for a merge where a branch has an F->D transition
- Add a reminder test case for a merge with F/D transition
Although the reported breakage is covered with the patch, Alex feels the
solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
may be long overdue but seems to be a hard problem.
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
- blame.c: start libifying the blame infrastructure
A few minor point remains in this initial one.
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
- Allow --date=local --date=other-format to work as expected
The one I posted had a few corner-case bugs that was caught with the test
suite; this one has them fixed. People did not like the UI so it is kept
out of 'next'
* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
- git-merge-file: allow converting the results for the work tree
This is a feature waiting for a user.
We did not give scripted Porcelains a way to say "this temporary file I am
using for merging is for this path, so use the core.autocrlf and attributes
rules for that final path". Instead, merge-file simply wrote out the
data in the canonical repository representation.
rerere has the same issue, but it is a lot worse. It reads the three
files (preimage, postimage and thisimage) from the work tree in the work
tree representation, merges them without converting them to the canonical
representation first but inserts the conflict markers with the canonical
representation and writes the resulting mess out. It needs to be fixed to
read with convert_to_git(), merge them while they are still in the
canonical representation and possibly add conflict markers, and then write
the results out after convert_to_working_tree(). It also needs to write
in binary mode as well.
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
- Add option for using a foreign VCS
- Document details of transport function APIs
- Allow late reporting of fetched hashes
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
- t/t9600: remove exit after test_done
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- Add a test of "git cvsimport"'s handling of tags and branches
- Add some tests of git-cvsimport's handling of vendor branches
- Test contents of entire cvsimported "master" tree contents
- Use CVS's -f option if available (ignore user's ~/.cvsrc file)
- Start a library for cvsimport-related tests
----------------------------------------------------------------
[Actively cooking]
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
- git-am: refactor 'cleaning up and aborting'
- git-am foreign patch support: StGIT support
- git-am foreign patch support: autodetect some patch formats
- git-am foreign patch support: introduce patch_format
Should re-review and merge to 'next' but I am short of time these days.
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
+ Avoid "diff-index --cached" optimization under --find-copies-
harder
+ Optimize "diff-index --cached" using cache-tree
+ t4007: modernize the style
+ cache-tree.c::cache_tree_find(): simplify internal API
+ write-tree --ignore-cache-tree
I believe the code is right, but this touches a very low-level code with
high chance of subtle breakages unless you are really careful. I'll let
it simmer a bit longer in 'next'.
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
- diff: Rename QUIET internal option to QUICK
- diff: change semantics of "ignore whitespace" options
I am not sure if it should wait for a major version bump but this is a
good semantics change. Perhaps merge to 'next' soonish, but I am
undecided. Comments?
* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
- t6050: check pushing something based on a replaced commit
- Documentation: add documentation for "git replace"
- Add git-replace to .gitignore
- builtin-replace: use "usage_msg_opt" to give better error messages
- parse-options: add new function "usage_msg_opt"
- builtin-replace: teach "git replace" to actually replace
- Add new "git replace" command
- environment: add global variable to disable replacement
- mktag: call "check_sha1_signature" with the replacement sha1
- replace_object: add a test case
- object: call "check_sha1_signature" with the replacement sha1
- sha1_file: add a "read_sha1_file_repl" function
- replace_object: add mechanism to replace objects found in
"refs/replace/"
- refs: add a "for_each_replace_ref" function
----------------------------------------------------------------
[On Hold]
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
- receive-pack: default receive.denyDeleteCurrent to refuse
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
- Refuse updating the current branch in a non-bare repository via
push
These are for 1.7.0, but the messages when they trigger together may need
to be rethought.
^ permalink raw reply [relevance 3%]
Results 201-400 of ~2000 next (older) | prev (newer) | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2009-06-12 9:11 3% What's cooking in git.git (Jun 2009, #01; Fri, 12) Junio C Hamano
2009-08-09 6:59 [PATCH] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09 7:31 ` Junio C Hamano
2009-08-09 7:40 ` Jeff King
2009-08-09 9:14 ` Jeff King
2009-08-09 10:00 3% ` Jeff King
2009-08-09 10:02 2% ` [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch Jeff King
2009-08-09 10:07 0% ` [PATCH] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09 19:36 0% ` Junio C Hamano
2009-08-13 2:14 2% What's cooking in git.git (Aug 2009, #02; Wed, 12) Junio C Hamano
2009-08-21 2:48 2% What's cooking in git.git (Aug 2009, #03; Thu, 20) Junio C Hamano
2009-10-12 2:53 2% [PATCH] Aggressive three-way merge: fix D/F case Junio C Hamano
2009-10-12 3:18 2% What's cooking in git.git (Oct 2009, #02; Sun, 11) Junio C Hamano
2009-10-19 8:05 2% What's cooking in git.git (Oct 2009, #03; Mon, 19) Junio C Hamano
2009-10-22 6:52 2% What's cooking in git.git (Oct 2009, #04; Wed, 21) Junio C Hamano
2009-10-28 21:11 2% What's cooking in git.git (Oct 2009, #05; Wed, 28) Junio C Hamano
2009-10-31 4:04 2% What's cooking in git.git (Oct 2009, #06; Fri, 30) Junio C Hamano
2009-11-05 5:41 2% What's cooking in git.git (Nov 2009, #01; Wed, 04) Junio C Hamano
2009-11-09 5:18 2% What's cooking in git.git (Nov 2009, #02; Sun, 08) Junio C Hamano
2009-11-15 10:23 2% What's cooking in git.git (Nov 2009, #03; Sun, 15) Junio C Hamano
2009-11-18 7:53 2% What's cooking in git.git (Nov 2009, #04; Tue, 17) Junio C Hamano
2009-11-23 6:16 2% What's cooking in git.git (Nov 2009, #05; Sun, 22) Junio C Hamano
2009-11-25 16:31 Commiting changes onto more than one branch Mike Jarmy
2009-11-25 16:50 3% ` Jakub Narebski
2009-11-26 1:03 2% What's cooking in git.git (Nov 2009, #06; Wed, 25) Junio C Hamano
2009-11-29 10:05 2% What's cooking in git.git (Nov 2009, #07; Sun, 29) Junio C Hamano
2009-12-01 22:10 2% What's cooking in git.git (Dec 2009, #01; Tue, 01) Junio C Hamano
2009-12-06 8:17 2% What's cooking in git.git (Dec 2009, #02; Sat, 05) Junio C Hamano
2009-12-08 9:25 2% What's cooking in git.git (Dec 2009, #03; Tue, 08) Junio C Hamano
2009-12-10 7:11 2% What's cooking in git.git (Dec 2009, #04; Wed, 09) Junio C Hamano
2009-12-11 18:55 FEATURE REQUEST: Announce branch name with merge comamnd Jari Aalto
2009-12-12 0:38 2% ` [PATCH 1/3] octopus: make merge process simpler to follow Stephen Boyd
2009-12-12 8:53 0% ` Junio C Hamano
2009-12-12 20:46 Junio C Hamano
2009-12-15 6:49 2% ` [PATCH] " Stephen Boyd
2009-12-15 7:32 0% ` Junio C Hamano
2009-12-28 9:57 2% What's cooking in git.git (Dec 2009, #05; Mon, 28) Junio C Hamano
2010-01-01 0:10 2% What's cooking in git.git (Dec 2009, #06; Thu, 31) Junio C Hamano
2010-01-04 8:39 2% What's cooking in git.git (Jan 2010, #01; Mon, 04) Junio C Hamano
2010-01-06 22:22 2% What's cooking in git.git (Jan 2010, #02 draft; Wed, 06) Junio C Hamano
2010-01-06 22:25 2% ` Junio C Hamano
2010-01-08 7:42 2% ` What's cooking in git.git (Jan 2010, #02; Thu, 07) Junio C Hamano
2010-01-10 19:55 2% What's cooking in git.git (Jan 2010, #03; Sun, 10) Junio C Hamano
2010-01-10 19:55 2% "What's cooking" incremental edition Junio C Hamano
2010-01-13 23:11 2% What's cooking in git.git (Jan 2010, #04; Wed, 13) Junio C Hamano
2010-01-17 2:46 2% What's cooking in git.git (Jan 2010, #05; Sat, 16) Junio C Hamano
2010-01-20 10:24 2% What's cooking in git.git (Jan 2010, #06 draft) Junio C Hamano
2010-01-21 0:52 2% What's cooking in git.git (Jan 2010, #06; Wed, 20) Junio C Hamano
2010-01-23 3:28 3% What's cooking in git.git (Jan 2010, #07; Fri, 22) Junio C Hamano
2010-01-25 4:39 2% What's cooking in git.git (Jan 2010, #08; Sun, 24) Junio C Hamano
2010-08-17 6:51 2% [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Jonathan Nieder
2010-08-17 7:04 2% ` [PATCH 15/24] merge script: improve log message subject Jonathan Nieder
2010-08-17 7:46 3% ` [PATCH/RFC] updating examples/git-merge (plus a builtin/merge fix) Ævar Arnfjörð Bjarmason
2010-08-17 8:10 3% ` Jonathan Nieder
[not found] <AANLkTim3MacQK6EtTPNJsYbqb=5bOM3W3BXC6p=hT+PU@mail.gmail.com>
2010-11-09 5:37 ` Git automatic stashing? Casey McGinty
2010-11-09 7:49 2% ` Matthieu Moy
2010-12-17 7:38 What's cooking in git.git (Dec 2010, #05; Thu, 16) Junio C Hamano
2010-12-17 11:18 ` conflict resolution of pd/bash-4-completion [Re: What's cooking in git.git (Dec 2010, #05; Thu, 16)] SZEDER Gábor
2010-12-17 19:24 3% ` Junio C Hamano
2011-02-15 1:07 2% [PATCH] merge: honor prepare-commit-msg hook Jay Soffian
2011-02-15 21:36 0% ` Junio C Hamano
2011-04-15 17:21 git rebase -p doesn't understand -X Marius Storm-Olsen
2011-04-19 9:06 ` Martin von Zweigbergk
2011-04-20 23:40 2% ` Jonathan Nieder
2011-05-03 9:03 [PATCH v3] Add default merge options for all branches Jonathan Nieder
2011-05-04 22:07 ` [PATCH v5] " Michael Grubb
2011-05-05 0:42 2% ` Junio C Hamano
2011-05-06 20:36 0% ` Junio C Hamano
2011-05-06 21:32 0% ` Jonathan Nieder
2011-05-05 2:37 3% What's cooking in git.git (May 2011, #02; Wed, 4) Junio C Hamano
2011-05-06 23:22 3% What's cooking in git.git (May 2011, #03; Fri, 6) Junio C Hamano
2011-05-09 5:33 What's cooking in git.git (May 2011, #04; Sun, 8) Junio C Hamano
2011-05-09 8:55 2% ` Ciaran
2011-10-10 5:46 [PATCH 0/2] Provide API to invalidate refs cache Michael Haggerty
2011-10-10 8:24 ` [PATCH v2 0/7] " Michael Haggerty
2011-10-11 0:02 ` Junio C Hamano
2011-10-11 5:50 ` Michael Haggerty
2011-10-11 17:26 1% ` Junio C Hamano
2012-07-28 15:01 [PATCH 0/3] null sha1 in trees Jeff King
2012-07-28 15:05 ` [PATCH 2/3] do not write null sha1s to on-disk index Jeff King
2012-12-29 10:03 ` Jonathan Nieder
2012-12-29 10:27 ` Jeff King
2012-12-29 10:34 ` Jonathan Nieder
2012-12-29 11:05 ` Jeff King
2012-12-29 20:51 1% ` [BUG] two-way read-tree can write null sha1s into index Jeff King
2012-08-16 19:49 git workflow - merging upwards Patrick Sabin
2012-08-16 20:43 3% ` Junio C Hamano
2012-08-17 8:14 0% ` Patrick Sabin
2012-11-13 17:52 What's cooking in git.git (Nov 2012, #03; Tue, 13) Jeff King
2012-11-13 20:01 2% ` Junio C Hamano
2012-12-20 17:37 1% [PATCH] oneway_merge(): only lstat() when told to update worktree Martin von Zweigbergk
2012-12-20 20:02 0% ` Junio C Hamano
2012-12-20 21:03 2% ` [PATCH v2] " Martin von Zweigbergk
2012-12-29 7:22 [PATCH v2] wt-status: Show ignored files in untracked dirs Jeff King
2012-12-30 14:39 ` [PATCH 1/2] dir.c: Make git-status --ignored more consistent Antoine Pelisse
2012-12-30 14:54 ` Antoine Pelisse
2012-12-30 21:36 2% ` Junio C Hamano
2013-01-03 20:40 6% [PATCH v2] Documentation: update "howto maintain git" Junio C Hamano
2013-03-28 21:43 [PATCH v2 0/6] attribute regression fix for maint-1.8.1 and upward Jeff King
2013-03-28 21:48 ` [PATCH 4/6] dir.c::match_pathname(): pay attention to the length of string parameters Jeff King
2013-03-29 8:45 ` Duy Nguyen
2013-03-29 12:05 ` Jeff King
2013-03-29 13:02 ` Duy Nguyen
2013-03-29 16:44 2% ` Junio C Hamano
2013-03-29 17:04 0% ` Jeff King
2013-03-29 17:35 0% ` Junio C Hamano
2013-04-10 20:35 Premerging topics (was: [RFD] annnotating a pair of commit objects?) Antoine Pelisse
2013-04-23 6:34 ` Johan Herland
2013-04-23 14:51 ` Antoine Pelisse
2013-04-23 23:06 ` Johan Herland
2013-04-24 5:48 3% ` Premerging topics Junio C Hamano
2013-04-24 6:22 3% ` Johan Herland
2013-04-24 7:14 ` Junio C Hamano
2013-04-29 19:06 3% ` Antoine Pelisse
2013-04-29 22:19 2% ` Junio C Hamano
2013-04-23 14:53 3% ` Junio C Hamano
2013-04-23 15:17 2% ` Antoine Pelisse
2013-04-23 15:29 0% ` Junio C Hamano
2013-04-23 15:36 0% ` Antoine Pelisse
2013-07-30 15:46 ANNOUNCE: git-integration -- Easily manage integration branches John Keeping
2013-07-30 16:45 ` Junio C Hamano
2013-07-30 17:57 2% ` John Keeping
[not found] <20131024122255.GI9378@mwanda>
[not found] ` <20131024122512.GB9534@mwanda>
[not found] ` <20131026181709.GB10488@kroah.com>
2013-10-27 1:34 ` [PATCH] commit: Add -f, --fixes <commit> option to add Fixes: line Josh Triplett
2013-10-28 0:49 2% ` Jim Hill
2013-10-31 17:21 [BUG?] "error: cache entry has null sha1" Jeff King
2013-11-01 22:44 ` Re* " Junio C Hamano
2013-11-01 22:44 1% ` [PATCH 1/3] unpack-trees: fix "read-tree -u --reset A B" with conflicted index Junio C Hamano
2013-12-03 18:06 Branching workflow Javier Domingo
2013-12-03 19:12 3% ` Junio C Hamano
2014-03-06 14:50 3% [PATCH 0/6] fix hunk editing with 'commit -p -m' Benoit Pierre
2014-03-06 14:50 2% ` [PATCH 3/6] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2014-03-10 18:49 3% [PATCH V2 0/7] fix hunk editing with 'commit -p -m' Benoit Pierre
2014-03-10 18:49 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2014-03-11 22:12 3% What's cooking in git.git (Mar 2014, #02; Tue, 11) Junio C Hamano
2014-03-14 22:09 3% What's cooking in git.git (Mar 2014, #03; Fri, 14) Junio C Hamano
2014-03-15 8:41 [PATCH 0/6] Fix misuses of "nor" Justin Lebar
2014-03-15 8:56 2% ` Duy Nguyen
2014-03-15 16:56 0% ` Justin Lebar
2014-03-15 16:11 [PATCH 3/7] test patch hunk editing with "commit -p -m" Benoit Pierre
2014-03-15 21:42 ` [PATCH 1/7] merge hook tests: fix missing '&&' in test Benoit Pierre
2014-03-15 21:42 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2014-03-17 18:53 [PATCH 3/7] test patch hunk editing with "commit -p -m" Junio C Hamano
2014-03-18 10:00 ` [PATCH 1/7] merge hook tests: fix missing '&&' in test Benoit Pierre
2014-03-18 10:00 2% ` [PATCH 5/7] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2014-03-20 21:09 3% What's cooking in git.git (Mar 2014, #04; Thu, 20) Junio C Hamano
2014-03-24 20:27 3% What's cooking in git.git (Mar 2014, #05; Mon, 24) Junio C Hamano
2014-03-25 20:18 3% What's cooking in git.git (Mar 2014, #06; Tue, 25) Junio C Hamano
2014-03-28 22:21 3% What's cooking in git.git (Mar 2014, #07; Fri, 28) Junio C Hamano
2014-04-09 21:59 2% [ANNOUNCE] Git v1.9.2 Junio C Hamano
2014-05-07 15:40 Beginner question on "Pull is mostly evil" Jim Garrison
2014-05-07 20:15 2% ` Junio C Hamano
2014-05-09 6:08 ` [PATCH] How to keep a project's canonical history correct Stephen P. Smith
2014-05-09 21:05 1% ` Junio C Hamano
2014-05-10 4:01 0% ` Stephen & Linda Smith
2014-05-08 5:17 Stephen P. Smith
2014-05-08 18:37 0% ` Junio C Hamano
2014-06-15 22:39 git rebase --skip stuck in a loop brian m. carlson
2014-06-16 0:01 2% ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
2014-06-16 20:31 2% ` Junio C Hamano
2014-06-18 17:25 2% What's cooking in git.git (Jun 2014, #04; Tue, 17) Junio C Hamano
2014-06-20 22:26 2% What's cooking in git.git (Jun 2014, #05; Fri, 20) Junio C Hamano
2014-06-26 22:02 2% What's cooking in git.git (Jun 2014, #06; Thu, 26) Junio C Hamano
2014-07-08 21:47 3% What's cooking in git.git (Jul 2014, #01; Tue, 8) Junio C Hamano
2014-07-16 22:02 2% [ANNOUNCE] Git v2.0.2 Junio C Hamano
2014-07-27 23:18 3% [ANNOUNCE] Git v2.1.0-rc0 Junio C Hamano
2014-08-11 4:59 Sharing merge conflict resolution between multiple developers Chris Packham
2014-08-11 18:44 3% ` Junio C Hamano
2014-08-11 23:29 2% ` Chris Packham
2014-08-12 1:57 2% ` Junio C Hamano
2014-08-12 18:13 [PATCH] unpack-tree.c: remove dead code Junio C Hamano
2014-08-12 21:15 ` Stefan Beller
2014-08-12 23:57 ` [PATCH 0/3] " Jonathan Nieder
2014-08-13 0:03 1% ` [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged Jonathan Nieder
2014-08-13 0:38 0% ` Junio C Hamano
2014-10-15 12:39 2% [PATCH] git-svn: merge: fix rooturl/branchurl match check Tommaso Colombo
2014-10-20 6:24 2% ` Eric Wong
2015-10-02 4:25 3% [PATCH] merge: Fix English grammar in please-commit-before-merge message Alex Henrie
2015-10-08 18:47 5% [PATCH 0/1] merge: fix cache_entry use-after-free David Turner
2015-10-08 18:47 1% ` David Turner
2015-10-08 20:00 2% ` Junio C Hamano
2015-10-09 22:16 2% ` David Turner
2015-10-09 22:51 2% ` Junio C Hamano
2015-10-12 22:03 1% [PATCH v2] " David Turner
2015-10-12 22:28 2% ` Junio C Hamano
2015-10-13 19:22 2% ` David Turner
2015-10-13 21:05 2% ` Junio C Hamano
2015-10-14 21:17 2% ` Junio C Hamano
2015-10-14 22:00 2% ` David Turner
2015-10-14 22:07 1% [PATCH v3] " David Turner
2015-10-15 3:35 2% ` René Scharfe
2015-10-15 19:02 2% ` David Turner
2015-10-15 20:38 2% ` René Scharfe
2015-10-15 20:51 2% ` Junio C Hamano
2015-10-16 7:05 2% ` David Turner
2015-10-16 16:04 2% ` Junio C Hamano
2015-10-19 22:27 2% ` David Turner
2015-10-20 2:13 1% ` Junio C Hamano
2015-10-14 22:23 2% What's cooking in git.git (Oct 2015, #03; Wed, 14) Junio C Hamano
2015-10-20 22:10 2% What's cooking in git.git (Oct 2015, #04; Tue, 20) Junio C Hamano
2015-10-22 20:51 3% What's cooking in git.git (Oct 2015, #05; Thu, 22) Junio C Hamano
2015-10-26 23:20 3% What's cooking in git.git (Oct 2015, #06; Mon, 26) Junio C Hamano
2015-10-30 22:07 2% What's cooking in git.git (Oct 2015, #07; Fri, 30) Junio C Hamano
2015-11-03 7:39 [PATCH v6 00/25] refs backend pre-vtable Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 25/25] refs: break out ref conflict checks Michael Haggerty
2015-11-04 21:01 ` David Turner
2015-11-05 4:00 ` Michael Haggerty
2015-11-05 16:22 ` David Turner
2015-11-06 13:34 ` Michael Haggerty
2015-11-06 17:28 ` Junio C Hamano
2015-11-06 23:24 2% ` Junio C Hamano
2015-11-05 23:13 2% What's cooking in git.git (Nov 2015, #01; Thu, 5) Junio C Hamano
2015-11-25 1:07 What's cooking in git.git (Nov 2015, #04; Tue, 24) Jeff King
2015-11-28 15:40 ` brian m. carlson
2015-11-28 16:35 ` Jeff King
2015-11-28 17:09 ` brian m. carlson
2015-12-01 23:10 2% ` Jeff King
2015-12-02 0:24 What's cooking in git.git (Dec 2015, #01; Tue, 1) Jeff King
2015-12-02 22:11 2% ` Junio C Hamano
2015-12-02 22:31 3% ` Jeff King
2015-12-02 23:31 0% ` Junio C Hamano
2015-12-03 1:09 0% ` Junio C Hamano
2015-12-03 0:29 0% ` David Turner
2016-03-20 1:23 [PATCH] Fixing segmentation fault when merging FETCH_HEAD Eric Sunshine
2016-03-21 0:11 ` Jose Ivan B. Vilarouca Filho
2016-03-21 19:01 2% ` merge: fix NULL pointer dereference when merging nothing into void Junio C Hamano
2016-03-21 19:36 2% ` Eric Sunshine
2016-03-23 21:12 3% What's cooking in git.git (Mar 2016, #04; Wed, 23) Junio C Hamano
2016-03-25 22:03 2% What's cooking in git.git (Mar 2016, #05; Fri, 25) Junio C Hamano
2016-04-01 22:47 2% What's cooking in git.git (Apr 2016, #01; Fri, 1) Junio C Hamano
2016-04-04 21:26 2% What's cooking in git.git (Apr 2016, #02; Mon, 4) Junio C Hamano
2016-04-07 19:01 2% What's cooking in git.git (Apr 2016, #03; Thu, 7) Junio C Hamano
2016-04-07 21:03 0% ` Pranit Bauva
2016-04-14 22:12 2% [PATCH] ll-merge: fix typo in comment Junio C Hamano
2016-04-18 22:48 3% What's cooking in git.git (Apr 2016, #05; Mon, 18) Junio C Hamano
2016-04-21 22:20 3% What's cooking in git.git (Apr 2016, #06; Thu, 21) Junio C Hamano
2016-04-25 22:43 3% What's cooking in git.git (Apr 2016, #07; Mon, 25) Junio C Hamano
2016-04-29 22:04 2% [ANNOUNCE] Git v2.8.2 Junio C Hamano
2016-04-29 22:04 2% What's cooking in git.git (Apr 2016, #08; Fri, 29) Junio C Hamano
2016-05-03 22:49 3% What's cooking in git.git (May 2016, #01; Tue, 3) Junio C Hamano
2016-05-06 22:46 3% What's cooking in git.git (May 2016, #02; Fri, 6) Junio C Hamano
2016-05-09 23:00 3% What's cooking in git.git (May 2016, #03; Mon, 9) Junio C Hamano
2016-05-11 22:13 3% What's cooking in git.git (May 2016, #04; Wed, 11) Junio C Hamano
2016-05-13 22:11 3% What's cooking in git.git (May 2016, #05; Fri, 13) Junio C Hamano
2016-05-17 22:47 2% What's cooking in git.git (May 2016, #06; Tue, 17) Junio C Hamano
2016-05-23 23:23 3% [ANNOUNCE] Git v2.9.0-rc0 Junio C Hamano
2016-05-31 21:53 3% [ANNOUNCE] Git v2.9.0-rc1 Junio C Hamano
2016-06-07 5:57 2% [ANNOUNCE] Git v2.9.0-rc2 Junio C Hamano
2016-06-13 19:45 2% [ANNOUNCE] Git v2.9.0 Junio C Hamano
2017-03-03 23:26 2% What's cooking in git.git (Mar 2017, #02; Fri, 3) Junio C Hamano
2017-03-08 23:47 2% What's cooking in git.git (Mar 2017, #03; Wed, 8) Junio C Hamano
2017-03-10 23:03 2% What's cooking in git.git (Mar 2017, #04; Fri, 10) Junio C Hamano
2017-03-13 22:43 2% What's cooking in git.git (Mar 2017, #05; Mon, 13) Junio C Hamano
2017-03-14 23:35 What's cooking in git.git (Mar 2017, #06; Tue, 14) Junio C Hamano
2017-03-14 23:39 2% ` Junio C Hamano
2017-04-20 20:52 2% [BUG] test suite broken with GIT_TEST_SPLIT_INDEX Thomas Gummerer
2017-04-20 21:03 0% ` Christian Couder
2017-04-20 21:24 0% ` Thomas Gummerer
2017-05-23 8:08 What's cooking in git.git (May 2017, #07; Tue, 23) Junio C Hamano
2017-05-23 19:08 ` Stefan Beller
2017-05-23 19:38 ` Stefan Beller
2017-05-23 19:50 ` Ævar Arnfjörð Bjarmason
2017-05-25 3:42 2% ` Junio C Hamano
2017-05-25 5:42 0% ` Stefan Beller
2017-05-30 17:30 [PATCH 00/33] object id conversion (grep and diff) Brandon Williams
2017-06-02 1:34 ` Junio C Hamano
2017-06-02 5:08 ` Junio C Hamano
2017-06-02 7:19 ` Junio C Hamano
2017-06-02 18:22 ` Brandon Williams
2017-06-02 23:35 3% ` Junio C Hamano
2017-06-05 19:42 0% ` Brandon Williams
2017-07-14 14:44 [PATCH v6 00/10] The final building block for a faster rebase -i Johannes Schindelin
2017-07-20 21:38 2% ` Junio C Hamano
2017-07-22 11:44 0% ` Johannes Schindelin
2017-07-25 15:09 [RFC] Git rerere and non-conflicting changes during conflict resolution Raman Gupta
2017-07-25 17:52 ` Jeff King
2017-07-25 20:26 3% ` Junio C Hamano
2017-07-25 20:40 2% ` Junio C Hamano
2017-07-25 20:58 2% ` Jeff King
2017-07-26 7:14 3% ` Junio C Hamano
2017-07-27 21:01 3% ` Junio C Hamano
2017-07-26 8:06 3% ` Junio C Hamano
2017-09-05 21:01 2% [PATCH] builtin/merge: honor commit-msg hook for merges Stefan Beller
2017-09-05 21:38 0% ` Junio C Hamano
2017-09-05 23:29 2% ` [PATCHv2] " Stefan Beller
2017-09-07 22:04 2% ` [PATCHv3] " Stefan Beller
2017-11-14 9:31 [PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null Johan Herland
2017-11-14 16:17 2% ` [PATCH] notes: send "Automatic notes merge failed" messages to stderr Todd Zullinger
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).