checkout -
to work as expected after any rebase operation.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
builtin/checkout.c | 11 ---
t/t2012-checkout-last.sh | 8
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
will change this.
After that patch, rebase -i will write the following line to the reflog
when started:
rebase -i (start): checkout master
This is much better than the confusing message it currently writes:
checkout: moving from master to 1462b67
Signed-off-by: Ramkumar Ramachandra artag
:
# rebase in progress; onto $ONTO
The issue is not isolated to rebase at all. Several other scripts like
bisect write checkout: messages to the reflog, and the tests in
t/status-help depend on them. Fixing them is left as an exercise to
other contributors.
Signed-off-by: Ramkumar Ramachandra artag
The struct grab_1st_switch_cbdata has the field found, which is set in
grab_1st_switch() when a match is found. This information is redundant
and unused by any caller: the return value of the function serves to
communicate this information anyway. Remove the field.
Signed-off-by: Ramkumar
. Feel free to tweak it before applying.
Thanks.
Ramkumar Ramachandra (6):
t/checkout-last: checkout - doesn't work after rebase
rebase: prepare to write reflog message for checkout
rebase -i: prepare to write reflog message for checkout
wt-status: remove unused field
this.
After that patch, rebase will write the following line to the reflog
when started:
rebase: checkout master
This is much better than the confusing message it currently writes:
checkout: moving from master to 1462b67
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git
,
and another two for an interactive rebase.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t2012-checkout-last.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index b44de9d..6ad6edf 100755
--- a/t
benoit.per...@ensimag.fr wrote:
Subject: [PATCH V3 0/4] git-remote-mediawiki: new tool to preview local
changes without pushing
Quick tip: use git format-patch -v3. The uppercase 'V' indicates that
you probably typed it out yourself, or used --subject-prefix=PATCH
V3.
--
To unsubscribe from
Junio C Hamano wrote:
I view the two codepaths touched by these patches the other way
around.
I see. Thanks for the early feedback. I have some doubts.
An abbreviated unique SHA-1 you have today may not be unique
tomorrow. There is no reason to deliberately lose information
(e.g. by
documentation but I have no choice if I want to
update the implementations to do something sane in triangular workflows.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
I'll send in the implementation once we can agree that this is what
we want.
Documentation/config.txt | 51
Phil Hord wrote:
I share your disdain for the bare '40's in the code. But I think this
code is less clear than the previous version with the magic number.
Please read the cover-letter: I was just toying around to see if this
was a good idea, and Junio points out that it's not.
--
To
Junio C Hamano wrote:
Will replace what has been queued on 'pu'.
... after fixing an indentation error, that is.
Where did the error occur? I thought I taught my Emacs to always
indent properly.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Philip Oakley wrote:
A sentence, in the Documentation/config.txt, is needed to clarify the
Central workflow and any distinction with the non-central workflow(s). We
cannot assume the new reader has the same world view of that concept (they
may be thinking it means we do a centralised VCS, not
Junio C Hamano wrote:
I do no think the remainder (snipped) belongs to the log message.
Oh, it was never intended to be a proper commit message. I'll write a
proper one when I send it in with the implementation.
- To understand if central, works as upstream, otherwise works as
current,
Matthieu Moy wrote:
I'd put it the other way around: the intuitive explanation first, and
the technical one after. For people not totally familiar with Git, the
first part does not make much sense (and when I learn a new tool, I
really don't like when the doc assumes I already know too much
Matthieu Moy wrote:
Weaken the warning by discouraging only merge with /non-trivial/
uncommited changes.
I don't think documenting all the failure cases in the doc would be a
good idea, so I've left the in some cases part.
It's already documented in the pre-merge checks section, as Jonathan
Junio C Hamano wrote:
I actually tried to reorder the patches and they seem to work OK as
expected. And I think it makes sense to order them the way I've
been suggesting, so I'll tentatively queue the result of reordering
on 'rr/rebase-checkout-reflog' and push it out as a part of 'pu'.
Ramkumar Ramachandra wrote:
Thanks for the reorder and commit message tweaks. I'm working on the
series you put up on `pu` now.
That said, I do not agree with one of your commit message updates:
checkout: respect GIT_REFLOG_ACTION
GIT_REFLOG_ACTION is an environment variable
jorge-juan.garcia-gar...@ensimag.imag.fr wrote:
The format of email list handled is pretty basic for now:
$ git send-email --to='Foo f...@example.com, b...@example.com'
We thought it would be nice to have a first-step version which works
before handling more complex ones such as:
Mathieu Liénard--Mayor wrote:
Is this a regression? I can't send emails to a recipient whose name
contains a comma?
It is not. Previously the input would be considered incorrect:
Right. It dies with
Comma in --to entry: ...
This artificial limitation is imposed by 79ee555b (Check and
Junio C Hamano wrote:
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index a58406d..c175ef1 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -934,6 +934,21 @@ test_expect_success 'rebase --edit-todo can be used to
modify todo' '
jorge-juan.garcia-gar...@ensimag.imag.fr wrote:
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 9f46f22..87641bc 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1349,4 +1349,39 @@ test_expect_success $PREREQ
'sendemail.aliasfile=~/.mailrc' '
grep
jorge-juan.garcia-gar...@ensimag.imag.fr wrote:
+sub split_email_list {
+my(@list) = @_;
+my @tmp;
+my @emails;
+ for (my $i = 0; $i = $#list; $i++) {
+ if ($list[$i] =~ /,/) {
+ @emails = split(/,/, $list[$i]);
+ } else {
+
Mathieu Liénard--Mayor wrote:
Shouldn't
$ git send-email --cc 'f...@example.com' --cc 'b...@example.com'
and
$ git send-email --cc 'f...@example.com, b...@example.com'
have the exact same effect ?
Ah. Perhaps it would be clearer to check the headers directly like in
the other tests?
--
every time we
set it. I've also fixed up some of your commit messages. Let me know
if any further tweaks are necessary.
Thanks.
Junio C Hamano (1):
t/status-help: test HEAD detached from
Ramkumar Ramachandra (7):
wt-status: remove unused field in grab_1st_switch_cbdata
t/checkout-last: test
-i was not consistent with the output during a vanilla rebase, which
showed on top of what commit the series is being replayed. Now we
consistently show something meaningful to the end user.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
this bug: two for a normal rebase,
and another two for an interactive rebase.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t2012-checkout-last.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git
one example,
immediately after HEAD is detached via a checkout. Enhance that test to
test the HEAD detached from message is displayed when the user further
resets to another commit.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t7512
of the old
rebase
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git-rebase--am.sh | 2 ++
git-rebase.sh | 8 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 34e3102
checkout -
to work as expected after any a rebase [-i]. It will also work with any
other scripts provided they set an appropriate GIT_REFLOG_ACTION if they
internally use git checkout.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
builtin
The struct grab_1st_switch_cbdata has the field found, which is
set in grab_1st_switch() when a match is found. This information is
redundant and unused by any code. The return value of the function
serves to communicate this information anyway.
Remove the field.
Signed-off-by: Ramkumar
master
instead of the old
rebase -i (start)
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git-rebase--interactive.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index
Several callers set GIT_REFLOG_ACTION via set_reflog_action(), but
nobody unsets it, leaving a potentially stray variable in the
environment. Fix this by making die_with_status() unset it.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-sh-setup.sh | 1 +
1 file changed, 1
Junio C Hamano wrote:
Where did the error occur?
I think you can compare what is in 'pu' and what you sent out
without asking.
Ah, I sent out the series before I taught Emacs to indent properly.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Junio C Hamano wrote:
- There is no mechanism for you to affect environment of your
parent process.
Please excuse my stupidity and drop this patch. I got mislead by your
SQUASH??? patch which took care to set the environment variable and
call checkout in a subshell.
--
To unsubscribe from
Junio C Hamano wrote:
Apply the test change without the do not leak part in the fix-up
(queued as a single SQUASH??? commit on 'pu') to what you posted
earlier and see how it breaks.
--- expect 2013-06-18 16:09:21.0 +
+++ actual 2013-06-18 16:09:21.0
Junio C Hamano wrote:
By the way, please stop doing t/checkout-last which I have to
manually fix-up every time to its actual prefix (i.e. I cannot
review with less t/checkout-last* to see what the log message is
talking about; I can with less t/t2012-checkout-last*).
Ah, I didn't realize you
this defect). Fix this.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
builtin/name-rev.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 524d790..4b17209 100644
--- a/builtin/name-rev.c
+++ b/builtin/name
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-name-rev.txt | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index 5cd0d0d..67f0487 100644
--- a/Documentation/git-name-rev.txt
--contains --all @~1
foom~1
In other words, --contains implies --tags in name-rev, which gives
precedence to tags; --all cancels that effect thereby giving precedence
to branches in the case of a tie.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-name-rev.txt
Hi,
I discovered --contains --all in describe, and found out that it
doesn't work as advertised for a deep historical reason. [3/5] is
super-important and addresses this issue; everything else is
decoration.
Thanks.
Ramkumar Ramachandra (5):
prompt: clean up describe logic
prompt: do
-by: Ramkumar Ramachandra artag...@gmail.com
---
contrib/completion/git-prompt.sh | 16 +++-
t/t9903-bash-prompt.sh | 2 +-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 86a4f3f..9ed6ff1 100644
When GIT_PS1_SHOWCOLORHINTS is turned on, there is no need to put a
detached HEAD within parenthesis: the color can be used to discriminate
the detached HEAD.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
contrib/completion/git-prompt.sh | 6 +-
1 file changed, 5 insertions
The following command
$ git cherry-pick --ff b8bb3f
writes the following uninformative message to the reflog
cherry-pick
Improve it to
cherry-pick: fast-forward to b8bb3f
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
sequencer.c | 4 +++-
1 file changed, 3 insertions
The struct grab_1st_switch_cbdata has the field found, which is
set in grab_1st_switch() when a match is found. This information is
redundant and unused by any code. The return value of the function
serves to communicate this information anyway.
Remove the field.
Signed-off-by: Ramkumar
and base_reflog_action. It is now elegant and
correct.
I'm elated that I got the chance to do this right.
Thanks.
Junio C Hamano (1):
t/t7512-status-help: test HEAD detached from
Ramkumar Ramachandra (6):
wt-status: remove unused field in grab_1st_switch_cbdata
t/t2012-checkout-last: test checkout
this bug: two for a normal rebase,
and another two for an interactive rebase.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t2012-checkout-last.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git
one example,
immediately after HEAD is detached via a checkout. Enhance that test to
test the HEAD detached from message is displayed when the user further
resets to another commit.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t7512
checkout -
to work as expected after any a rebase [-i]. It will also work with any
other scripts provided they set an appropriate GIT_REFLOG_ACTION if they
internally use git checkout.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
builtin
of the old
rebase
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git-am.sh | 4 +++-
git-rebase--am.sh | 5 +
git-rebase.sh | 13 +++--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git
-i was not consistent with the output during a vanilla rebase, which
showed on top of what commit the series is being replayed. Now we
consistently show something meaningful to the end user.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
master
instead of the old
rebase -i (start)
[jc: add rebase-reflog test]
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git-rebase--interactive.sh| 14 ++
t/t3404-rebase-interactive.sh | 15 +++
2 files
Junio C Hamano wrote:
strbuf_addf(sb, %s: fast-forward, action_name(opts))
Agreed. Can you just fix it up locally?
Thanks.
--
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
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index fd9a1d5..6c3bafe 100644
--- a/contrib
Junio C Hamano wrote:
Sounds like making make test build it is a more correct approach,
at least to me. What am I missing?
How exactly? I'm not exactly competent in make, but this is what I
understood from what you said (and it's obviously wrong):
diff --git a/Makefile b/Makefile
index
Junio C Hamano wrote:
Why did this have to change back from branch-reflog-test to branch1
(which I used by mistake in how about this patch, but fixed in the
version queued on 'pu')?
The reason I did not use 'branch1' in the version I queued on 'pu'
is because rr/rebase-sha1-by-string-query,
Junio C Hamano wrote:
Oh, okay. Then just tweak before applying, if you don't mind?
Sorry, you've already used my time allotment for this week.
No worries, I'll re-roll.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Veres Lajos wrote:
Subject: small misspelling fixes
Good.
I am trying to convert this pull request:
https://github.com/git/git/pull/42
to a proper patch email
(Sorry If I miss something about the process.)
This does not belong in the commit message: you don't want this to be
shown when
Richard Hansen wrote:
+[[def_committish]]committish (also commit-ish)::
Good.
+ A def_ref,ref pointing to an def_object,object that
+ can be recursively dereferenced to a
+ def_commit_object,commit object.
+ The following are all committishes:
+ a ref pointing
Richard Hansen wrote:
On 2013-06-19 00:19, Ramkumar Ramachandra wrote:
Is master~3 a committish? What about :/foomery?
Yes; as documented, both of those are refs that point to a commit.
From gitglossary(7):
ref
A 40-byte hex representation of a SHA-1 or a name that denotes
Johannes Sixt wrote:
I haven't followed the topic closely, but I wonder why there are so many
explicit assignments to GIT_REFLOG_ACTION. Is calling set_reflog_action
(defined in git-sh-setup) the wrong thing to do?
Does this answer your question?
set_reflog_action() {
if [ -z
-by: Ramkumar Ramachandra artag...@gmail.com
---
Changes since v1:
- fast_forward_to() now takes opts to determine action_name()
- strbuf_release() to free memory
sequencer.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index ab6f8a7
-i was not consistent with the output during a vanilla rebase, which
showed on top of what commit the series is being replayed. Now we
consistently show something meaningful to the end user.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
Hamano (1):
t/t7512-status-help: test HEAD detached from
Ramkumar Ramachandra (6):
wt-status: remove unused field in grab_1st_switch_cbdata
t/t2012-checkout-last: test checkout - after a rebase
status: do not depend on rebase reflog messages
checkout: respect GIT_REFLOG_ACTION
rebase
one example,
immediately after HEAD is detached via a checkout. Enhance that test to
test the HEAD detached from message is displayed when the user further
resets to another commit.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t7512
The struct grab_1st_switch_cbdata has the field found, which is
set in grab_1st_switch() when a match is found. This information is
redundant and unused by any code. The return value of the function
serves to communicate this information anyway.
Remove the field.
Signed-off-by: Ramkumar
this bug: two for a normal rebase,
and another two for an interactive rebase.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t2012-checkout-last.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git
checkout -
to work as expected after any a rebase [-i]. It will also work with any
other scripts provided they set an appropriate GIT_REFLOG_ACTION if they
internally use git checkout.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
builtin
a
base_reflog_action variable that is different from GIT_REFLOG_ACTION.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git-am.sh | 4 +++-
git-rebase--am.sh | 7 +++
git-rebase.sh | 18 --
3 files changed, 26
master
instead of the old
rebase -i (start)
The usage semantics of GIT_REFLOG_ACTION have changed: use
base_reflog_action just like in git-rebase.sh.
[jc: add rebase-reflog test]
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
git
Johannes Sixt wrote:
Am 6/19/2013 10:04, schrieb Ramkumar Ramachandra:
+test_expect_failure 'checkout - works after a rebase -i A B' '
+ git branch foodle master~1
+ git checkout master
+ git checkout other
+ git rebase master foodle
git rebase -i master foodle
Introduce test_pushdefault_workflows(), and test that all push.default
modes work with central and triangular workflows as expected.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5528-push-default.sh | 36
1 file changed, 36 insertions
will use this in the next patch.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5528-push-default.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index e54dd02..b599186 100755
--- a/t/t5528-push-default.sh
to do central stuff.
[6/6] adds some new tests to illustrate how all these push.default
modes work in central and triangular workflows.
Thanks.
Ramkumar Ramachandra (6):
t/t5528-push-default: remove redundant test_config lines
config doc: rewrite push.default section
push: change `simple
in the special case of central workflows.
Reported-by: Leandro Lucarella leandro.lucare...@sociomantic.com
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/config.txt | 10 ++
builtin/push.c | 21 -
t/t5528-push-default.sh | 2 +-
3 files
Now that simple has been decoupled from upstream in setup_push_simple(),
remove the dead code in setup_push_upstream().
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
builtin/push.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/builtin/push.c b/builtin
they behave in triangular workflows. Leave `simple` as it is for
the moment, as we plan to change its meaning to accommodate triangular
workflows in a later patch.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/config.txt | 56 ++--
1
The line
test_config push.default upstream
appears unnecessarily in two tests, as the final test_push_failure sets
push.default before pushing anyway.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5528-push-default.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/t
Junio C Hamano wrote:
Decouple `simple` from `upstream` completely, and change it to mean
`current` with a safety feature: a `push` and `pull` should not be
asymmetrical in the special case of central workflows.
Double negation confused my parser. 'push' and 'pull' should be
kept
Richard Hansen wrote:
In the meantime, I'll
rework the patch series to avoid using the word ref when defining
committish and tree-ish.
This is a good way forward. I'm curious about what you're planning on
substituting it with though: the extended SHA-1 expression that
Jonathan hinted at?
--
Richard Hansen wrote:
* Aren't HEAD, FETCH_HEAD, ORIG_HEAD also refs?
HEAD is a symbolic ref [*1*], FETCH_HEAD is not a ref [*2*], and
ORIG_HEAD is a ref.
ref
A binding of a name to an object or other ref (in which case it
is a symref). Refs are stored in the
Hi,
So this should explain the problem:
# using v1.8.3.1
$ git clone https://google.com
Cloning into 'google.com'...
fatal: repository 'https://google.com/' not found
# using master
$ git clone https://google.com
Cloning into 'google.com'...
fatal: repository
Francis Moreau wrote:
Basically I have an initial set (or can be several different sets)
expressed as a revision specification described by git-rev-list man
page. I just want to find the common set of commit which are part of
the initial sets *and* is reachable by master.
That's just a
Thomas Rast wrote:
diff --git a/git-pull.sh b/git-pull.sh
index 638aabb..1f84383 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -266,10 +266,17 @@ case $merge_head in
;;
esac
+# Pulling into unborn branch: a shorthand for branching off
+# FETCH_HEAD, for lazy typers.
if test -z
Namhyung Kim wrote:
diff --git a/Documentation/git-send-email.txt
b/Documentation/git-send-email.txt
index 40a9a9a..5694d98 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -238,7 +238,7 @@ Automating
the value of 'sendemail.identity'.
Richard Hansen wrote:
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -677,6 +677,8 @@ static int peel_onion(const char *name, int len, unsigned
char *sha1)
sp++; /* beginning of type name, or closing brace for empty */
if (!strncmp(commit_type, sp, 6) sp[6] == '}')
Junio C Hamano wrote:
They're not the same thing. It is very much intentional and intended:
the safety net is not to ensure that the push and pull are
symmetrical (i.e. among other things, error out if
branch.$branch.merge is unset), but rather ensure that the push and
pull are never
Jeff King wrote:
So I do not see any problem with the current Makefile. Running make or
make test should let t5800 pass. Can you describe how you are
triggering the issue in more detail?
master, at the time of reporting the issue:
artagnon|master=:~/src/git$ make -j 8
Jeff King wrote:
So I'm not sure if there is a better option than reverting 81d340d4 and
living with the lesser of two evils (no good message when the helper
dies silently).
I dug around, but I still can't justify that there is no better
option. Could you write a commit message for this?
--
Ramkumar Ramachandra wrote:
diff --git a/transport-helper.c b/transport-helper.c
index 06c08a1..db9bd18 100644
--- a/transport-helper.c
+++ b/transport-helper.c
Oh, and we have to remove test 23 - proper failure checks for
pushing from t5801-remote-helpers.sh.
--
To unsubscribe from this list
Francis Moreau wrote:
Slower ? why do you think Thomas' solution is slower than the obvious one ?
There's really only one way to find out: try it and see. YMMV
depending on your data.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Hi,
Until now, my interest in corrupted repositories has been very
limited. Just now, the power went out for a second and my UPS failed
me. As a result, my ~/src/git is completely borked. For your
amusement, here's a quick session showing me bumbling around:
$ ~/src/git
error: object file
Junio C Hamano wrote:
* rr/triangle-push-fix (2013-06-20) 9 commits
- push: honor branch.*.push
- SQUASH??? fix git-config push.default description
- SQUASH??? minimum simple safety fix-up
- t/t5528-push-default: test pushdefault workflows
- t/t5528-push-default: generalize test_push_*
conflicts that's not worth
anyone's time.
Thanks.
Ramkumar Ramachandra (16):
t/t5505-remote: modernize subshell-style of one test
t/t5505-remote: test push-refspec in branches-file
t/t5505-remote: use test_path_is_missing
t/t5505-remote: remove dependency on $origin_url
remote: remove
One outdated example encourages the use of $GIT_DIR/branches files.
Replace it with an equivalent example using a remote.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-ls-remote.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
remote.c | 8
1 file changed, 8 insertions(+)
diff --git a/remote.c b/remote.c
index 128b210..b487865 100644
--- a/remote.c
+++ b/remote.c
@@ -227,6 +227,10 @@ static void add_instead_of(struct rewrite *rewrite, const
char
Since we plan to edit the test migrate a remote from named file in
$GIT_DIR/remotes in later patches, modernize the subshell-style by
putting the parenthesis on separate lines and indenting the body.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 20
Replace it with the equivalent gitconfig configuration, using the
results of the corresponding tests in t/t5505-remote.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5515-fetch-merge-logic.sh | 28 +---
1 file changed, 13 insertions(+), 15 deletions
The test migrate a remote from named file in $GIT_DIR/branches reads
the branches-file, but only checks that the url and fetch-refspec are
set correctly. Check that the push-refspec is also set correctly.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 3 ++-
1
Replace instances of ! test -f with test_path_is_missing.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 38c62ec..dcb6c2f 100755
--- a/t/t5505
501 - 600 of 1485 matches
Mail list logo
