Am 6/4/2014 5:13, schrieb David Turner:
It is possible to have two branches which are the same but for case.
This works great on the case-sensitive filesystems, but not so well on
case-insensitive filesystems. It is fairly typical to have
case-insensitive clients (Macs, say) with a
Running git update-index --cacheinfo without any further
arguments results in a segfault rather than an error
message. Commit ec160ae (update-index: teach --cacheinfo a
new syntax mode,sha1,path, 2014-03-23) added code to
examine the format of the argument, but forgot to handle the
NULL case.
On 2014-06-04 05.38, David Turner wrote:
[]
[]
diff --git a/Makefile b/Makefile
index a53f3a8..dd2127a 100644
--- a/Makefile
+++ b/Makefile
@@ -1326,6 +1326,11 @@ else
COMPAT_OBJS += compat/win32mmap.o
endif
endif
+ifdef NO_SSE42
+ BASIC_CFLAGS += -DNO_SSE42
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed simply ignore the '\' before the 'n', treating
'\n' as 'n'.
As the test already requires perl as a prerequisite, use perl instead of sed.
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
Add a config option that will cause clone to recurse into submodules as
if the --recurse-submodules option had been specified on the command
line. This can be overridden with the --no-recurse-submodules option.
Signed-off-by: Chris Packham judge.pack...@gmail.com
---
On 04/06/14 09:05, Junio C
On Wed, Jun 4, 2014 at 3:04 PM, Torsten Bögershausen tbo...@web.de wrote:
On 2014-06-04 05.38, David Turner wrote:
[]
[]
diff --git a/Makefile b/Makefile
index a53f3a8..dd2127a 100644
--- a/Makefile
+++ b/Makefile
@@ -1326,6 +1326,11 @@ else
COMPAT_OBJS +=
test_cmp() is primarily meant to compare text files (and display the
difference for debug purposes).
Raw cmp is better suited to compare binary files (tar, zip, etc.).
On MinGW, test_cmp is a shell function mingw_test_cmp that tries to
read both files into environment, stripping CR characters
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use $HOMEDRIVE/$HOMEPATH
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
Hi,
this patch is present in msysGit for 4 years.
Am 04.06.2014 13:42, schrieb Stepan Kasal:
test_cmp() is primarily meant to compare text files (and display the
difference for debug purposes).
Raw cmp is better suited to compare binary files (tar, zip, etc.).
On MinGW, test_cmp is a shell function mingw_test_cmp that tries to
read both
Hello Thomas,
On Wed, Jun 04, 2014 at 02:13:44PM +0200, Thomas Braun wrote:
Wouldn't a function like test_cmp_bin() be better suited for all?
I also considered it. The advantage is that is shows that
this intentionally differs from test_cmp.
The windows folks can then use cmp inside
Hi Stephan,
Am 04.06.2014 14:42, schrieb Stepan Kasal:
On Wed, Jun 04, 2014 at 02:13:44PM +0200, Thomas Braun wrote:
Wouldn't a function like test_cmp_bin() be better suited for all?
I also considered it. The advantage is that is shows that
this intentionally differs from test_cmp.
The
On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote:
@@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...)
void home_config_paths(char **global, char **xdg, char *file)
{
char *xdg_home = getenv(XDG_CONFIG_HOME);
- char *home = getenv(HOME);
+ const char
On Wed, Jun 4, 2014 at 3:55 AM, Pasha Bolokhov pasha.bolok...@gmail.com wrote:
The case when $GIT_DIR points to a _file_ seems uncovered.
setup_git_directory() will transform the file to the directory
internally and we never know the .git file's path (so we can't exclude
it). So people could
On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote:
@@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...)
void home_config_paths(char **global, char **xdg, char *file)
{
char *xdg_home =
On 2014-06-04 13.21, Duy Nguyen wrote:
On Wed, Jun 4, 2014 at 3:04 PM, Torsten Bögershausen tbo...@web.de wrote:
On 2014-06-04 05.38, David Turner wrote:
[]
[]
diff --git a/Makefile b/Makefile
index a53f3a8..dd2127a 100644
--- a/Makefile
+++ b/Makefile
@@ -1326,6 +1326,11 @@ else
On 14-06-03 06:16 PM, Junio C Hamano wrote:
It is misleading to mention that ref that does not store is to
fetch the ref into FETCH_HEAD, because a refspec that does store is
also to fetch the LHS into FETCH_HEAD. It is doubly misleading to
list it as part of short-cut. ref stands for a
On 14-06-03 06:16 PM, Junio C Hamano wrote:
Replace desription of old-style Pull: lines in remotes/
configuration with modern remote.*.fetch variables.
As this note applies only to git pull, enable it only
in git-pull manual page.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Hello,
On Wed, Jun 04, 2014 at 08:47:58PM +0700, Duy Nguyen wrote:
setenv(HOME) if it's missing instead? MinGW port already replaces
main(). Extra initialization should not be a problem.
well, I would be afraid to modify the environment for subprocesses.
It could hit back in certain
Am 04.06.2014 16:05, schrieb Erik Faye-Lund:
On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote:
@@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...)
void home_config_paths(char **global, char **xdg, char
On 14-06-03 06:16 PM, Junio C Hamano wrote:
Since the introduction of opportunisitic updates of remote-tracking
branches, started at around f2690487 (fetch: opportunistically
update tracking refs, 2013-05-11) with a few updates in v1.8.4 era,
the remote.*.fetch configuration always kicks in
On 14-06-03 06:16 PM, Junio C Hamano wrote:
To resurrect a misleading mention removed in the previous step,
add a section to explain how the remote-tracking configuration
interacts with the refspecs given as the command-line arguments.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Hi Duy,
On Wed, 4 Jun 2014, Duy Nguyen wrote:
On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote:
@@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...)
void home_config_paths(char **global, char **xdg, char *file)
{
char *xdg_home = getenv(XDG_CONFIG_HOME);
-
Hi Erik,
On Wed, 4 Jun 2014, Erik Faye-Lund wrote:
On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote:
@@ -133,7 +133,7 @@ char *git_path(const char *fmt, ...)
void home_config_paths(char **global, char
On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Erik,
On Wed, 4 Jun 2014, Erik Faye-Lund wrote:
On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Jun 4, 2014 at 6:47 PM, Stepan Kasal ka...@ucw.cz wrote:
@@ -133,7 +133,7 @@
Hi kusma,
On Wed, 4 Jun 2014, Erik Faye-Lund wrote:
On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On Wed, 4 Jun 2014, Erik Faye-Lund wrote:
On Wed, Jun 4, 2014 at 3:47 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Jun 4, 2014 at 6:47 PM,
Hi dscho,
On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
No. Git is not always called through Bash or the git-wrapper,
unfortunately.
but you have to admit, that in most cases it is called through bash
or the git wrapper.
The problem arises
Hi kusma,
On Wed, 4 Jun 2014, Johannes Schindelin wrote:
The problem arises whenever git.exe calls subprocesses. You can pollute
the environment by setting HOME, I do not recall the details, but I
remember that we had to be very careful *not* to do that, hence the patch.
Sorry, has been a
Hi Stepan,
On Wed, 4 Jun 2014, Stepan Kasal wrote:
On Wed, Jun 4, 2014 at 5:14 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
No. Git is not always called through Bash or the git-wrapper,
unfortunately.
but you have to admit, that in most cases it is called through
test_cmp() is primarily meant to compare text files (and display the
difference for debug purposes).
Raw cmp is better suited to compare binary files (tar, zip, etc.).
On MinGW, test_cmp is a shell function mingw_test_cmp that tries to
read both files into environment, stripping CR characters
On Tue, May 27, 2014 at 04:22:42PM +0200, Jakub Narębski wrote:
W dniu 2014-05-15 21:28, Jakub Narębski pisze:
On Thu, May 15, 2014 at 8:48 PM, Michael Wagner accou...@mwagner.org
wrote:
On Thu, May 15, 2014 at 10:04:24AM +0100, Peter Krefting wrote:
Michael Wagner:
diff --git
Hi dscho,
your arguments seem really strong. (Especially the four years of
battle testing, with the memories of constant problems with HOME before.)
I hope they are strong enough to convince Junio to accept this patch;
that would help.
Stepan
PS (about mingwGitDevEnv):
plan is to switch to
Chris Packham judge.pack...@gmail.com writes:
On 04/06/14 09:05, Junio C Hamano wrote:
Also, going --recursive when the user did not want is a lot more
expensive mistake to fix than not being --recursive when the user
wanted to.
Having said all that, I do not mean to say that I am opposed
On Wed, 2014-06-04 at 08:06 +0200, Johannes Sixt wrote:
+receive.denyCaseCloneBranches::
+ If set to true, git-receive-pack will deny a ref update that creates
+ a ref which is the same but for case as an existing ref. This is
+ useful when clients are on a case-insensitive
Torsten Bögershausen tbo...@web.de writes:
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed simply ignore the '\' before the 'n', treating
'\n' as 'n'.
As the test already requires perl as a prerequisite, use perl instead of sed.
Signed-off-by:
Hi Stepan,
On Wed, 4 Jun 2014, Stepan Kasal wrote:
PS (about mingwGitDevEnv):
plan is to switch to mingwGitDevEnv for said release. No more msysGit.
Like, bu-bye. Thanks for all the fish.
Interesting.
With msysgit, there is the net installer - first time I installed
msys/mingw
Jeff King p...@peff.net writes:
Running git update-index --cacheinfo without any further
arguments results in a segfault rather than an error
message. Commit ec160ae (update-index: teach --cacheinfo a
new syntax mode,sha1,path, 2014-03-23) added code to
examine the format of the argument,
Junio C Hamano gits...@pobox.com writes:
Torsten Bögershausen tbo...@web.de writes:
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed simply ignore the '\' before the 'n', treating
'\n' as 'n'.
As the test already requires perl as a prerequisite,
Stepan Kasal ka...@ucw.cz writes:
test_cmp() is primarily meant to compare text files (and display the
difference for debug purposes).
Raw cmp is better suited to compare binary files (tar, zip, etc.).
On MinGW, test_cmp is a shell function mingw_test_cmp that tries to
read both files into
On Mon, Jun 02, 2014 at 02:36:01PM -0700, Linus Torvalds wrote:
On Mon, Jun 2, 2014 at 2:01 PM, Michael S. Tsirkin m...@redhat.com wrote:
[mst@robin linux]$ git request-pull net-next/master
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next
warn: No match for commit
On 2014-06-04 20.13, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
Torsten Bögershausen tbo...@web.de writes:
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed simply ignore the '\' before the 'n', treating
'\n' as 'n'.
As the
On Wed, Jun 04, 2014 at 10:42:46AM -0700, Junio C Hamano wrote:
Torsten Bögershausen tbo...@web.de writes:
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed simply ignore the '\' before the 'n', treating
'\n' as 'n'.
As the test already
Junio C Hamano gits...@pobox.com writes:
Torsten Bögershausen tbo...@web.de writes:
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed simply ignore the '\' before the 'n', treating
'\n' as 'n'.
As the test already requires perl as a prerequisite,
Michael Wagner wrote:
On Tue, May 27, 2014 at 04:22:42PM +0200, Jakub Narębski wrote:
Subject: [PATCH] gitweb: Harden UTF-8 handling in generated links
esc_html() ensures that its input is properly UTF-8 encoded and marked
as UTF-8 with to_utf8(). Make esc_param() (used for query parameters
This patch series is based on the ref-transaction series and is available at
https://github.com/rsahlberg/git/tree/ref-transactions-reflog
This patch series adds transaction support for updating the reflog.
Ronnie Sahlberg (11):
refs.c make ref_transaction_create a wrapper to
Add a flag that allows us to truncate the reflog before we write the update.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 17 +++--
refs.h | 4 +++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/refs.c b/refs.c
index b99fcd9..f2619e1 100644
---
Update hold_lock_file_for_append and copy_fd to return a meaningful errno
on failure.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
copy.c | 20 +---
lockfile.c | 7 ++-
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/copy.c b/copy.c
index
Use a transaction for all updates during expire_reflog.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
builtin/reflog.c | 84
refs.c | 2 +-
2 files changed, 37 insertions(+), 49 deletions(-)
diff --git
Add a field that describes what type of update this refers to. For now
the only type is UPDATE_SHA1 but we will soon add more types.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 24
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/refs.c
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 15 +--
refs.h | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/refs.c b/refs.c
index 2dfedf4..0c382f3 100644
--- a/refs.c
+++ b/refs.c
@@ -3482,16 +3482,11 @@ int ref_transaction_delete(struct
Break out the code to create the string and writing it to the file descriptor
from log_ref_write and into a dedicated function log_ref_write_fd. For now
this is only used from log_ref_write but later on we will call this function
from reflog transactions too which means that we will end up with
When performing a reflog transaction update, only write to the reflog iff
msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform
an update that only truncates but does not write.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 5 +++--
refs.h | 1 +
2 files
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 11 ++-
refs.h | 7 ---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/refs.c b/refs.c
index f8a6c9a..2dfedf4 100644
--- a/refs.c
+++ b/refs.c
@@ -3464,15 +3464,8 @@ int ref_transaction_create(struct
Define a new transaction update type, UPDATE_LOG, and a new function
transaction_update_reflog. This function will lock the reflog and append
an entry to it during transaction commit.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 101
Allow to make multiple reflog updates to the same ref during a transaction.
This means we only need to lock the reflog once, during the first update that
touches the reflog, and that all further updates can just write the reflog
entry since the reflog is already locked.
This allows us to write
Rename the transaction functions. Remove the leading ref_ from the names
and append _sha1 to the names for functions that create/delete/update sha1
refs.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
branch.c | 11 +++
builtin/commit.c | 14 -
John Keeping j...@keeping.me.uk writes:
Note that quoted section of POSIX says embedded in the pattern space;
under the description of the s command, it says:
The replacement string shall be scanned from beginning to end.
[...]
The meaning of a backslash immediately
Am 04.06.2014 19:24, schrieb Junio C Hamano:
Chris Packham judge.pack...@gmail.com writes:
On 04/06/14 09:05, Junio C Hamano wrote:
Also, going --recursive when the user did not want is a lot more
expensive mistake to fix than not being --recursive when the user
wanted to.
Having said all
Am 04.06.2014 00:16, schrieb Junio C Hamano:
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
- commit -m: commit staged submodules regardless of ignore config
- status/commit: show staged submodules regardless of ignore config
There also are a few patches Ronald Weiss
John Keeping j...@keeping.me.uk writes:
So the portable way to do it is:
sed s/^From:/$header: ex...@address.com\
From:/ cover-to-edit.patch $cover
That wouldn't work as \newline is removed in double quotes. You
either need to double the backslash or put it in single quotes.
On Wed, Jun 04, 2014 at 10:24:06AM -0700, Junio C Hamano wrote:
Chris Packham judge.pack...@gmail.com writes:
On 04/06/14 09:05, Junio C Hamano wrote:
Also, going --recursive when the user did not want is a lot more
expensive mistake to fix than not being --recursive when the user
t9001 used a '\n' in a sed expression to split one line into two lines.
Some versions of sed (/usr/bin/sed under Mac OS X)
simply ignore the '\' before the 'n', treating '\n' as 'n'.
As the test already requires perl as a prerequisite, use perl instead of sed.
Signed-off-by: Torsten Bögershausen
When an explicit '--git-dir' option points to a directory inside
the work tree, git treats it as if it were any other directory.
In particular, 'git status' lists it as untracked, while 'git add -A'
stages the metadata directory entirely
Add GIT_DIR to the list of excludes in a dedicated function
On Wed, Jun 04, 2014 at 08:47:54PM +0200, Jakub Narębski wrote:
Michael Wagner wrote:
On Tue, May 27, 2014 at 04:22:42PM +0200, Jakub Narębski wrote:
Subject: [PATCH] gitweb: Harden UTF-8 handling in generated links
esc_html() ensures that its input is properly UTF-8 encoded and marked
Jens Lehmann jens.lehm...@web.de writes:
Am 04.06.2014 00:16, schrieb Junio C Hamano:
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
- commit -m: commit staged submodules regardless of ignore config
- status/commit: show staged submodules regardless of ignore config
Am 04.06.2014 22:50, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
Am 04.06.2014 00:16, schrieb Junio C Hamano:
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
- commit -m: commit staged submodules regardless of ignore config
- status/commit: show
Changes from v1:
* fix a bug that caused the Zsh test cases to run in Zsh's sh
emulation mode, not Zsh native mode
Description:
This series adds test cases for running __git_ps1 (see
contrib/completion/git-prompt.sh) from Zsh.
This series also adds more Bash test cases to test how
This test is about to become redundant: All of the Bash prompt tests
will be moved into a separate library file that will also be used by a
new Zsh-specific test script.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/t9903-bash-prompt.sh | 11 ---
1 file changed, 11 deletions(-)
If a command named 'test_eval_override' exists, use it instead of
'eval' to run the test code.
This is needed to support zsh test cases: test-lib.sh must be sourced
in sh emulation mode due to fundamental incompatibilities between the
POSIX sh language and the zsh language. When a function is
Bash has a shell option that makes it possible to disable parameter
expansion in PS1. Test __git_ps1's ability to detect and react to
disabled PS1 expansion by running the pc mode tests twice: once
with PS1 parameter expansion enabled and once with it disabled.
Signed-off-by: Richard Hansen
This is a step toward reusing the same test cases after disabling PS1
parameter expansion.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/t9903-bash-prompt.sh | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/t/t9903-bash-prompt.sh
This is a step toward invoking the same pc mode test cases twice:
once with PS1 parameter expansion enabled and once with it disabled.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/t9903-bash-prompt.sh | 236 +
1 file changed, 120
Define a new 'set_ps1_format_vars' function in lib-bash.sh that sets
the c_red, c_green, c_lblue, and c_clear variables. Call this
function from run_pcmode_tests(). This is a step toward moving the
shell prompt tests to a separate library file so that they can be
reused to test prompting in Zsh.
Define a new 'shellname' variable in lib-bash.sh and use it in the
prompt test names. This is a step toward moving the shell prompt
tests to a separate library file so that they can be reused to test
prompting in Zsh.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/lib-bash.sh | 2
This is a step toward creating a new test script that runs the same
prompt tests as t9903 but with Zsh instead of Bash.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/lib-prompt-tests.sh | 653 +
t/t9903-bash-prompt.sh | 626
These are the same tests as in t9903, but run in zsh instead of bash.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/lib-zsh.sh | 52 +++
t/t9904-zsh-prompt.sh | 10 ++
2 files changed, 62 insertions(+)
create mode 100644
Modify lib-prompt-tests.sh so that it does nothing when sourced except
define a function for running the prompt tests (plus some private
helper functions).
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/lib-prompt-tests.sh | 802 -
To add a literal percent character to a Zsh prompt, the string %% is
used in PS1. Bash and POSIX shells simply use %. To accommodate
this difference, use ${percent} where a percent character is expected
and define the percent variable in the set_ps1_format_vars function.
Signed-off-by: Richard
On Wed, 2014-06-04 at 10:04 +0200, Torsten Bögershausen wrote:
[snip discussion of compiler flags; I'll look into a cpuid approach]
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -668,6 +668,28 @@ void git_qsort(void *base, size_t nmemb, size_t size,
#endif
#endif
+#ifndef
On Wed, 2014-06-04 at 16:25 +0200, Torsten Bögershausen wrote:
On the other hand, looking here:
http://sourceware.org/ml/libc-alpha/2009-10/msg00063.html
and looking into refs.c,
it seems as if we can try to run
strcspn(refname, bad_characters)
and
strstr(refname, @{
and
David Turner dtur...@twopensource.com writes:
On Wed, 2014-06-04 at 10:04 +0200, Torsten Bögershausen wrote:
[snip discussion of compiler flags; I'll look into a cpuid approach]
H, I am not sure if the complexity is really worth it.
In any case, [PATCH 1/2] is fairly uncontroversial, so I
My name is Mr Yao Yuta from Hong Kong, I want you to be my partner in a
business project.
If Interested Contact me back via my email address.
Thank you,
Mr. Yao Yuta.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Marc Branchaud mbranch...@xiplink.com writes:
[jc: omitted good suggestions I'll use in amending]
+ the refspecs to be used to fetch. The example above will fetch
/to be used//
I have a problem with that change, actually, because you do not
fetch refspec from anywhere. A refspec is what
Marc Branchaud mbranch...@xiplink.com writes:
Teach the command to pay attention to the --refmap=lhs:rhs
command-line options that can be used to override the use of
configured remote.*.fetch as the refmap.
(Your 0/9 message merely said The new patches at the
end clarifies how
On Wed, Jun 4, 2014 at 11:16 PM, Stepan Kasal ka...@ucw.cz wrote:
Hi dscho,
your arguments seem really strong. (Especially the four years of
battle testing, with the memories of constant problems with HOME before.)
I hope they are strong enough to convince Junio to accept this patch;
that
My name is Mr Yao Yuta from Hong Kong, I want you to be my partner in a
business project.
If Interested Contact me back via my email address.
Thank you,
Mr. Yao Yuta.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Am 04.06.2014 17:46, schrieb Johannes Schindelin:
Hi kusma,
On Wed, 4 Jun 2014, Johannes Schindelin wrote:
The problem arises whenever git.exe calls subprocesses. You can pollute
the environment by setting HOME, I do not recall the details, but I
remember that we had to be very careful
I have the problem that the overridden test_cmp crashes on a couple of places
where it is doing a binary compare, so this is definitely needed.
I actually used cmp -q in my override as it's the return code that is most
important.
//.
On Wed, 4 Jun 2014 11:22:56 AM Junio C Hamano wrote:
$ cd [some existing git repo]
$ git git foo
WARNING: You called a Git command named 'git', which does not exist.
Continuing under the assumption that you meant 'init'
in 0.1 seconds automatically...
fatal: internal error: work tree has already been set
Current worktree: /home/dturner/git
New
My name is Mr Yao Yuta from Hong Kong, I want you to be my partner in a
business project.
If Interested Contact me back via my email address.
Thank you,
Mr. Yao Yuta.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
t/t7810-grep.sh had its own test_config() function which served the
same purpose as the one in t/test-lib-functions.sh. Removed, all tests
pass.
Signed-off-by: Jeremiah Mahler jmmah...@gmail.com
---
t/t7810-grep.sh | 5 -
1 file changed, 5 deletions(-)
diff --git a/t/t7810-grep.sh
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 68b3cb2..ca45a84 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -351,4 +351,16 @@
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 8
1 file changed, 8 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 61461b9..491875e 100644
--- a/Documentation/git-replace.txt
+++
The usage string for this option is:
git replace [-f] --graft commit [parent...]
First we create a new commit that is the same as commit
except that its parents are [parents...]
Then we create a replace ref that replace commit with
the commit we just created.
With this new option, it should be
This patch adds into contrib/ an example script to convert
grafts from an existing grafts file into replace refs using
the new --graft option of git replace.
While at it let's mention this new script in the
git replace documentation for the --graft option.
Signed-off-by: Christian Couder
Here is a small patch series to implement:
git replace [-f] --graft commit [parent...]
This patch series goes on top of the patch series that
implements --edit.
There is only one change since v2 thanks to Eric:
- improve error messages in convert-grafts-to-replace-refs.sh
(patch 4/4)
95 matches
Mail list logo
