Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
On Sat, Nov 28, 2015 at 05:09:32PM +, 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
On Sat, Nov 28, 2015 at 11:35:43AM -0500, Jeff King wrote:
> On Sat, Nov 28, 2015 at 03:40:10PM +, brian m. carlson wrote:
>
> > On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote:
> > > What's cooking in git.git (Nov 2015, #04; Tue, 24)
> > > --
> > > [New Topics]
> >
> > I noticed the object_id series was missing from this list. Was there
> > something that needed fixing or a reroll?
>
> Thanks for bringing this up; I meant to send a note but forgot.
>
> 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.
-%<-
diff --git a/builtin/ff-refs.c b/builtin/ff-refs.c
index ae68cfbc..c9d37092 100644
--- a/builtin/ff-refs.c
+++ b/builtin/ff-refs.c
@@ -84,19 +84,19 @@ static void do_ref_update(struct ff_ref_data *data, struct
ff_ref_details *detai
set_git_dir(details->wt->git_dir);
read_index(&the_index);
- if (checkout_fast_forward(details->branch_commit->object.sha1,
- details->upstream_commit->object.sha1, 1))
+ if
(checkout_fast_forward(details->branch_commit->object.oid.hash,
+ details->upstream_commit->object.oid.hash, 1))
details->result_type = NON_FAST_FORWARD;
- else if (update_ref("ff-refs", refname,
details->upstream_commit->object.sha1,
- details->branch_commit->object.sha1, 0,
UPDATE_REFS_QUIET_ON_ERR)) {
+ else if (update_ref("ff-refs", refname,
details->upstream_commit->object.oid.hash,
+ details->branch_commit->object.oid.hash, 0,
UPDATE_REFS_QUIET_ON_ERR)) {
details->result_type = UNABLE_TO_UPDATE;
run_hook_le(NULL, "post-merge", "0", NULL);
}
discard_index(&the_index);
chdir(path.buf);
strbuf_release(&path);
- } else if (update_ref("ff-refs", refname,
details->upstream_commit->object.sha1,
- details->branch_commit->object.sha1, 0,
UPDATE_REFS_QUIET_ON_ERR))
+ } else if (update_ref("ff-refs", refname,
details->upstream_commit->object.oid.hash,
+ details->branch_commit->object.oid.hash, 0,
UPDATE_REFS_QUIET_ON_ERR))
details->result_type = UNABLE_TO_UPDATE;
}
@@ -207,7 +207,7 @@ static int analize_refs(const char *refname,
details->upstream_commit);
details->merge_base = bases->item;
- if (!hashcmp(upstream_hash,
details->merge_base->object.sha1))
+ if (!hashcmp(upstream_hash,
details->merge_base->object.oid.hash))
details->result_type = UP_TO_DATE;
else if (!in_merge_bases(details->branch_commit,
details->upstream_commit))
diff --git a/merge-recursive.c b/merge-recursive.c
index 09d99640..50a16ebf 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1835,8 +1835,8 @@ int merge_trees(struct merge_options *o,
if (code != 0) {
if (o->gently)
return error(_("merging of trees %s and %s failed"),
- sha1_to_hex(head->object.sha1),
- sha1_to_hex(merge->object.sha1));
+ oid_to_hex(&head->object.oid),
+ oid_to_hex(&merge->object.oid));
if (show(o, 4) || o->call_depth)
die(_("merging of trees %s and %s failed"),
-%<-
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: PGP signature
Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
On Sat, Nov 28, 2015 at 03:40:10PM +, brian m. carlson wrote: > On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > > What's cooking in git.git (Nov 2015, #04; Tue, 24) > > -- > > [New Topics] > > I noticed the object_id series was missing from this list. Was there > something that needed fixing or a reroll? Thanks for bringing this up; I meant to send a note but forgot. 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. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > What's cooking in git.git (Nov 2015, #04; Tue, 24) > -- > [New Topics] I noticed the object_id series was missing from this list. Was there something that needed fixing or a reroll? -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 signature.asc Description: PGP signature
Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
On Wed, Nov 25, 2015 at 10:13:42AM +, John Keeping wrote: > On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > > * jk/send-email-ssl-errors (2015-11-24) 1 commit > > - send-email: enable SSL level 1 debug output > > > > Improve error reporting when SMTP TLS fails. > > > > Will merge to 'next'. > > Can you hold off on this one? I think my last-minute change not to > switch on --smtp-debug has introduced a Perl warning that needs to be > suppressed. Sure. Thanks for letting me know. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > * jk/send-email-ssl-errors (2015-11-24) 1 commit > - send-email: enable SSL level 1 debug output > > Improve error reporting when SMTP TLS fails. > > Will merge to 'next'. Can you hold off on this one? I think my last-minute change not to switch on --smtp-debug has introduced a Perl warning that needs to be suppressed. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
What's cooking in git.git (Nov 2015, #04; Tue, 24)
What's cooking in git.git (Nov 2015, #04; Tue, 24) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Lots of little topics, most of which should go to maint/master fairly quickly (actually, writing this I just realized that several of them which I've annotated as "merge to master" can go to maint. I'm out of time for today, so I'll fix that up in the next cycle). There are a few topics which need review, especially from subsystem folks. In some cases, they may simply need an Ack that the most recent version of a series is OK. You can find the normal integration branches at: https://github.com/git/git/ and all topic branches at: https://github.com/peff/git/ But note that I will _not_ be pushing to kernel.org. -- [New Topics] * bb/merge-marker-crlf (2015-11-24) 1 commit - merge-file: consider core.crlf when writing merge markers Write out merge markers using system end-of-line convention. Waiting for a re-roll to handle gitattributes. * cb/ssl-config-pathnames (2015-11-24) 1 commit (merged to 'next' on 2015-11-24 at 658a9c9) + http: treat config options sslCAPath and sslCAInfo as paths Allow tilde-expansion in some http config variables. Will merge to 'master'. * dk/gc-more-wo-pack (2015-11-24) 3 commits - gc: Clean garbage .bitmap files from pack dir - t5304: Add test for .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 review. * dt/http-range (2015-11-11) 1 commit (merged to 'next' on 2015-11-24 at d342999) + http: fix some printf format warnings Portability fix for a topic already in 'master'. Will merge to 'master'. * jk/send-email-ssl-errors (2015-11-24) 1 commit - send-email: enable SSL level 1 debug output Improve error reporting when SMTP TLS fails. Will merge to 'next'. * mg/doc-word-diff-example (2015-11-24) 1 commit (merged to 'next' on 2015-11-24 at 5ba28db) + Documentation/diff: give --word-diff-regex=. example Will merge to 'master'. * mr/ff-refs (2015-11-24) 5 commits - 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. * 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. Waiting for review. * rm/subtree-unwrap-tags (2015-11-24) 1 commit - contrib/subtree: unwrap tag refs Waiting for review from subtree folks. * sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits (merged to 'next' on 2015-11-24 at ac6eb1c) + bash prompt: indicate dirty index even on orphan branches + bash prompt: remove a redundant 'git diff' option + bash prompt: test dirty index and worktree while on an orphan branch Produce correct "dirty" marker for shell prompts, even when we are on an orphan branch. Will cook in 'next', then merge to 'master'. * sg/filter-branch-dwim-ambiguity (2015-11-24) 1 commit (merged to 'next' on 2015-11-24 at fe596a6) + filter-branch: deal with object name vs. pathname ambiguity in tree-filter Fix for a corner case in filter-branch. Will merge to 'master'. * sg/sh-require-clean-orphan (2015-11-24) 2 commits - sh-setup: make require_clean_work_tree() work on orphan branches - Add tests for git-sh-setup's require_clean_work_tree() Allow users of git-sh-setup to handle orphan branch state. This series takes the conservative route of requiring scripts to opt into the looser behavior, at the expense of carrying around a new option-flag forever. I'm not sure if we need to do so. Comments welcome. Will merge to 'next' in a few days. * tb/ls-files-eol (2015-11-24) 1 commit - ls-files: Add eol diagnostics Add options to ls-files to help diagnose end-of-line problems. This latest round hasn't gotten any review yet. Waiting for review. -- [Graduated to "master"] * fp/subtree-todo-update (2015-11-06) 1 commit (merged to 'next' on 20
