I've been browsing StackOverflow answering git-related questions, and
ran across this one:
http://stackoverflow.com/questions/13300675/git-merge-rename-conflict
It's a bit of an interesting situation. The user did a couple of
renames in a branch:
foo.txt = fooOld.txt
fooNew.txt =
Jeff King venit, vidit, dixit 08.11.2012 21:09:
On Fri, Nov 02, 2012 at 03:43:24PM +0100, Michael J Gruber wrote:
It seems that our fast-import is super picky with regards to author
names. I've encountered author names like
Foo Barfoo@dev.null
Foo Bar foo@dev.null
foo@dev.null
On Fri, 09 Nov 2012 04:10:31 -0500, John Szakmeister j...@szakmeister.net
wrote:
I've been browsing StackOverflow answering git-related questions, and
ran across this one:
http://stackoverflow.com/questions/13300675/git-merge-rename-conflict
It's a bit of an interesting situation. The
On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky tomas.carne...@gmail.com wrote:
[snip]
When merging two branches, git only looks at the tips. It doesn't inspect
their histories to see how the files were moved around. So i doesn't matter
whether you rename the files in a single commit or multiple
On Fri, Nov 9, 2012 at 5:25 PM, John Szakmeister j...@szakmeister.net wrote:
On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky tomas.carne...@gmail.com
wrote:
[snip]
When merging two branches, git only looks at the tips. It doesn't inspect
their histories to see how the files were moved around.
Intent-to-add entries used to forbid writing trees so it was not a
problem. After commit 3f6d56d (commit: ignore intent-to-add entries
instead of refusing - 2012-02-07), an index with i-t-a entries can
write trees. However, the commit forgets to invalidate all paths
leading to i-t-a entries. With
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/cache-tree.c b/cache-tree.c
index 28ed657..30a8018 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -381,6 +381,9 @@ int cache_tree_update(struct cache_tree *it,
i = update_one(it, cache, entries, , 0, flags);
if (i
Am 11/9/2012 11:25, schrieb John Szakmeister:
On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky tomas.carne...@gmail.com
wrote:
[snip]
When merging two branches, git only looks at the tips. It doesn't inspect
their histories to see how the files were moved around. So i doesn't matter
whether
hi,
i've always been annoyed by having to type — or copy paste — paths when i
wanted to simply add some files to the index. i know about the `add -i`
interface, and that improves things a little, but having bash completion for so
many other things it still seemed to much hassle.
so here's a
Use of uninitialized value $u in substitution (s///) at
/usr/local/Cellar/git/1.8.0/lib/Git/SVN.pm
line 106.
Use of uninitialized value $u in concatenation (.) or string at
/usr/local/Cellar/git/1.8.0/lib/Git/SVN.pm line 106.
refs/remotes/svn/asset-manager-redesign: 'svn+ssh://IP address'
Gee. How cleaver. A spam email outing a spam web site. IMNSHO, anybody who
doesn't use their real name is most likely a troll or spammer.
--
John McKown
Systems Engineer IV
IT
Administrative Services Group
HealthMarkets(r)
9151 Boulevard 26 * N. Richland Hills * TX 76010
(817) 255-3225 phone
Hi all,
I'm running a couple of conversions from SVN to git, using a slightly
hacked version of svn2git (because it can cope with multiple branches
and is several orders of magnitude faster than git-svn).
Anyway, when doing some verification runs, using the same version of
svn2git, but different
Jonathon Mah jmah at me.com writes:
Nathan,
I find myself performing similar actions to you: using git add -p to stage
hunks, sometimes editing the
staged patch; and keeping mental notes of things I wanted to revert,
sometimes
changing them in the editor
in another window, and
Ulrich Spörlein u...@spoerlein.net writes:
Two questions:
1. Can we impose a stable ordering of the commits being recorded in a
merge commit? Listing parents in chronological order or something like
that.
The order is determined by the order the refs are given to git merge (or
git
On Fri, 2012-11-09 at 16:04:31 +0100, Andreas Schwab wrote:
Ulrich Spörlein u...@spoerlein.net writes:
Two questions:
1. Can we impose a stable ordering of the commits being recorded in a
merge commit? Listing parents in chronological order or something like
that.
The order is
Ulrich Spörlein u...@spoerlein.net writes:
2. Why the hell is the commit hash dependent on the ordering of the
parent commits? IMHO it should sort the set of parents before
calculating the hash ...
What would be the sort key?
Trivially, the hash of the parents itself. So you'd always
On Fri, Nov 09, 2012 at 04:10:31AM -0500, John Szakmeister wrote:
I've been browsing StackOverflow answering git-related questions, and
ran across this one:
http://stackoverflow.com/questions/13300675/git-merge-rename-conflict
It's a bit of an interesting situation. The user did a
On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote:
Ulrich Spörlein u...@spoerlein.net writes:
2. Why the hell is the commit hash dependent on the ordering of the
parent commits? IMHO it should sort the set of parents before
calculating the hash ...
What would be the
On Fri, Nov 09, 2012 at 02:22:27PM +0100, Andreas Zeidler wrote:
so here's a patch adding bash completion on `git add` for modified,
updated and untracked files. i've also set up a pull request — before
i found `Documentation/SubmittingPatches`. fwiw, it's at
Hi,
On Thu, Nov 08, 2012 at 11:34:54PM -0800, Junio C Hamano wrote:
W. Trevor King wk...@tremily.us writes:
By remaining agnostic on the variable usage, this patch makes
submodule setup more convenient for all parties.
I personally do not think remaining agnostic on the usage is a
good
On Wed, Nov 7, 2012 at 9:24 PM, Shawn Pearce spea...@spearce.org wrote:
On Wed, Nov 7, 2012 at 7:35 AM, Josef Wolf j...@raven.inka.de wrote:
When using git-clone over an unreliable link (say, UMTS) and the network goes
down, git-clone deletes everything what was downloaded. When the network
On Thu, Nov 08, 2012 at 08:40:11PM -0800, Junio C Hamano wrote:
Looking at the code before this part:
if (my ($hi, $mi, $lo) = ($key =~ /^([^.]*)\.(.*)\.([^.]*)$/)) {
$key = join(., lc($hi), $mi, lc($lo));
} else {
$key = lc($key);
}
Hi,
On Thu, Nov 08, 2012 at 10:35:13PM -0500, W. Trevor King wrote:
From: W. Trevor King wk...@tremily.us
This makes it easy to access per-submodule variables. For example,
git submodule foreach 'git checkout $(git config --file
$toplevel/.gitmodules submodule.$name.branch) git pull'
On Mon, Oct 29, 2012 at 02:23:27PM +0100, Michael J Gruber wrote:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the arguments to 'replace -d' in the same way.
On Fri, 2012-11-09 at 11:16:47 -0500, Jeff King wrote:
On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote:
Ulrich Spörlein u...@spoerlein.net writes:
2. Why the hell is the commit hash dependent on the ordering of the
parent commits? IMHO it should sort the set of parents
On Sun, Nov 04, 2012 at 09:08:24PM -0600, Chris Rorvick wrote:
Pass all rejection reasons back from transport_push(). The logic is
simpler and more flexible with regard to providing useful feedback.
[...]
void transport_print_push_status(const char *dest, struct ref *refs,
-
On Sun, Nov 04, 2012 at 09:08:23PM -0600, Chris Rorvick wrote:
Patch series to prevent push from updating remote tags w/o forcing them.
Split out original patch to ease review.
Chris Rorvick (5):
push: return reject reasons via a mask
push: add advice for rejected tag reference
Recently git-status learned to display the state of the git
sequencer in long form to help the user remember an interrupted
command. This information is useful to other callers who do
not want it printed in the same way.
Split the new print_state function into separate get_state and
print_state
wt_status_print_state retrieves some sequencer state information via
wt_status_get_state, but other state information it deduces on its
own. Replace these local knowledge deductions with wt_status
variables so we can share more common code in the future.
---
wt-status.c | 16 +---
Teach git-status to report the sequencer state in short form
using a new --sequencer (-S) switch. Output zero or more
simple state token strings indicating the deduced state of the
git sequencer.
Sequencer state info tokens are displayed in short
form. 'git status --short -S' will show the
What's cooking in git.git (Nov 2012, #02; Fri, 9)
--
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 fourth batch of topics has graduated
Tomas Carnecky tomas.carne...@gmail.com writes:
Just idiocy on my part. Thanks.
On Thu, 08 Nov 2012 16:24:36 -0800, bruce bruce.e.robert...@intel.com wrote:
In today's and older clones of https://github.com/mirrors/linux.git I
find this object, 6fa98ea0ae40f9a38256f11e5dc270363f785aee, that I
On Fri, Nov 9, 2012 at 8:23 PM, Jeff King p...@peff.net wrote:
You can find the changes described here in the integration branches of
my repository at:
git://github.com/peff/git.git
It seems that the repo doesn't contain the integration branches?!?
$ git remote add peff
On Fri, Nov 09, 2012 at 09:06:47PM +0100, Ralf Thielow wrote:
It seems that the repo doesn't contain the integration branches?!?
$ git remote add peff git://github.com/peff/git.git
$ git fetch -v peff
From git://github.com/peff/git
* [new branch] maint - peff/maint
*
Jeff King p...@peff.net writes:
I have not been pushing the individual topic branches to make life
easier for people who usually just track Junio's kernel.org repository,
and would not welcome suddenly getting a hundred extra remote branches.
I can make them public if it makes life easier for
(Apologies if this arrives twice. I'm on the road, with somewhat flaky email.)
Because of my work on reposurgeon, I am sometimes asked to produce git
repositories for very old projects that not only are still using CVS
but have ancient releases not in the CVS repository, preserved only
as
On Fri, 09 Nov 2012 11:37:04 -0800, bruce bruce.e.robert...@intel.com wrote:
Tomas Carnecky tomas.carne...@gmail.com writes:
Just idiocy on my part. Thanks.
On Thu, 08 Nov 2012 16:24:36 -0800, bruce bruce.e.robert...@intel.com
wrote:
In today's and older clones of
Unknown unknown@unknown.invalid writes:
I need a command or command sequence that will commit an entire file
tree to a repository...
(a) Allowing me to specify committer and author metadata, and
(b) deleting paths not present in the previous commit on the current
branch, and
(c) allowing
Jeff King p...@peff.net writes:
Comments welcome from people using unusual editors (e.g., a script that
starts an editor in another window then blocks, waiting for the user to
finish).
I often run a shell in Emacs in X, then start git commit in that
shell. $EDITOR is emacsclient
Hi,
On Fri, Nov 9, 2012 at 8:23 PM, Jeff King p...@peff.net wrote:
* fc/fast-export-fixes (2012-11-08) 14 commits
- fast-export: don't handle uninteresting refs
- fast-export: make sure updated refs get updated
- fast-export: fix comparison in tests
- fast-export: trivial cleanup
-
On Sat, Nov 10, 2012 at 12:21:48AM +0100, Felipe Contreras wrote:
* fc/fast-export-fixes (2012-11-08) 14 commits
- fast-export: don't handle uninteresting refs
- fast-export: make sure updated refs get updated
- fast-export: fix comparison in tests
- fast-export: trivial cleanup
On Fri, Nov 09, 2012 at 12:27:35PM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I have not been pushing the individual topic branches to make life
easier for people who usually just track Junio's kernel.org repository,
and would not welcome suddenly getting a hundred
On Sat, Nov 10, 2012 at 1:33 AM, Jeff King p...@peff.net wrote:
On Sat, Nov 10, 2012 at 12:21:48AM +0100, Felipe Contreras wrote:
* fc/fast-export-fixes (2012-11-08) 14 commits
- fast-export: don't handle uninteresting refs
- fast-export: make sure updated refs get updated
-
On Fri, Nov 9, 2012 at 12:38 PM, Jeff King p...@peff.net wrote:
On Sun, Nov 04, 2012 at 09:08:23PM -0600, Chris Rorvick wrote:
Patch series to prevent push from updating remote tags w/o forcing them.
Split out original patch to ease review.
Chris Rorvick (5):
push: return reject reasons
On Fri, Nov 9, 2012 at 11:09 AM, Jeff King p...@peff.net wrote:
[snip]
Right. If the source didn't go away, it would be a copy. We can do copy
detection, but it is not quite as obvious what a merge should do with a
copy (apply the change to the original? To the copy? In both places? You
would
I am somewhat unsure whether it would work this way. After all, there
seems to
be an unbreakable rule with git: never rebase published branches.
I dont see a big problem if you just tell the downstreams to rebase
instead of merge downwards.
That's eg. my default approach for handling things
Let me ask a different question: What is wrong with cherry-picking
downstream changes to your upstream branch? Without rebasing it to
downstream.
Naah, dont rebase the upstream ontop of downstream - this doenst make
any sense (yeah, my devs sometimes doing exatly this wong ;-o).
Instead, as
I'm trying to clone the following repository from Codeplex:
https://git01.codeplex.com/entityframework.git
git downloads all the objects, creates the directory
entityframework,
then displays error: RPC failed; result=56, HTTP code = 200 and
immediately deletes the directory.
I can
The problem is that the 'ignore-paths' approach sometimes
misses commits during a fetch, and then at some later time
will realize it and squash those changes onto some other,
unrelated commit. (I've never seen this happen with the
per-subdir 'fetch'
49 matches
Mail list logo
