Re: [PATCH] rebase: use reflog to find common base with upstream

2013-10-21 Thread Martin von Zweigbergk
On Mon, Oct 21, 2013 at 4:24 AM, John Keeping wrote: > On Sun, Oct 20, 2013 at 10:03:29PM -0700, Martin von Zweigbergk wrote: >> On Wed, Oct 16, 2013 at 11:53 AM, John Keeping wrote: >> > Commit 15a147e (rebase: use @{upstream} if no upstream specified, >> > 2011-02-09) says: >> > >> > Ma

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Mandeep Sandhu
On Tue, Oct 22, 2013 at 11:30 AM, Bryan Turner wrote: > A quick glance at your command line and the man page for git rebase > suggests the problem was you didn't actually use --onto. I believe the > correct command would be: > > git rebase --onto dev stable topicA Yes, thats the cmd I gave. (miss

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Mandeep Sandhu
>> $ git rebase dev stable topicA >> (this was suggested in the manpage as well). > > > I guess you also had an "--onto" in there, as the above would throw a syntax > error. As long as the branches are in order, I cannot see how that wouldn't > do what you wanted. Yes, you're right. There was "--o

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Peter Krefting
Mandeep Sandhu: Here's what I did when I was in topicA: $ git rebase dev stable topicA (this was suggested in the manpage as well). I guess you also had an "--onto" in there, as the above would throw a syntax error. As long as the branches are in order, I cannot see how that wouldn't do wha

Re: Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Bryan Turner
A quick glance at your command line and the man page for git rebase suggests the problem was you didn't actually use --onto. I believe the correct command would be: git rebase --onto dev stable topicA That should start by determining which commits are one topicA but not stable and then checkout

Re: [PATCH] rebase: use reflog to find common base with upstream

2013-10-21 Thread Martin von Zweigbergk
On Wed, Oct 16, 2013 at 11:53 AM, John Keeping wrote: > Commit 15a147e (rebase: use @{upstream} if no upstream specified, > 2011-02-09) says: > > Make it default to 'git rebase @{upstream}'. That is also what > 'git pull [--rebase]' defaults to, so it only makes sense that >

Moving commits from one branch to another (improving my git fu!)

2013-10-21 Thread Mandeep Sandhu
Hi All, I'm in a bit of a pickle! :) So I've come to ask for help from the guru's here. My story is not unique but somehow the various suggested solutions don't seem to work in my case. * I was working on a feature which was supposed to be done off our 'dev' branch. But instead I forgot and bran

Re: Bug report: OS X git-merge deletes recapitalized files when rename detection fails

2013-10-21 Thread Dan Fabulich
Eric, are you still investigating this bug? (I note that your reply, which cc:ed the list, doesn't seem to have been mailed out to the list, or added to mailing list archives.) On Oct 10, 2013, at 17:13 , Eric Boxer wrote: > I'm on it and I'll follow up shortly. > > > On Thu, Oct 10, 2013 at

Наичистейшая плодотворность

2013-10-21 Thread julia-simina
английский за месяцочек http://bsurface.com/templates/atomic/eiugh.htm N▀╖╡ФЛr╦⌡yЗХ ьb╡X╛╤г╖vь^√)ч╨{.nг+┴╥═┼ь╖╤⌡║э╗}╘·╡ф═zз&j:+v┴╗╬╚▒ЙГzZ+─й+zfё╒╥h  ┬╖~├╜├шiЪШЮz╧╝w╔╒╦?≥╗Х╜з&╒)ъ╒f

Re: RFE: support change-id generation natively

2013-10-21 Thread Shawn Pearce
On Mon, Oct 21, 2013 at 11:40 AM, wrote: > > On Mon, Oct 21, 2013, at 02:29 PM, Thomas Koch wrote: >> As I understand, a UUID could also be used for the same purbose as the >> change- >> id. How is the change-id generated by the way? Would it be a good english >> name >> to call it enduring commi

Re: RFE: support change-id generation natively

2013-10-21 Thread Shawn Pearce
On Mon, Oct 21, 2013 at 9:38 AM, Ondřej Bílka wrote: > On Mon, Oct 21, 2013 at 09:35:07AM -0700, Shawn Pearce wrote: >> On Mon, Oct 21, 2013 at 8:41 AM, wrote: >> > The change-id is exactly like a commit-id, it is an SHA-1 value, but it >> > is a constant embedded in the commit message. >> >> ht

[PATCH v2] git-svn docs: Use tabs consistently within the ascii doc

2013-10-21 Thread Stefan Beller
While I can understand 4 or 7 white spaces are fancy, we'd rather want to use tabs throughout the whole document. Signed-off-by: Stefan Beller --- Keshav, thanks for the review. I am answering late, because my mails regarding git are sorted automatically, whether these include me personally or

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-21 Thread Jeff King
On Mon, Oct 21, 2013 at 03:14:39PM -0400, Jeff King wrote: > On Mon, Oct 21, 2013 at 09:07:26PM +0200, Erik Faye-Lund wrote: > > > I would argue that this is probably even a bug on Linux, only harder > > (if not impossible) to trigger by accident as there's probably no > > git-client that will ge

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-21 Thread Jeff King
On Mon, Oct 21, 2013 at 09:07:26PM +0200, Erik Faye-Lund wrote: > I would argue that this is probably even a bug on Linux, only harder > (if not impossible) to trigger by accident as there's probably no > git-client that will generate such trees. But a "malicious" client > might. I've just been p

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-21 Thread Erik Faye-Lund
On Mon, Oct 21, 2013 at 9:02 PM, Johannes Sixt wrote: > Am 21.10.2013 03:31, schrieb Duy Nguyen: >> On Mon, Oct 21, 2013 at 12:57 AM, Antoine Pelisse wrote: >>> My main motive was to not *stop* the process when a long path is met. >>> Because somebody created a repository on Linux with a long fil

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-21 Thread Johannes Sixt
Am 21.10.2013 03:31, schrieb Duy Nguyen: > On Mon, Oct 21, 2013 at 12:57 AM, Antoine Pelisse wrote: >> My main motive was to not *stop* the process when a long path is met. >> Because somebody created a repository on Linux with a long file-name >> doesn't mean you should not be able to clone it *a

Re: [git-users] Problem using detached worktrees with commands implemented in scripts

2013-10-21 Thread Dale R. Worley
> From: Junio C Hamano > > ... it's not clear why GIT_WORK_TREE exists, ... > > The configuration item came _way_ later than the environment, and we > need to keep users and scripts from old world working, that is why. OK, that explains a great deal. IIRC, I first became aware that detached wo

Re: RFE: support change-id generation natively

2013-10-21 Thread Martin Fick
On Monday, October 21, 2013 12:40:58 pm james.mo...@gitblit.com wrote: > On Mon, Oct 21, 2013, at 02:29 PM, Thomas Koch wrote: > > As I understand, a UUID could also be used for the same > > purbose as the change- > > id. How is the change-id generated by the way? Would it > > be a good english na

Re: [PATCH 2/2] t5570: Update for clone-progress-to-stderr branch

2013-10-21 Thread Jeff King
On Mon, Oct 21, 2013 at 01:54:12PM -0400, Brian Gernhardt wrote: > git clone now reports its progress to standard error, which throws off > t5570. Using test_i18ngrep instead of test_cmp allows the test to be > more flexible by only looking for the expected error and ignoring any > other output f

Re: RFE: support change-id generation natively

2013-10-21 Thread james . moger
On Mon, Oct 21, 2013, at 02:29 PM, Thomas Koch wrote: > As I understand, a UUID could also be used for the same purbose as the > change- > id. How is the change-id generated by the way? Would it be a good english > name > to call it enduring commit identifier? Here is the algorithm: https://git.

Re: [PATCH] diff: Add diff.orderfile configuration variable

2013-10-21 Thread Jonathan Nieder
Hi, Anders Waldenborg wrote: > diff.orderfile acts as a default for the -O command line option. > > Signed-off-by: Anders Waldenborg Thanks. [...] > --- a/Documentation/diff-config.txt > +++ b/Documentation/diff-config.txt > @@ -98,6 +98,10 @@ diff.mnemonicprefix:: > diff.noprefix:: > If se

Re: RFE: support change-id generation natively

2013-10-21 Thread Thomas Koch
On Monday, October 21, 2013 05:41:59 PM james.mo...@gitblit.com wrote: > The change-id is exactly like a commit-id, it is an SHA-1 value, but it > is a constant embedded in the commit message. As I understand, a UUID could also be used for the same purbose as the change- id. How is the change-id g

[PATCH 2/2] t5570: Update for clone-progress-to-stderr branch

2013-10-21 Thread Brian Gernhardt
git clone now reports its progress to standard error, which throws off t5570. Using test_i18ngrep instead of test_cmp allows the test to be more flexible by only looking for the expected error and ignoring any other output from the program. Signed-off-by: Brian Gernhardt --- t/t5570-git-daemon.

[PATCH 1/2] t5570: Update for symref capability

2013-10-21 Thread Brian Gernhardt
git-daemon now uses the symref capability to send the correct HEAD reference, so the test for that in t5570 now passes. Signed-off-by: Brian Gernhardt --- t/t5570-git-daemon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index

Contact Needed

2013-10-21 Thread Luke Brugh
Would I be able to get the contact info of whoever is in charge of updating this resource page? http://gist.github.com/mimiflynn/4612084 We have a helpful online guide on STDs that we think could be a useful addition to this resource page. http://www.datingwebsites.org/guide-to-sexually-transmi

Re: [PATCH 1/2] Add password parameter to git svn commands and use it when provided instead of defaulting to end-user prompt

2013-10-21 Thread arnaud brejeon
I played with GIT_ASKPASS and managed to get a fully automated behavior without any user prompt. I guess that the patches are not necessary as we can provide the same , it is just less straightforward than direct parameters but I understand the security concerns. I dont know if you plan to keep

Re: RFE: support change-id generation natively

2013-10-21 Thread Ondřej Bílka
On Mon, Oct 21, 2013 at 09:35:07AM -0700, Shawn Pearce wrote: > On Mon, Oct 21, 2013 at 8:41 AM, wrote: > > The change-id is exactly like a commit-id, it is an SHA-1 value, but it > > is a constant embedded in the commit message. > > https://gerrit-review.googlesource.com/Documentation/user-chan

Re: RFE: support change-id generation natively

2013-10-21 Thread Shawn Pearce
On Mon, Oct 21, 2013 at 8:41 AM, wrote: > The change-id is exactly like a commit-id, it is an SHA-1 value, but it > is a constant embedded in the commit message. https://gerrit-review.googlesource.com/Documentation/user-changeid.html goes into more detail about these. > Commit-ids change all th

Re: RFE: support change-id generation natively

2013-10-21 Thread james . moger
The change-id is exactly like a commit-id, it is an SHA-1 value, but it is a constant embedded in the commit message. Why does Gerrit need this value? Gerrit is based on the concept of revising/polishing a commit or a series of commits. For clarity, consider the case of revising a proposed bug fi

Re: RFE: support change-id generation natively

2013-10-21 Thread Jeremy Rosen
for those of us that are not using gerrit... what is a change-id (semantically, I got from your mail that it is some sort of unit id set at commit time) and in what way is it different from the commit-id ? Cordialement Jérémy Rosen +33 (0)1 42 68 28 04 fight key loggers : write some perl usi

RFE: support change-id generation natively

2013-10-21 Thread james . moger
Hello Git Community, TL;DR: It would be a really nice enhancement if the commit command natively supported _optionally_ injecting a "Change-Id: I000..." footer in the last paragraph of the commit message template and then substituting the "I000..." value, on commit, with a generated value _without

Re: [PATCH] rebase: use reflog to find common base with upstream

2013-10-21 Thread John Keeping
On Sun, Oct 20, 2013 at 10:03:29PM -0700, Martin von Zweigbergk wrote: > On Wed, Oct 16, 2013 at 11:53 AM, John Keeping wrote: > > Commit 15a147e (rebase: use @{upstream} if no upstream specified, > > 2011-02-09) says: > > > > Make it default to 'git rebase @{upstream}'. That is also what

[PATCH] diff: Add diff.orderfile configuration variable

2013-10-21 Thread Anders Waldenborg
diff.orderfile acts as a default for the -O command line option. Signed-off-by: Anders Waldenborg --- Documentation/diff-config.txt | 4 +++ diff.c| 5 +++ t/t4056-diff-order.sh | 74 +++ 3 files changed, 83 insertions(+)

Ihre Lieblings-Schuhe

2013-10-21 Thread Ruende
Heutzutage gibt es zahlreiche Arten sportlichen Schuhe in die Märkte. Dennoch ist eine besondere verbreitet eine Person Ihrer Nike Turnschuhe. Sie können in Videospielen verwendet werden tragen, da in Form wie über Durchschnitt don . Dieser Marke ist sehr beliebt bei , dass die jungen Generationen

Re: [RFC PATCH] During a shallow fetch, prevent sending over unneeded objects

2013-10-21 Thread Matthijs Kooijman
Hi Duy, I saw your patch series got accepted in git master a while back, great! Since I hope to be using the fixed behaviour soon, what was the plan for including it? Am I correct in thinking that git master will become 1.8.5 in a while? Would this series perhaps be considered for backporting to 1