On Wed, Aug 15, 2012 at 1:02 PM, Junio C Hamano gits...@pobox.com wrote:
diff --git a/Documentation/rev-list-options.txt
b/Documentation/rev-list-options.txt
index 6a4b635..9404d08 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -578,16 +578,33 @@
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
On Wed, Aug 15, 2012 at 1:02 PM, Junio C Hamano gits...@pobox.com wrote:
diff --git a/Documentation/rev-list-options.txt
b/Documentation/rev-list-options.txt
index 6a4b635..9404d08 100644
--- a/Documentation/rev-list-options.txt
Junio C Hamano gits...@pobox.com writes:
We could remove it if you find it confusing.
I think the original motivation that line was added was to help
people who see git log (without any frills) output for the first
time not to be alarmed when they see newer things first: In
general, the
If I do git rebase --skip, is there a way to find out the commit SHA
that was skipped (other than just parsing the output of the command) ?
I'd like to modify git-p4 so that it can automatically skip past
conflicting changes, but I'd like it to keep a log of which commits
were skipped.
Thanks,
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
We could remove it if you find it confusing.
I think the original motivation that line was added was to help
people who see git log (without any frills) output for the first
time not to be alarmed when they
---
Documentation/git-pull.txt |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index defb544..67fa5ee 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -101,6 +101,7 @@
Add the possibility of re-reading the index file, if it changed
while reading.
The index file might change during the read, causing outdated
information to be displayed. We check if the index file changed
by using its stat data as heuristic.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
t2104 currently checks for the exact index version 2 or 3,
depending if there is a skip-worktree flag or not. Other
index versions do not use extended flags and thus cannot
be tested for version changes.
Make this test update the index to version 2 at the beginning
of the test. Testing the
Make update-index always rewrite the index when a index-version
is given, even if the index already has the right version.
This option is used for performance testing the writer and
reader.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
builtin/update-index.c | 4 +++-
1 file changed, 3
From: Thomas Rast tr...@student.ethz.ch
Add a performance test for index version [23]/4/5 by using
git update-index --index-version=x, thus testing both the reader
and the writer speed of all index formats.
Signed-off-by: Thomas Rast tr...@student.ethz.ch
Signed-off-by: Thomas Gummerer
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5, conflicts and
resolved data is read at the same time, and the resolve-undo
data is then converted to the in-memory format.
Helped-by:
Since the cache-tree data is saved as part of the directory data,
we already read it at the beginning of the index. The cache-tree
is only converted from this directory data.
The cache-tree data is arranged in a tree, with the children sorted by
pathlen at each node, while the ondisk format is
Write the cache-tree data for the index version 5 file format. The
in-memory cache-tree data is converted to the ondisk format, by adding
it to the directory entries, that were compiled from the cache-entries
in the step before.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5, conflicts and
resolved data is read at the same time, and the resolve-undo
data is then converted to the in-memory format.
Helped-by:
Make git read the index file version 5 without complaining.
This version of the reader doesn't read neither the cache-tree
nor the resolve undo data, but doesn't choke on an index that
includes such data.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Nguyen Thai Ngoc Duy
Make the in-memory format aware of the stat_crc used by index-v5.
It is simply ignored by index version prior to v5.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
cache.h | 1 +
read-cache.c | 25 +
2 files changed, 26 insertions(+)
diff --git a/cache.h
Move index version 2 specific functions to their own file,
to prepare for the addition of a new index file format. With
the split into two files we have the non-index specific
functions in read-cache.c and the index-v2 specific functions
in read-cache-v2.c
Helped-by: Nguyen Thai Ngoc Duy
Add a documentation of the index file format version 5 to
Documentation/technical.
Helped-by: Michael Haggerty mhag...@alum.mit.edu
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Thomas Rast tr...@student.ethz.ch
Helped-by: Nguyen Thai Ngoc Duy pclo...@gmail.com
Helped-by: Robin Rosenberg
On 08/16/2012 10:51 AM, Thomas Rast wrote:
[...]
is misleading. I suppose the real problem is that the true ordering
is completely obvious as the one ordering that does not require
preprocessing, but ugly to specify in words. Perhaps we can bikeshed a
little? How about
By default, commits
Michael Haggerty mhag...@alum.mit.edu writes:
On 08/16/2012 10:51 AM, Thomas Rast wrote:
I suppose the real problem is that the true ordering
is completely obvious as the one ordering that does not require
preprocessing, but ugly to specify in words. Perhaps we can bikeshed a
little? How
Luke Diamand l...@diamand.org writes:
If I do git rebase --skip, is there a way to find out the commit SHA
that was skipped (other than just parsing the output of the command) ?
There currently isn't, and I do not think it is doable in general
when the command ever gives control back to the
On Wed, Aug 15, 2012 at 10:42 PM, Junio C Hamano gits...@pobox.com wrote:
Shawn Pearce spea...@spearce.org writes:
... But I think its worth giving
him a few weeks to finish getting the code ready, vs. rushing
something in that someone else thinks might help. We have waited more
than 6 years
Thomas Rast tr...@student.ethz.ch writes:
Why not turn the behavior on its head:
* Change the default behavior to be something well-defined, easy to
document, and convenient for humans, such as topological order with
ties broken by timestamp or approximate timestamp order, but
respecting
On Wed, Aug 15, 2012 at 08:59:02AM +0200, Thomas Rast wrote:
I have never had a need for a fetch that doesn't update the remote
namespace, nor heard anyone on IRC who has. OTOH, I do have anecdotal
evidence in support of the current state is confusing: this thread, or
the fact that Jan's IRC
Miklos Vajna vmik...@suse.cz writes:
---
Documentation/git-pull.txt |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index defb544..67fa5ee 100644
--- a/Documentation/git-pull.txt
+++
On Wed, Aug 15, 2012 at 12:22:28PM -0700, Junio C Hamano wrote:
The updated rule would be more complex. If a remote nickname is
used, and a refspec given from the command line is without colon, a
new special rule overrides the current behaviour and tries to match
with a configured
On Thu, 16 Aug 2012 07:11:28 -0600
J.V. jvsr...@gmail.com wrote:
We have a central/shared bare repo setup on a Linux box by our
scc/build team.
Each developer pulls/pushes to this repo. I have two windows boxes
where I have cloned the repo. I want to commit and then on my second
On 08/16/2012 02:00 PM, Thomas Rast wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
On 08/16/2012 10:51 AM, Thomas Rast wrote:
I suppose the real problem is that the true ordering
is completely obvious as the one ordering that does not require
preprocessing, but ugly to specify in words.
Hi Junio,
On Wed, Aug 15, 2012 at 07:02:31PM -0700, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
My preference is to remove static int is_executable() function
from help.c, have an...
... I wouldn't mind seeing the implementation of posix_is_executable()
in help.c,
Jeff King p...@peff.net writes:
On Wed, Aug 15, 2012 at 12:22:28PM -0700, Junio C Hamano wrote:
The updated rule would be more complex. If a remote nickname is
used, and a refspec given from the command line is without colon, a
new special rule overrides the current behaviour and tries
From: Jean Tappan
Sent: Thursday, August 16, 2012 12:33 PM
To: 'git@vger.kernel.org'
Subject: Git
I am looking for a tool that will control not only versioning for software, but
also the software's associated user and support manuals. I haven't been able to
find anything that addresses this
I read through gitworkflows and want to use the Merge Upwards rule in my
projects:
Always commit your fixes to the oldest supported branch that require
them. Then (periodically) merge the integration branches upwards into
each other.
This looks great but I have some trouble in the case if I
From: Junio C Hamano gits...@pobox.com
Sent: Thursday, August 16, 2012 5:22 PM
Miklos Vajna vmik...@suse.cz writes:
---
Documentation/git-pull.txt |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index
Miklos Vajna vmik...@suse.cz writes:
On Thu, Aug 16, 2012 at 09:22:14AM -0700, Junio C Hamano gits...@pobox.com
wrote:
I am not sure if this is worth it, as it comes from a natural
abbreviated options support, i.e.
-r|--r|--re|--reb|--reba|--rebas|--rebase)
rebase=true
Philip Oakley philipoak...@iee.org writes:
I wasn't aware of the abbreviated options capability. Is meant to
be in the man pages as I couldn't find it, or is it described
differently?
$ git help gitcli
is the closest that comes to mind.
If it is not reachable from git help git, we may want
Junio C Hamano gits...@pobox.com writes:
We would really think hard to avoid breaking when introducing new
options whose long name could begin with v or q to avoid
breaking -v and -q that are common across commands
[today's lesson for me; do not type while eating]
Sorry.
We would
Patrick Sabin patrick.just4...@gmail.com writes:
I read through gitworkflows and want to use the Merge Upwards rule in
my projects:
Always commit your fixes to the oldest supported branch that require
them. Then (periodically) merge the integration branches upwards into
each other.
This
Johannes Sixt j...@kdbg.org writes:
Are you sure? This adds '-r', not '--r', i.e., the single-letter option
'r', to the documentation, which is not something we want to hide, usually.
I actually think --rebase squatting on short-and-sweet -r was an
accident, and we are saved by not endorsing
Jeff King p...@peff.net writes:
On Tue, Jul 03, 2012 at 11:25:16AM +0700, Nguyen Thai Ngoc Duy wrote:
On Tue, Jul 3, 2012 at 10:45 AM, Jeff King p...@peff.net wrote:
On Tue, Jul 03, 2012 at 12:43:42AM +0200, Andreas Schwab wrote:
Jeff King p...@peff.net writes:
It's very odd for
Jeff King p...@peff.net writes:
On Tue, Jul 17, 2012 at 10:10:25PM -0700, Junio C Hamano wrote:
Ping on a seemingly stalled thread.
Hrm. I could swear that Takeharu sent a follow-up using
pick_one_utf8_char directly that looked OK, but now I can't seem to find
it in the list archives. I
Carlos MartÃn Nieto c...@elego.de writes:
On Tue, 2012-07-17 at 22:56 -0700, Junio C Hamano wrote:
Ping on a seemingly stalled discussion (no need to rush but just
checking).
I've implemented the feedback, but been slacking on writing the tests
which is what's stopped me from re-sending the
Phil Hord phil.h...@gmail.com writes:
So, the next roll will remove the tests for MERGE_RR and will be more
explicit about the potential for mergetool confusion and/or the fact
that it is not explicitly tested here.
I'll wait a little longer for any further comments.
Mild ping to a
Junio C Hamano:
Jeff King p...@peff.net writes:
On Tue, Jul 03, 2012 at 11:25:16AM +0700, Nguyen Thai Ngoc Duy wrote:
On Tue, Jul 3, 2012 at 10:45 AM, Jeff King p...@peff.net wrote:
On Tue, Jul 03, 2012 at 12:43:42AM +0200, Andreas Schwab wrote:
Jeff King p...@peff.net writes:
From: Junio C Hamano gits...@pobox.com
Sent: Thursday, August 16, 2012 9:23 PM
Philip Oakley philipoak...@iee.org writes:
I wasn't aware of the abbreviated options capability. Is meant to
be in the man pages as I couldn't find it, or is it described
differently?
$ git help gitcli
is the
Jundong Xue tomxue0...@gmail.com writes:
tomxue@ubuntu:~/mycode/life$ git todo
* d768da9 - (in the future: 3 hours later) Meeting with vendor
* 5fcd556 - (in the future: 12 days later) Take my personal ho
* 9dd280b - (in the future: 11 months later)
* 4680099 - (in the future: 9 months
Separate the logic to decide which presentation (e.g. N months) to
use based on the length of the time from the present and actual
presentation (i.e. strbuf_addf()). This is not strictly needed
but will make the next step easier to read.
The format strings lost N_() markings along the way; help
Inspired by an earlier patch on the list by Tom Xue, but I think
this is done in a much more maintainable way.
It still remains to be seen if this feature makes sense, though.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
date.c | 27 ++-
t/t0006-date.sh |
Lars Winterfeld lars.winterf...@tu-ilmenau.de writes:
Hrm, has this ever been resolved?
Thank you for asking.
My local git version is 1.7.5.4, the server version that I actually
ended up pushing the files to was however still some 1.6.x.
So it was a false alarm. Sorry about that.
Not
Dan Johnson computerdr...@gmail.com writes:
On Thu, Jul 19, 2012 at 7:55 AM, Jeff King p...@peff.net wrote:
...
So I think it would be a lot more palatable if we kept reflogs on
deleted branches. That, in turn, has a few open issues, such as how to
manage namespace conflicts (e.g., the fact
Alexey Muranov alexey.mura...@gmail.com writes:
On 20 Jul 2012, at 09:11, Johannes Sixt wrote:
...
Note the difference between tracking branch and remote tracking
branch! The remote tracking branches are the refs in the refs/remotes/
hierarchy. The tracking branches are your own local
Junio C Hamano gits...@pobox.com writes:
I like the general direction. Perhaps a long distant future
direction could be to also use the same trick in the ref namespace
so that we can have 'next' branch itself, and 'next/foo', 'next/bar'
forks that are based on the 'next' branch at the same
These patches rework how git p4 deals with conflicts that
arise during a git p4 submit. These may arise due to
changes that happened in p4 since the last git p4 sync.
Luke: I especially wanted to get this out as you suggested
that you had a different way of dealing with skipped commits.
The
Signed-off-by: Pete Wyckoff p...@padd.com
---
t/lib-git-p4.sh | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 2d753ab..482eeac 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -26,9 +26,10 @@ testid=${this_test#t}
Send p4d output to a logfile in the $TRASH_DIRECTORY.
Its messages add no value to testing.
Signed-off-by: Pete Wyckoff p...@padd.com
---
t/lib-git-p4.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 482eeac..edb4033 100644
---
If a commit fails to apply cleanly to the p4 tree, an interactive
prompt asks what to do next. In all cases (skip, apply, write),
the behavior after the prompt had a few problems.
Change it so that it does not claim erroneously that all commits
were applied. Instead list the set of the patches
When a patch failed to apply, these interactive options offered
to:
1) apply the patch anyway, leaving reject (.rej) files around, or,
2) write the patch to a file (patch.txt)
In both cases it suggested to invoke git p4 submit --continue,
an unimplemented option.
While manually fixing
Junio C Hamano schrieb:
Lars Winterfeld lars.winterf...@tu-ilmenau.de writes:
Hrm, has this ever been resolved?
Thank you for asking.
My local git version is 1.7.5.4, the server version that I actually
ended up pushing the files to was however still some 1.6.x.
So it was a false alarm.
When editing the submit template, if no change was made to it,
git p4 offers a prompt Submit anyway?. Answering no cancels
the submit.
Previously, a no answer behaves like a [s]kip answer to the
failed-patch prompt, in that it proceeded to try to apply the
rest of the commits. Instead, put
Test a variety of cases where a patch failed to apply to
p4 and had to be cleaned up.
If the patch failed to apply cleanly, do not try to remove
to-be-added files, as they have not really been added yet.
Signed-off-by: Pete Wyckoff p...@padd.com
---
git-p4.py | 2 -
Put all items in order as they appear, and add comments.
Signed-off-by: Pete Wyckoff p...@padd.com
---
git-p4.py | 29 +
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 13c62c6..0e874cb 100755
--- a/git-p4.py
+++ b/git-p4.py
The user can decide not to continue with a submission,
by not saving the p4 submit template, then answering no to
the Submit anyway? prompt. In this case, be sure to
return the p4 client to its initial state.
Deleted files were not reverted; fix this and test all cases.
Signed-off-by: Pete
The short form -v is common in many git commands as an
alias for --verbose.
Signed-off-by: Pete Wyckoff p...@padd.com
---
Documentation/git-p4.txt | 2 +-
git-p4.py| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-p4.txt
A new option, git p4 submit --dry-run can be used to verify
what commits and labels would be moved into p4.
Signed-off-by: Pete Wyckoff p...@padd.com
---
Documentation/git-p4.txt | 4
git-p4.py| 43 ++-
t/t9807-git-p4-submit.sh | 41
This option can be used to prepare the client workspace for
submission, only. It does not invoke the final p4 submit.
A message describes how to proceed, either submitting the
changes or reverting.
Signed-off-by: Pete Wyckoff p...@padd.com
---
Documentation/git-p4.txt | 7 +++
git-p4.py
Hi Junio,
There is one commit on Swedish translation, and it can be added to the
final 1.7.12 release.
The following changes since commit 61b472ed8b090a3e9240590c85041120a54dd268:
git svn: reset invalidates the memoized mergeinfo caches (2012-08-10
19:53:18 +)
are available in the git
Jeff King p...@peff.net writes:
On Thu, Aug 16, 2012 at 04:05:22PM -0700, Junio C Hamano wrote:
Lars Winterfeld lars.winterf...@tu-ilmenau.de writes:
Hrm, has this ever been resolved?
Thank you for asking.
My local git version is 1.7.5.4, the server version that I actually
ended up
From: Vitaly _Vi Shukela vi0...@gmail.com
Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave
more like Ctrl+T for adding.
They were working only when one area was focused (diff or commit message),
now they should work everywhere.
Signed-off-by: Vitaly _Vi Shukela
Jens Lehmann jens.lehm...@web.de writes:
Am 25.07.2012 20:44, schrieb Junio C Hamano:
Stefan Zager sza...@google.com writes:
Currently, it will only do a checkout if the sha1 registered in the
containing
repository doesn't match the HEAD of the submodule, regardless of whether
the
Junio C Hamano gits...@pobox.com writes:
Robin Rosenberg robin.rosenb...@dewire.com writes:
Just a couple of nitpicks.
Polishing is always good and better late than never, but for a topic
that has long been graduated to 'master' already, it would be easier
to review and discuss if it came
Jeff King p...@peff.net writes:
On Fri, Jul 27, 2012 at 09:29:53AM -0400, Jeff King wrote:
If we put actual files inside x, which git does track, then they would
be part of the stash, and should be properly retained. But they're not:
$ rm x mkdir x echo foo x/file
Now we have some
Erik Faye-Lund kusmab...@gmail.com writes:
On Fri, Jul 27, 2012 at 7:10 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
Since the Windows port of Git expects binary pipes, we need to make
sure the helper-end also sets up binary pipes.
Side-step CRLF-issue in test to make it pass.
On Thu, Aug 16, 2012 at 02:09:33PM -0700, Junio C Hamano gits...@pobox.com
wrote:
The reason I do not think pull -r gives much value to the users to
trigger pull --rebase is because the use of pull --rebase is
very project specific. If you are working on a project that forbids
merges, you
72 matches
Mail list logo
