, name_hash, 0, 0, index_pos, pack,
offset);
display_progress(progress_state, to_pack.nr_objects);
return 1;
}
Much nicer. Thanks for going the extra mile!
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body
to actually make
sha1write's return code mean anything. But I just don't foresee that
happening.
Meh. It hasn't returned a useful value since its introduction in 2005.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
if people find the above workarond a sensible thing to do in
git, I can submit a properly formed patch here too.
If you go this way, please add a comment that explains why we need the
local variable.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe
think it's a terrible choice because it suggests a
transaction between multiple people, which to me sounds like it should
mean push.)
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
variables are unreferenced and then destroyed? I can't find any such
guarantee.
In the absence of such, wouldn't we have to keep $upa in an outer,
separate scope to ensure that $fbat is destroyed first?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git
Ralf Thielow ralf.thie...@gmail.com writes:
The word 'prefix' is currently translated as 'Prefix'
which is not a German word. It should be translated as
'Präfix'.
Indeed :-)
Thanks!
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git
actual
+ test_cmp expect actual
+'
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
triggering the bug with unpatched git-stash.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
The @{-N} syntax always referred to the N-th last thing checked out,
which can be either a branch or a commit (for detached HEAD cases).
However, the documentation only mentioned branches.
Edit in a /commit in the appropriate places.
Reported-by: Kevin i...@ikke.info
Signed-off-by: Thomas Rast t
;
+ autorun_watcher = 1;
+ } else
+ git_config(watcher_config, NULL);
if (autorun_watcher == -1)
autorun_watcher = 0;
}
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line
, and behind the scenes issue all watches up to
the root even if we don't need them for anything other than directory
renames.
Ok, that's probably a confused sum of rambles. Let me know if you can
make any sense of it.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line
, newfd, data, sz) 0;
free(data);
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
strikes a good balance in the complexity of the
protocol and the daemon's state.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
tried
what happens if you point it at a bare though. It *should* fail because
it tries to cd $repo/.git, but if that was itself bare...
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Hi,
This may look intimidating, but it's actually 3.5 separate things:
merge-recursive: remove dead conditional in update_stages()
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: -Xindex-only to leave worktree unchanged
These are unchanged from
pp_commit_list() will be reused later.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
Necessary only for the next patch, which may be of dubious value.
commit.h | 1 +
pretty.c | 40 ++--
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git
From: Thomas Rast tr...@inf.ethz.ch
650467c (merge-recursive: Consolidate different update_stages
functions, 2011-08-11) changed the former argument 'clear' to always
be true. Remove the useless conditional.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
Signed-off-by: Junio C Hamano gits
variants without yet more
special casing. It should also be slightly easier to read because one
does not have to ensure that the flag bits are set in an expected
combination.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
builtin/diff-files.c| 5 +++--
builtin/diff-tree.c | 2 +-
builtin
flags. This commit does not have
to: the commit graph will be loaded anyway, and the room for flags is
already there. As a big plus, this approach also works in a streaming
fashion, showing the first few commits very quickly.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
As indicated
commit will simplify this to a single setting again.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
builtin/diff.c | 3 +--
combine-diff.c | 13 ++---
diff-lib.c | 6 ++
diff.h | 6 +++---
log-tree.c | 2 +-
submodule.c| 5 -
6 files changed, 17
get the _conflicts_ with --index-only,
but not (conveniently) the conflict-hunk formatted files that would
normally be written to the worktree.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
Documentation/merge-strategies.txt | 5 +
merge-recursive.c | 4
merge
From: Thomas Rast tr...@inf.ethz.ch
o-call_depth has a double function: a nonzero call_depth means we
want to construct virtual merge bases, but it also means we want to
avoid touching the worktree. Introduce a new flag o-no_worktree to
trigger only the latter.
Signed-off-by: Thomas Rast tr
From: Thomas Rast tr...@inf.ethz.ch
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/merge
; and the
output is usually much shorter than with -c.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
Documentation/rev-list-options.txt | 7 ++
log-tree.c | 60 +++
merge-recursive.c | 3 +-
merge-recursive.h | 1
Kirill Smelkov k...@mns.spb.ru writes:
Since diff_tree_sha1() can now accept empty trees via NULL sha1, we
could just call it without manually reading trees into tree_desc and
duplicating code.
Cc: Thomas Rast t...@thomasrast.ch
Signed-off-by: Kirill Smelkov k...@mns.spb.ru
---
line
Typänderung:
#: wt-status.c:287
-#, fuzzy
msgid unknown
-msgstr unbekannt:%s
+msgstr unbekannt:
Do we still need the trailing colon?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
.
Sorry for being so procrastinative :-(
I suggest we make it a rule that old projects cannot be proposed from
year to year.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Kastrup d...@gnu.org writes:
Thomas Rast t...@thomasrast.ch writes:
I don't really like 'gesondert eingehängt', how about 'transplantiert'
instead?
I suggest using the actual translation here as it is perfectly fitting
for both literal and figurative meaning: aufgepfropft.
I didn't
when
within 'git bisect run' -- probably there's something funky going on in
the environment, quite possibly in my own configs.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
not be a piece of
advice that is practically very useful, though ;-)
That happens to me a lot, too. Perhaps it would be a clearer signal if
you had an alias (or just something like gitster+patch) that we can send
it to if we mean please include instead of what do you think of this?
--
Thomas
: C
Difficulty: hard
Possible mentors: Thomas Rast and fill in libgit2 expert
--- 8 ---
That absolutely requires a co-mentor from the libgit2 side to do,
however. Perhaps you could talk someone into it? ;-)
Motivation: I believe that migrating to libgit2 is the better approach,
medium term, than
Junio C Hamano gits...@pobox.com writes:
Thomas Rast t...@thomasrast.ch writes:
Downside: not listing code merged as a goal may not make the project
as shiny, neither for Git nor for the student.
I'd actually view that as an upside. This sounds like a good first
step for a feasibility
Duy Nguyen pclo...@gmail.com writes:
On Sun, Feb 9, 2014 at 2:03 AM, Thomas Rast t...@thomasrast.ch wrote:
Easy:
* Add -p 'e' when it fails to apply should offer an obvious way of
starting from the original hunk (not the broken one) or both
If it's too easy, you can add a command
had
bitrotted without anyone noticing. I haven't heard of any heavy users.
I originally wrote them to do some basic test coverage analysis, but
that's about it.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
$sha1, but the new-file is a directory in
the worktree.
Fix it by never reusing a worktree file in the submodule case.
Reported-by: Grégory Pakosz gregory.pak...@gmail.com
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
diff.c | 5 +++--
t/t4020-diff-external.sh | 30
David Kastrup d...@gnu.org writes:
Thomas Rast t...@thomasrast.ch writes:
David Kastrup d...@gnu.org writes:
Looking in the Makefile, I just find support for coverage reports using
gcov. Whatever is there with profile in it seems to be for
profile-based compilation rather than using gprof
, that will not show up in a --cc diff.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
that?
This seems to come up every year or so:
http://thread.gmane.org/gmane.comp.version-control.git/110369/focus=110383
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
David Kastrup d...@gnu.org writes:
Thomas Rast t...@thomasrast.ch writes:
David Kastrup d...@gnu.org writes:
When comparing two branches, decorating the flat diff with the
respectively responsible commits seems like it would be nice to do/have
(the blame on the identical parts, in contrast
. I'm
not completely happy yet -- see the NEEDSWORK comments -- but at
least it gives consistent input to the diffing stage.
This required access to the dir hash, so there's a new patch 7 that
makes this possible.
Patches 1-6 (used to be 1-3 and 6-8) are unchanged.
Thomas Rast (8):
merge
The directory hash (for fast checks if the index already has a
directory) was only used in ignore_case mode and so depended on that
flag.
Make it generally available on request.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
cache.h | 2 ++
name-hash.c | 19 ---
2 files
variants without yet more
special casing. It should also be slightly easier to read because one
does not have to ensure that the flag bits are set in an expected
combination.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
builtin/diff-files.c| 5 +++--
builtin/diff-tree.c | 2 +-
builtin
From: Thomas Rast tr...@inf.ethz.ch
650467c (merge-recursive: Consolidate different update_stages
functions, 2011-08-11) changed the former argument 'clear' to always
be true. Remove the useless conditional.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
Signed-off-by: Junio C Hamano gits
From: Thomas Rast tr...@inf.ethz.ch
o-call_depth has a double function: a nonzero call_depth means we
want to construct virtual merge bases, but it also means we want to
avoid touching the worktree. Introduce a new flag o-no_worktree to
trigger only the latter.
Signed-off-by: Thomas Rast tr
get the _conflicts_ with --index-only,
but not (conveniently) the conflict-hunk formatted files that would
normally be written to the worktree.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
Documentation/merge-strategies.txt | 5 +
merge-recursive.c | 4
merge
From: Thomas Rast tr...@inf.ethz.ch
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/merge
Junio C Hamano gits...@pobox.com writes:
Thomas Rast t...@thomasrast.ch writes:
@@ -2845,8 +2845,9 @@ static struct diff_tempfile *prepare_temp_file(const
char *name,
remove_tempfile_installed = 1;
}
-if (!one-sha1_valid ||
-reuse_worktree_file(name, one
objects will be loosened. Gotta go
soon, didn't really test it, but I bet it'll work.
This looks correct to me.
This comes from abe601bb, right? The change looks correct to me, too.
Ow, sorry about that. Thanks for the fix!
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from
a computer can do beyond
(author, authordate), anyway. Perhaps someone with a clue in UIs --
that's definitely not me -- could make a website where users can
complete or correct the autogenerated mappings to go further.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line
Eric Sunshine sunsh...@sunshineco.com writes:
On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast t...@thomasrast.ch wrote:
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts
Thomas Rast t...@thomasrast.ch writes:
Junio C Hamano gits...@pobox.com writes:
Thomas Rast t...@thomasrast.ch writes:
@@ -2845,8 +2845,9 @@ static struct diff_tempfile *prepare_temp_file(const
char *name,
remove_tempfile_installed = 1;
}
- if (!one-sha1_valid
,
+ (argc - i) * sizeof(char *));
This isn't right -- you are computing the size of things to be moved
based on a type of char*, but 'modes' is an enum.
(Valgrind spotted this.)
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body
+
The microproject idea said
Rewrite diff-no-index.c:read_directory() to use
is_dot_or_dotdot(). Try to find other sites that can use that
function.
Are there any others?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body
);
- free(args);
+ status = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+ argv_array_clear(argv);
return status;
}
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Michael Andreen h...@ruin.nu writes:
The --minimal flag is still there, but didn't want to break scripts
depending on it.
If I specify --no-minimal, does that turn it off again?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body
Ralf Thielow ralf.thie...@gmail.com writes:
Translate 45 new messages came from git.pot update in 5e078fc
(l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)).
Thanks for sending this with extra context, it really helps reviewing!
With the small changes below,
Acked-by: Thomas Rast t
expect expected
test_cmp expected actual
'
Getting rid of these magic removals is a very nice change, thank you.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
not require quoting through an eval?
Please add tests to this patch.
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
of do_replay?
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Fabian Ruch baf...@gmail.com writes:
Hi Thomas,
Thomas Rast writes:
Fabian Ruch baf...@gmail.com writes:
@@ -923,6 +923,8 @@ EOF
;;
esac
+mkdir -p $state_dir || die Could not create temporary $state_dir
+
git var GIT_COMMITTER_IDENT /dev/null ||
die You need to set your
Fabian Ruch baf...@gmail.com writes:
Hi Thomas,
Thomas Rast writes:
Fabian Ruch baf...@gmail.com writes:
Subject: Re: [PATCH v2 08/23] rebase -i: reword executes pre-commit
hook on interim commit
I think the change makes sense, but can you reword the subjects that it
describes the state
Eric Sunshine sunsh...@sunshineco.com writes:
On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast t...@thomasrast.ch wrote:
-static void lazy_init_name_hash(struct index_state *istate)
+void init_name_hash(struct index_state *istate, int force_dir_hash)
{
int nr;
if (istate
that we no longer need
(in 8/8); previously, the insert-only name-hash kept them alive.
- Adaptations to match Duy's changes to cache_tree handling (in 8/8).
Please review the cache_tree handling extra carefully, as I'm not
100% convinced the dance there is all that is needed.
Thomas Rast
From: Thomas Rast tr...@inf.ethz.ch
650467c (merge-recursive: Consolidate different update_stages
functions, 2011-08-11) changed the former argument 'clear' to always
be true. Remove the useless conditional.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
Signed-off-by: Junio C Hamano gits
commit will simplify this to a single setting again.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
builtin/diff.c | 3 +--
combine-diff.c | 13 ++---
diff-lib.c | 6 ++
diff.h | 6 +++---
log-tree.c | 2 +-
submodule.c| 5 -
6 files changed, 17
From: Thomas Rast tr...@inf.ethz.ch
o-call_depth has a double function: a nonzero call_depth means we
want to construct virtual merge bases, but it also means we want to
avoid touching the worktree. Introduce a new flag o-no_worktree to
trigger only the latter.
Signed-off-by: Thomas Rast tr
variants without yet more
special casing. It should also be slightly easier to read because one
does not have to ensure that the flag bits are set in an expected
combination.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
builtin/diff-files.c| 5 +++--
builtin/diff-tree.c | 2 +-
builtin
The directory hash (for fast checks if the index already has a
directory) was only used in ignore_case mode and so depended on that
flag.
Make it generally available on request.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
cache.h | 2 ++
name-hash.c | 13 -
2 files
get the _conflicts_ with --index-only,
but not (conveniently) the conflict-hunk formatted files that would
normally be written to the worktree.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
Documentation/merge-strategies.txt | 5 +
merge-recursive.c | 4
merge
From: Thomas Rast tr...@inf.ethz.ch
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/merge
; and the
output is usually much shorter than with -c.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
Documentation/rev-list-options.txt | 7 +
log-tree.c | 297 +
merge-recursive.c | 3 +-
merge-recursive.h
you want to resurrect this?
The worst part about it is that because we don't have a stderr to rely
on, we can't simply die(stop playing mind games).
Dale R. Worley (1):
git_mkstemps: correctly test return value of open()
Thomas Rast (1):
run-command: dup_devnull(): guard against syscalls
From: Dale R. Worley wor...@alum.mit.edu
open() returns -1 on failure, and indeed 0 is a possible success value
if the user closed stdin in our process. Fix the test.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
wrapper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
dup_devnull() did not check the return values of open() and dup2().
Fix this omission.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
run-command.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/run-command.c b/run-command.c
index aece872..1b7f88e 100644
--- a/run
of beer next time you come near Zurich!
My favorite resolved ambiguity/clunky translation:
-msgstr stellt den angegebenen Eintrag zur Eintragung bereit
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
to the glossary.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[head [limit]]]
-msgstr git cherry [-v] [Übernahmezweig [Arbeitszweig [Limit]]]
+msgstr git cherry [-v] [Upstream [Arbeitsbranch [Limit]]]
Perhaps lose the Arbeits to reduce possible confusion -- AFAICT it is
only used as a direct equivalent of work in worktree.
--
Thomas Rast
trast@{inf,student
(Expose subprojects as special
files to git diff machinery, 2007-04-15), apparently before the
terminology was settled. We can of course not change the patch
format.
Let's at least change the error messages to consistently call them
submodule.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
The existing description reads as if it somehow applies a filter.
Change it to explain that it is merely about the ordering.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
builtin/show-branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/show-branch.c b/builtin
.
-git log -L '/int main/',/^}/:main.c::
+`git log -L '/int main/',/^}/:main.c`::
Shows how the function `main()` in the file 'main.c' evolved
over time.
Ack.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git
Junio C Hamano gits...@pobox.com writes:
Thomas Rast tr...@inf.ethz.ch writes:
I originally had a four-patch series to open 0/1/2 from /dev/null, but
then I noticed that this was shot down in 2008:
http://thread.gmane.org/gmane.comp.version-control.git/93605/focus=93896
The way I recall
we call
sanitize_stdfds() during main git startup.
Since these FDs are inherited, this covers all use of 'git foo ...',
and all internal C commands when called directly. It does not fix
shell/perl commands called directly.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
git.c | 7 +++
1
-by: Thomas Rast tr...@inf.ethz.ch
---
cache.h | 2 ++
daemon.c | 12
setup.c | 12
shell.c | 12 +++-
4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/cache.h b/cache.h
index dd0fb33..f007724 100644
--- a/cache.h
+++ b/cache.h
@@ -425,6 +425,8
Thomas Rast tr...@inf.ethz.ch writes:
From: Dale R. Worley wor...@alum.mit.edu
open() returns -1 on failure, and indeed 0 is a possible success value
if the user closed stdin in our process. Fix the test.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
I see you have this in 'pu' without
Jens Lehmann jens.lehm...@web.de writes:
Am 16.07.2013 20:07, schrieb Jonathan Nieder:
Thomas Rast wrote:
There are only four (with some generous rounding) instances in the
current source code where we speak of subproject instead of
submodule. They are as follows:
[...]
Let's at least
Jonathan Nieder jrnie...@gmail.com writes:
Thomas Rast wrote:
The existing description reads as if it somehow applies a filter.
Change it to explain that it is merely about the ordering.
[...]
OPT_SET_INT(0, date-order, sort_order,
-N_(show commits
eingerichtet. Referenz %s ist mehrdeutig.
These two lines apparently got wrapped by your MUA. There are more
instances of the same damage. Can you send a fixed patch?
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body
blame -L tests
t8001/t8002 (blame): add blame -L :funcname tests
blame-options.txt: place each -L option variation on its own line
blame-options.txt: explain that -L start and end are optional
Thanks, and except for the comment I just sent out,
Acked-by: Thomas Rast tr...@inf.ethz.ch
::
Documentation/git-p4.txt:171:--verbose, -v::
Documentation/git-p4.txt:282:--dry-run, -n::
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
)
l10n: de.po: switch from pure German to German+English (part 3)
Thanks, this one applied cleanly.
Acked-by: Thomas Rast tr...@inf.ethz.ch
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
that to
break is a version mismatch.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
(Expose subprojects as special
files to git diff machinery, 2007-04-15), apparently before the
terminology was settled. We can of course not change the patch
format.
Let's at least change the error messages to consistently call them
submodule.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
Reviewed
The existing description reads as if it somehow applies a filter.
Change it to explain that it is merely about the ordering.
Message-proposed-by: Jonathan Nieder jrnie...@gmail.com
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
builtin/show-branch.c | 4 ++--
1 file changed, 2 insertions(+), 2
git log -L '...:'maiTAB
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
. In any case don't merge anything until we see
that it solves git-imerge's problems, so that it has a user ;-) The next
version will implement a stateless mode too, like Michael asked for
(not writing MERGE_HEAD, etc.).
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list
pathspec (47a5247f), which is -- at this
stage, after rewriting -- the parent.
I suspect to fix this we'll need to separate the real from the
rewritten parents, which might take a bit of work.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git
the
functions appear in the source to correctly specify -L:foo -L:bar or
similarly, -L/foo/,/^}/ -L/bar/,/^}/? What if we supported +/RE/ as the
relative version?
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
1 - 100 of 641 matches
Mail list logo
