Ramkumar Ramachandra wrote:
> Can you tell me how to get shell-script-mode to indent the
> case statement properly? (I used the default indentation)
Never mind; I figured it out:
(setq sh-indent-for-case-label 0)
(setq sh-indent-for-case-alt '+)
Maybe we should dump the relevant parts of my .ema
Junio C Hamano wrote:
> * rr/am-quit-empty-then-abort-fix (2013-06-14) 2 commits
> - SQUASH???
> - am: handle stray $dotest directory
Please pick up the latest iteration.
http://thread.gmane.org/gmane.comp.version-control.git/227946
> * rr/triangle-push-fix (2013-06-09) 4 commits
> - t/push-d
Junio C Hamano wrote:
> [...]
I have no desire to argue incessantly. I just want a solution to the problem!
> A rerolled series that does:
>
> - Tweak wt-status.c to take information not from reflog, when
>detached during rebase (this may need to tweak existing tests,
>as different "reb
What's cooking in git.git (Jun 2013, #05; Sat, 15)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here i
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> Two possibilities:
>>
>> (1) Assume that the other thread will produce a more reasonable
>> semantics when finished; perhaps the first line will go away
>> entirely, or maybe it would say something like "# Rebasing;
>> head a
Thanks for all of the information.
On 06/15/2013 10:13 PM, Ramsay Jones wrote:
> Michael Haggerty wrote:
>> *This patch series must be built on top of mh/reflife.*
>>
>
> [...]
>
>> The other problem was that the for_each_ref() functions will die if
>> the ref cache that they are iterating over
On Thu, Jun 13, 2013 at 3:29 PM, Junio C Hamano wrote:
> Ramkumar Ramachandra writes:
>
> A more troublesome is that nobody seems to check the return value of
> this function. If head-name, onto or orig-head is missing, is that
> an error condition that should make the callers of read_basic_stat
From: Benoit Person
Add the new git-mw command, with its 'help' subcommand as an example. Argument
parsing and subcommand choice is based on git-svn.perl.
Update Makefile to build, install and clean both scripts now (git-mw.perl and
git-remote-mediawiki.perl).
Signed-off-by: Benoit Person
Signe
From: Benoit Person
Move and rename subs 'mediawiki_clean_filename' into 'clean_filename',
'mediawiki_smudge_filename' into 'smudge_filename' and
'mw_connect_maybe' into 'connect_maybe' since we have a cleaner namespace in
a perl module.
Move constants 'EMPTY', 'SLASH_REPLACEMENT' and 'HTTP_CODE_
From: Benoit Person
Add the subcommand to 'git-mw.perl'.
Add a new constant in GitMediawiki.pm 'HTTP_CODE_PAGE_NOT_FOUND'.
Signed-off-by: Benoit Person
Signed-off-by: Matthieu Moy
---
changes from V2:
- Remove the --blob option, distinction between files and blobs is now
automatic.
From: Benoit Person
GitMediawiki.pm enable code factoring between several scripts in mw-to-git.
To make it usable in scripts (ie: accessible in @INC) it adds two targets
(copy_pm & install_pm) into the Makefile, one for tests and one for
installation.
Signed-off-by: Benoit Person
Signed-off-by
From: Benoit Person
The #7 issue on git-mediawiki's issue tracker [1] states that the ability to
preview content without pushing would be a nice thing to have.
changes from V2:
- Add a way to test, without installation, code that uses GitMediawiki.pm.
- Move more constants to GitMediawiki.pm
Ramkumar Ramachandra writes:
> [1/2] is important. [2/2] is a minor prettification, that wouldn't
> have been possible without [1/2].
>
> Thanks.
>
> Ramkumar Ramachandra (2):
> sha1_name: stop hard-coding 40-character hex checks
> checkout: do not write full sha1 to reflog
>
> builtin/chec
Ramkumar Ramachandra writes:
> Ramkumar Ramachandra (5):
> stash doc: add a warning about using create
> stash doc: document short form -p in synopsis
> stash: simplify option parser for create
> stash: introduce 'git stash store'
> rebase: use 'git stash store' to simplify logic
Looke
Junio C Hamano writes:
> Andrew Pimlott writes:
>
>> Excerpts from Andrew Pimlott's message of Fri Jun 14 12:31:57 -0700 2013:
>>> It happened to work and I added a test. But then it occurred to me that
>>> it might have been better to fix commit --fixup/--squash to strip the
>>> fixup! or squa
René Scharfe writes:
> If o->merge is set, the struct traverse_info member conflicts is shifted
> left in unpack_callback, then passed through traverse_trees_recursive
> to unpack_nondirectories, where it is shifted right before use.
> @@ -807,13 +802,6 @@ static int unpack_callback(int n, uns
If o->merge is set, the struct traverse_info member conflicts is shifted
left in unpack_callback, then passed through traverse_trees_recursive
to unpack_nondirectories, where it is shifted right before use. Stop
the shifting and just pass the conflict bit mask as is. Rename the
member to df_confl
On 14 June 2013 18:54, Junio C Hamano wrote:
> Stefan Haller writes:
>
>> On Mac OS X, any application that is started from the Terminal will open
>> behind all running applications; as a work-around, manually bring ourselves
>> to the front. (Stolen from gitk, commit 76bf6ff93e.)
>>
>> We do thi
The following changes since commit f6dd784ed4c1705d465b1238f9a5971f2733e582:
git-gui 0.17 (2012-10-17 21:57:29 +0100)
are available in the git repository at:
git://repo.or.cz/git-gui.git tags/gitgui-0.18.0
for you to fetch changes up to 8a383db4b28059becc3ebfd1b402299e34c3151f:
git-gui 0
make and make test both work when $GIT_DIR isn't .git, but make dist
included a bogus GIT-VERSION-FILE.
Signed-off-by: Dennis Kaarsemaker
---
I'm doing daily builds of git, using many workers and a shared git.git,
with per-worker checkouts, it would be really useful if GIT-VERSION-GEN
actually
When running 'make test' from a path such as
.../daily-build/master@bdff0e3a374617dce784f801b97500d9ba2e4705, the
logic in fuzz.sed as generated by t5105-request-pull.sh was backwards,
replacing object names before replacing urls, making the test fail.
Signed-off-by: Dennis Kaarsemaker
---
t/t51
Hi Junio,
I recently had need to use the '-c' option to git in order to
set some config variables from the command line; specifically
with 'git show-ref' and 'git pack-refs'. I haven't looked to
see if any other commands need similar attention, but:
$ git grep 'cmd_.*(int argc' -- builtin |
Michael Haggerty wrote:
> *This patch series must be built on top of mh/reflife.*
>
[...]
> The other problem was that the for_each_ref() functions will die if
> the ref cache that they are iterating over is freed out from under
> them. This problem is solved by using reference counts to avoid
At present, 'git show-ref' ignores any attempt to set config
variables (e.g. core.checkstat) from the command line using
the -c option to git. In order to enable such usage, add the
missing call to git_config() from cmd_show_ref().
Signed-off-by: Ramsay Jones
---
builtin/show-ref.c | 2 ++
1 fi
At present, 'git pack-refs' ignores any attempt to set config
variables (e.g. core.checkstat) from the command line using
the -c option to git. In order to enable such usage, add the
missing call to git_config() from cmd_pack_refs().
Signed-off-by: Ramsay Jones
---
builtin/pack-refs.c | 3 +++
24.21.139.76:9855
173.57.153.187:62189
96.43.245.75:26101
24.107.48.229:8169
75.136.147.231:4351
SSL socks proxy list: CONNECTABLE 100%
More socks at: http://actualproxy.biz/
--
View this message in context:
http://git.661346.n2.nabble.com/Using-socks-proxy-with-git-for-http-s-transport-tp7
Hi Paul,
Paul Menzel wrote:
> there are people out there disliking elaborate commit messages, as going
> over `git log` is tedious as you have to scroll a lot. As I do not like
> the suggestion to make commit messages shorter by omitting certain
> details, a way to limit the number displayed line
Dear git folks,
there are people out there disliking elaborate commit messages, as going
over `git log` is tedious as you have to scroll a lot. As I do not like
the suggestion to make commit messages shorter by omitting certain
details, a way to limit the number displayed lines of the commit
mess
Ramkumar Ramachandra wrote:
> [1/2] is important. [2/2] is a minor prettification, that wouldn't
> have been possible without [1/2].
I forgot to mention: some tests fail, and I'm investigating. This is
an early preview.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bod
In two places, get_sha1_basic() assumes that strings are possibly sha1
hexes if they are 40 characters long, and calls get_sha1_hex() in these
two cases. This 40-character check is ugly and wrong: there is nothing
preventing a revision or branch name from being exactly 40 characters.
Replace it wi
A snippet from a typical git session may look like this:
$ git checkout @~3
...
$ git checkout -
The reflog entries corresponding to the two checkouts look like:
f855138: checkout: moving from bdff0e3a374617dce784f801b97500d9ba2e4705 to
co-reflog
bdff0e3: checkout: moving from co-refl
[1/2] is important. [2/2] is a minor prettification, that wouldn't
have been possible without [1/2].
Thanks.
Ramkumar Ramachandra (2):
sha1_name: stop hard-coding 40-character hex checks
checkout: do not write full sha1 to reflog
builtin/checkout.c | 2 +-
sha1_name.c| 6 +++---
2
On Sat, Jun 15, 2013 at 06:18:46PM +0200, Thomas Koch wrote:
> I'm using vcsh[1] to have my dotfiles in GIT. With that I use a .gitignore
> file
> referenced by core.excludesfile that looks like this:
>
> # ignore everything by default
> *
>
> # but do not ignore emacs stuff
> !.emacs.d/
>
> #
Hi,
I'm using vcsh[1] to have my dotfiles in GIT. With that I use a .gitignore file
referenced by core.excludesfile that looks like this:
# ignore everything by default
*
# but do not ignore emacs stuff
!.emacs.d/
# but than again please ignore backup files inside the .emacs.d folder
.emacs.d/
To support mixed-case aliases like:
bM = branch -M
bD = branch -D
add an argument to git_config_with_options() to block the tolower()
calls on key characters.
Signed-off-by: Ramkumar Ramachandra
---
The static variable is somewhat disturbing, but it's the most obvious
choice to avoid refa
Hi Junio,
I see you picked up this patch in branch
'rr/prompt-autostash-breakage-fix'. This patch has actually nothing
to do with autostash, it is a fix for b71dc3e1 (bash-prompt.sh: show
where rebase is at when stopped, 2013-04-25).
Gábor
On Thu, Jun 13, 2013 at 07:16:49PM +0530, Ramkumar Ram
Junio C Hamano wrote:
> You can also specify the commit at the end of the history to be
> rebased (very useful while trial runs to see where a series should
> apply):
>
> git rebase foo ":/Add B"
>
> This is already handled properly because it first gets turned into
> an object name $orig_head
The V3 is ready, but I am still not sure about what is the best way to
do it for this issue though.
On 13 June 2013 15:01, Matthieu Moy wrote:
> benoit.per...@ensimag.fr writes:
> How does the "make" Vs "make install" work? How does a developer run the
> tool without installing?
Well it does not
rebase has no reason to know about the implementation of the stash. In
the case when applying the autostash results in conflicts, replace the
relevant code in finish_rebase () to simply call 'git stash store'.
Signed-off-by: Ramkumar Ramachandra
---
git-rebase.sh | 7 ++-
1 file changed, 2
The interface actually makes sense in this iteration, thanks to Junio.
Also fix minor nits pointed out by Phil Hord.
Thanks.
Ramkumar Ramachandra (5):
stash doc: add a warning about using create
stash doc: document short form -p in synopsis
stash: simplify option parser for create
stash:
save_stash() contains the logic for doing two potentially independent
operations; the first is preparing the stash merge commit, and the
second is updating the stash ref/ reflog accordingly. While the first
operation is abstracted out into a create_stash() for callers to access
via 'git stash crea
The option parser for create unnecessarily checks "$1" inside a case
statement that matches "$1" in the first place.
Signed-off-by: Ramkumar Ramachandra
---
git-stash.sh | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index bbefdf6..64800b8 100
'git stash save' can take -p, the short form of --patch, as an option.
Document this.
Signed-off-by: Ramkumar Ramachandra
---
Documentation/git-stash.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index cb0c1a6..6
Add a note saying that the user probably wants "save" in the create
description. While at it, document that it can optionally take a
message in the synopsis.
Signed-off-by: Ramkumar Ramachandra
---
Documentation/git-stash.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
The goal of the patch is to introduce the GNU diff
-B/--ignore-blank-lines as closely as possible. The short option is not
available because it's already used for "break-rewrites".
When this option is used, git-diff will not create hunks that simply
add or remove empty lines, but will still show e
The test in [1/2] was too loose in the previous iteration: guard it
with "test -z $rebasing". Also fix a couple of minor problems pointed
out by Junio (extra indentation, $-unescaped).
Thanks.
Ramkumar Ramachandra (2):
am: handle stray $dotest directory
t/am: use test_path_is_missing() where
The following bug has been observed:
$ git am # no input file
^C
$ git am --abort
Resolve operation not in progress, we are not resuming.
This happens because the following test fails:
test -d "$dotest" && test -f "$dotest/last" && test -f "$dotest/next"
and the codepath for an "am i
Replace instances of ! test -d with test_path_is_missing.
Signed-off-by: Ramkumar Ramachandra
---
t/t4150-am.sh | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 6c2cc3e..5edb79a 100755
--- a/t/t4150-am.sh
Junio C Hamano wrote:
> I _think_ the new check you added may be too loose.
Yep, I totally forgot about the case when git-am.sh is called from an
existing script. In that case, it is upto the caller to handle
whatever stray directories; we have no business meddling with that.
> A fix-up may look
Junio C Hamano wrote:
> The first line from status in the middle of
> a rebase is secondary. End-user initiated "checkout" to detach is
> the primary thing.
>
>> 3. The problem is not unique to rebase at all; yet you have
>> special-cased it. If this isn't a band-aid, what is?
>
> It is an illust
Junio C Hamano wrote:
> Two possibilities:
>
> (1) Assume that the other thread will produce a more reasonable
> semantics when finished; perhaps the first line will go away
> entirely, or maybe it would say something like "# Rebasing;
> head at $commit".
>
> Your topic does no
guten Tag!
ich bin ein privater Darlehensgeber, und ich mache die Darlehen zu all jenen,
die im Bedürfnis sind und die bestimmte Bedingungen erfüllen. ich mache gehende
Darlehen von 2000 Euro zu 50.000.000 Euro zu sehr interessanten Zinssätzen (3%;
3,7%). all jene, die ein Darlehen benötigen, s
Ramkumar Ramachandra writes:
>> I have been assuming the "main" thing Duy wanted to do was the last
>> test (and the one below), but was this meant as an improvement for
>> "git status" output during that state?
>
> On what basis are you making that assumption?
List archive helps.
http://threa
Andrew Pimlott writes:
> Excerpts from Andrew Pimlott's message of Fri Jun 14 12:31:57 -0700 2013:
>> It happened to work and I added a test. But then it occurred to me that
>> it might have been better to fix commit --fixup/--squash to strip the
>> fixup! or squash! from the referenced commit i
Ramkumar Ramachandra writes:
> 2. The following no longer updates status:
>
> # in the middle of a rebase
> $ git reset @~2
>
> The constant "HEAD detached at $onto" message is misleading and Bad.
> Besides, wasn't this the primary usecase you wanted?
See the other message. The first line f
Get beetter sex lifee withh ttthese gggreat piills
http://ozdecor.com/admin/popups/6e71.php
--
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
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> I am only saying that the last test the commit adds must be kept
>> unbroken. I am also saying that, even though that commit did not
>> add a test for "detached from" case, we should add something like
>> the attached to protect the behavio
Junio C Hamano wrote:
> I am only saying that the last test the commit adds must be kept
> unbroken. I am also saying that, even though that commit did not
> add a test for "detached from" case, we should add something like
> the attached to protect the behaviour. These two are sacred.
>
> What h
Junio C Hamano wrote:
> wt-status.c | 6 +-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index bf84a86..403d48d 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1176,7 +1176,11 @@ void wt_status_print(struct wt_status *s)
>
59 matches
Mail list logo
