Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [RFC][PATCH] Allow transfer of any valid sha1

From: Eric W. Biederman <hidden>
Date: 2016-06-15 22:42:27

Junio C Hamano [off-list ref] writes:
ebiederm@xmission.com (Eric W. Biederman) writes:
quoted
- It feels really weird when everything else allows me to use sha1s
  for git-fetch to deny them.
That is a real argument and I am not opposed to change
fetch-pack to ask for an arbitrary SHA1 the caller obtained out
of band.
Good this was the primary reason I kept pursuing the issue after
I figured out what it was.
quoted
Then there is the big hole in my plan to get better changelog information
that it appears that after Andrew pulls a branch he resolves some
merge conflicts.  If that is right I need to figure out how to address
that before I can improve git-quiltimport.sh.
The last time I talked with Andrew, he is not doing a merge nor
resolving merge conflicts.  He treats git primarily as a
patchbomb distribution mechanism, and works on (a rough
equivalent of) the output of format-patch from merge base
between his base tree and individual subsystem tree.  After that
things are normal quilt workflow outside git, whatever it is.
That sounds right.  I just know that there I had some strange
merge conflicts on the second git tree I pulled from.  Something
about a file being added twice.  It was one thing too many to
investigate this round.

Eric
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help