Re: Importing from RTC to GIT

2015-02-01 Thread Joker
Its the more or less the same response as I wrote in the stackoverflow thread. To begin with, we run into the same issue... We also wanted to keep our history and didnt found anything. So we started to create a python script, which automates the process to migrate RTC SCM Stream by Stream to GIT.

You will upload it till Sunday evening, February 1

2015-02-01 Thread Rena N. Politi
Dear Authors of Invited Papers in Dubai (UAE), Due to the great success of the WSEAS.org upcoming conferences in Dubai, UAE, Febr 22-24, '15, www.wseas.org, we can accept your INVITED paper provided that you will upload it till Sunday evening, February 1 We remind you that as invited author,

Re: How to rebase one branch of the merge commit?

2015-02-01 Thread Dennis Kaarsemaker
On zo, 2015-02-01 at 19:42 +0100, Hans Ginzel wrote: Hello! Suppose following git history: A–M–C / B How to achieve this with commits metadata preserving? A–M'–C' / B' I did git checkout B git add something_not_in_other_commits git commit --amend So I have B'. How

Re: [PATCH 3/3] CodingGuidelines: describe naming rules for configuration variables

2015-02-01 Thread Jeff King
On Sun, Feb 01, 2015 at 06:12:38AM +0100, Michael Haggerty wrote: + When choosing the variable namespace, do not use variable name for + specifying possibly unbounded set of things, most notably anything + an end user can freely come up with (e.g. branch names), but also + large

How to rebase one branch of the merge commit?

2015-02-01 Thread Hans Ginzel
Hello! Suppose following git history: A–M–C / B How to achieve this with commits metadata preserving? A–M'–C' / B' I did git checkout B git add something_not_in_other_commits git commit --amend So I have B'. How to continue, please? My git version is 1.7.1 (Centos 6.5). Regards Hans --

Re: [PATCH 3/3] CodingGuidelines: describe naming rules for configuration variables

2015-02-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 01/28/2015 11:33 PM, Junio C Hamano wrote: + When choosing the variable namespace, do not use variable name for + specifying possibly unbounded set of things, most notably anything + an end user can freely come up with (e.g. branch

Re: bug patch: exit codes from internal commands are handled incorrectly

2015-02-01 Thread Kenneth Lorber
On Dec 18, 2014, at 2:18 PM, Junio C Hamano gits...@pobox.com wrote: Kenneth Lorber k...@his.com writes: Bug: exit codes from (at least) internal commands are handled incorrectly. E.g. git-merge-file, docs say: The exit value of this program is negative on error, and the number of

[PATCH 2/2] sha1_file: fix iterating loose alternate objects

2015-02-01 Thread Jonathon Mah
The string in 'base' contains a path suffix to a specific object; when its value is used, the suffix must either be filled (as in stat_sha1_file, open_sha1_file, check_and_freshen_nonlocal) or cleared (as in prepare_packed_git) to avoid junk at the end. loose_from_alt_odb (introduced in

[PATCH 1/2] t5710-info-alternate: demonstrate bug in unpacked pruning

2015-02-01 Thread Jonathon Mah
Signed-off-by: Jonathon Mah m...@jonathonmah.com --- t/t5710-info-alternate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh index 5a6e49d..d82844a 100755 --- a/t/t5710-info-alternate.sh +++

Re: [PATCH 3/3] CodingGuidelines: describe naming rules for configuration variables

2015-02-01 Thread Jeff King
On Sun, Feb 01, 2015 at 12:18:34PM -0800, Junio C Hamano wrote: I can see it argued that for things that are completely independent (e.g. the consequence of setting fsck.badDate can never be affected by how fsck.missingTagger is configured), separate configuration variables may not be wrong

Re: [PATCH 3/3] CodingGuidelines: describe naming rules for configuration variables

2015-02-01 Thread Junio C Hamano
Jeff King p...@peff.net writes: From the user's perspective, I don't see how the implied relationships are significantly different. In type 1, they are placed inside a single value and in type 2, they are not. Both are a form of grouping. Moreover, I am not even sure that the syntax is an

RFD: should we do another 2.3-rc for t9001-noxmailer? I'd say not

2015-02-01 Thread Junio C Hamano
I was reviewing the recent bugs and fixes for the last time, and was wondering if we want to do 2.3-rc3 with build fix for those with ancient cURL (tc/curl-vernum-output-broken-in-7.11) and workaround for those with Perl with older Getopt::Long (tc/t9001-noxmailer). - The former is not a

Relative paths don't work in .gitignore as would be expected.

2015-02-01 Thread /#!/JoePea
I have this in my .gitignore: ./*.js I would expect that to cause git to ignore .js files in the same folder as .gitignore, but it doesn't do anything. However, this works: /*.js I'm not sure what this actually means because a leading slash is the root of some filesystem, and we're not in

[RFC PATCH] diff: do not use creation-half of -B as a rename target candidate

2015-02-01 Thread Junio C Hamano
When a commit creates new file B by copying the contents of an existing file A and making a small edit and makes large edit to A, diff -M would not see any copying or renaming, because the file A appears in both preimage and postimage. The output ends up showing two large patches, one that adds

Re: [PATCH] t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

2015-02-01 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: use 5.008; So either that needs to change or the code should properly deal with the version of Getopt::Long that comes with 5.8.0. Since it's really not very difficult or invasive to add support for the no- variants, here's a patch to do so:

Re: [RFC PATCH] diff: do not use creation-half of -B as a rename target candidate

2015-02-01 Thread Stefan Beller
On 01.02.2015 19:18, Junio C Hamano wrote: When a commit creates new file B by copying the contents of an existing file A and making a small edit and makes large edit to A, This part is hard to parse When ... and making a small edit and makes a large edit So large or small? It's a bit hard to

Re: Relative paths don't work in .gitignore as would be expected.

2015-02-01 Thread Stefan Beller
On 01.02.2015 14:51, /#!/JoePea wrote: I have this in my .gitignore: ./*.js I would expect that to cause git to ignore .js files in the same folder as .gitignore, but it doesn't do anything. However, this works: /*.js I'm not sure what this actually means because a leading slash

[PATCH v2] l10n: gitk/ca.po: add Catalan translation

2015-02-01 Thread Alex Henrie
Signed-off-by: Alex Henrie alexhenri...@gmail.com --- The only difference between version 1 and version 2 of this patch is the correction of trailing whitespace in a single message. Please let me know whether this patch is going to be included in Git 2.3.0. gitk-git/po/ca.po | 1349

Re: [PATCH 3/3] CodingGuidelines: describe naming rules for configuration variables

2015-02-01 Thread Michael Haggerty
Junio, Thanks for your thoughtful response. On 02/01/2015 09:18 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: On 01/28/2015 11:33 PM, Junio C Hamano wrote: + When choosing the variable namespace, do not use variable name for + specifying possibly unbounded set

Re: [RFC PATCH] diff: do not use creation-half of -B as a rename target candidate

2015-02-01 Thread Yue Lin Ho
A1 = I am file A. B1 is copied from A1, so B1 = I am file A. B1 changes to B2 = I am file B. A1 changes to A2 = file A is changed a lot, a lot, ..., a lot. At this moment, commit A2 and B2 files. -- View this message in context: