On 25/05/14 20:37, Jeremiah Mahler wrote:
On Sun, May 25, 2014 at 07:56:41PM +1200, Chris Packham wrote:
On 25/05/14 15:50, Jeremiah Mahler wrote:
Some minor wording fixes in the user manual and glossary.
...
-Eventually the developer cloned from will do additional work in her
+Eventually
On 25/05/14 20:37, Jeremiah Mahler wrote:
How about this:
Eventually the upstream developer will do additional work in their
repository. Creating new commits and advancing the branches to point
at the new commits.
The second sentence needs a verb. Maybe something along the lines
Various minor wording fixes throughout the user manual
and glossary.
The section on Updating a repository with git fetch was
substantially re-worded to try and better explain `git fetch`.
Signed-off-by: Jeremiah Mahler jmmah...@gmail.com
---
Notes:
From the feedback I received by Chris
xcalloc takes two arguments: the number of elements and their size.
The vast majority of the Git codebase passes these arguments in the
correct order, but there are some exceptions. This patch series
corrects those exceptions.
Brian Gesiak (15):
builtin/add.c: rearrange xcalloc arguments
xcalloc takes two arguments: the number of elements and their size.
diffstat_add passes the arguments in reverse order, passing the
size of a diffstat_file*, followed by the number of diffstat_file* to
be allocated. Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak
xcalloc takes two arguments: the number of elements and their size.
run_add_interactive passes the arguments in reverse order, passing the
size of a char*, followed by the number of char* to be allocated.
Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak
xcalloc takes two arguments: the number of elements and their size.
prellocate_hash passes the arguments in reverse order, passing the
size of a hash table entry, followed by the number of entries.
Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
xcalloc takes two arguments: the number of elements and their size.
init_pack_revindex passes the arguments in reverse order, passing the
size of a pack_revindex, followed by the number to allocate.
Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
xcalloc takes two arguments: the number of elements and their size.
builtin/remote.c includes several calls to xcalloc that pass the
arguments in reverse order. Rearrgange them so they are in the
correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
builtin/remote.c | 8
1
xcalloc takes two arguments: the number of elements and their size.
reflog-walk.c includes several calls to xcalloc that pass the arguments
in reverse order. Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
reflog-walk.c | 8
1 file
xcalloc takes two arguments: the number of elements and their size.
reduce_heads passes the arguments in reverse order, passing the
size of a commit*, followed by the number of commit* to be allocated.
Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak
xcalloc takes two arguments: the number of elements and their size.
grow_hash_table passes the arguments in reverse order, passing the
size of a hash table entry, followed by the number of entries.
Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
xcalloc takes two arguments: the number of elements and their size.
parse_refspec_internal passes the arguments in reverse order, passing the
size of a refspec, followed by the number to allocate. Rearrgange them
so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
xcalloc takes two arguments: the number of elements and their size.
notes.c includes several calls to xcalloc that pass the arguments in
reverse order. Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
notes.c | 6 +++---
1 file changed, 3
xcalloc takes two arguments: the number of elements and their size.
http-push passes the arguments in reverse order, passing the size
of a repo, followed by the number to allocate. Rearrgange them so
they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
http-push.c |
xcalloc takes two arguments: the number of elements and their size.
config.c includes several calls to xcalloc that pass the arguments
in reverse order: the size of a struct lock_file*, followed by the
number to allocate. Rearrgange them so they are in the correct order.
Signed-off-by: Brian
xcalloc takes two arguments: the number of elements and their size.
imap_open_store passes the arguments in reverse order, passing the
size of an imap_store*, followed by the number to allocate.
Rearrgange them so they are in the correct order.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
xcalloc takes two arguments: the number of elements and their size.
transport_helper_init passes the arguments in reverse order, passing the
size of a helper_data*, followed by the number to allocate. Rearrgange
them so they are in the correct order.
Signed-off-by: Brian Gesiak
Hi,
This is my first patch series for this year's GSoC. My project is
Git Config API improvements. The link of my proposal is appended below [1].
The aim of this patch series is to generate a cache for querying values from
the config files in a non callback manner as the current method reads and
Add an internal cache with the all variable value pairs read from the usual
config files(repo specific .git/config, user wide ~/.gitconfig and the global
/etc/gitconfig). Also, add two external functions `git_config_get_string` and
`git_config_get_string_multi` for querying in an non callback
Add explanations for `git_config_get_string_multi` and `git_config_get_string`
which utilize the config cache for querying in an non callback manner for a
specific variable.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
Documentation/technical/api-config.txt | 19 +++
1 file
Some of the tests in t/t7507-commit-verbose.sh were still using
git-config to set configuration. Change them to use the test_config
helper.
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
t/t7507-commit-verbose.sh was using a global test_set_editor call to
build its environment.
Rather than building global state with test_set_editor at the beginning
of the file, move test_set_editor calls into each test.
Besides being inline with current practices, it also allows the tests
which
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 6d778ed..3b06d73 100755
--- a/t/t7507-commit-verbose.sh
+++
This patch allows people to set commit.verbose to implicitly send
--verbose to git-commit. It also introduces --no-verbose to
override the configuration setting.
This version incorporates changes suggested by Eric Sunshine, Duy
Nguyen, and Jeremiah Mahler.
It introduces several cleanup patches
Use write_script from t/test-lib-functions instead of cat, shebang, and
chmod.
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index
Add a new configuration variable commit.verbose to implicitly pass
`--verbose` to `git-commit`. Add `--no-verbose` to commit to negate that
setting.
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
Documentation/config.txt | 5 +
Documentation/git-commit.txt
Hi,
Look below :
arup@linux-wzza:~/Rails/app git status
# On branch master
#
# Initial commit
#
# Untracked files:
# (use git add file... to include in what will be committed)
#
# .gitignore
# Gemfile
# Gemfile.lock
# README.rdoc
# Rakefile
# app/
#
On 2014-05-26 19.33, Tanay Abhra wrote:
I like the idea.
Please allow some minor comments (and read them as questions rather then
answers)
Add an internal cache with the all variable value pairs read from the usual
cache: The word cache is in Git often used for index
variable value can be
On di, 2014-05-27 at 00:33 +0630, Arup Rakshit wrote:
Now, you can see, I have staged all the files first using *git add
-A*, then _unstaging_ those I don't want to _stage_ right now. Now can
this be done, in the *staging* time ? I mean any way to tell `git add`
command, that add all the
On Monday, May 26, 2014 10:23:22 PM you wrote:
On di, 2014-05-27 at 00:33 +0630, Arup Rakshit wrote:
Now, you can see, I have staged all the files first using *git add
-A*, then _unstaging_ those I don't want to _stage_ right now. Now can
this be done, in the *staging* time ? I mean any way
j
On Mon, May 26, 2014 at 01:56:26PM -0500, Caleb Thompson wrote:
Add a new configuration variable commit.verbose to implicitly pass
...
+test_expect_success 'commit shows verbose diff with set commit.verbose=true'
'
+ echo morecontent file
+ git add file
+ test_config
The editors, `check-for-diff` and `check-for-no-diffs`, are grepping for the
output and lack thereof, respectively.
On Mon, May 26, 2014 at 01:33:04PM -0700, Jeremiah Mahler wrote:
j
On Mon, May 26, 2014 at 01:56:26PM -0500, Caleb Thompson wrote:
Add a new configuration variable
On Mon, May 26, 2014 at 03:39:55PM -0500, Caleb Thompson wrote:
The editors, `check-for-diff` and `check-for-no-diffs`, are grepping for
the output and lack thereof, respectively.
...
It appears that these tests still aren't checking to see if the
verbose output appears in the commit
If you don't want an specific file, but you neither the .gitignore,
just use .git/info/exclude file for project specific or
$HOME/.config/git/ignore for user level.
Anyway, this is all in man gitignore
[1] Git ignore man page: http://git-scm.com/docs/gitignore
Javier Domingo Cansino
2014-05-26
When `rebase--interactive` processes a task, it removes the item from
the todo list and appends it to another list of executed tasks. If a
`pick` (this includes `squash` and `fixup`) fails before the index has
recorded the changes, take the corresponding item and put it on the todo
list again.
`do_pick_commit` handles three situations if it is not fast-forwarding.
In order for `do_pick_commit` to identify the situation, it examines the
return value of the selected merge command.
1. return value 0 stands for a clean merge
2. 1 is passed in case of a failed merge due to conflict
3. any
On Tue, May 27, 2014 at 1:03 AM, Arup Rakshit
arupraks...@rocketmail.com wrote:
Now, you can see, I have staged all the files first using *git add -A*, then
_unstaging_ those I don't want to _stage_ right now. Now can this be done, in
the *staging* time ? I mean any way to tell `git add`
If a todo list will cherry-pick a commit that adds some file and the
working tree already contains a file with the same name, the rebase
sequence for that todo list will be interrupted and the cherry-picked
commit will be lost after the rebasing process is resumed.
This is fixed.
Add as a test
Caleb,
On Mon, May 26, 2014 at 01:56:26PM -0500, Caleb Thompson wrote:
Add a new configuration variable commit.verbose to implicitly pass
`--verbose` to `git-commit`. Add `--no-verbose` to commit to negate that
setting.
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
On Tue, May 27, 2014 at 5:06 AM, Javier Domingo Cansino
javier...@gmail.com wrote:
If you don't want an specific file, but you neither the .gitignore,
just use .git/info/exclude file for project specific or
$HOME/.config/git/ignore for user level.
This is actually better. 'git add' does not
Caleb,
On Mon, May 26, 2014 at 01:56:21PM -0500, Caleb Thompson wrote:
This patch allows people to set commit.verbose to implicitly send
--verbose to git-commit. It also introduces --no-verbose to
override the configuration setting.
This version incorporates changes suggested by Eric
Great, thanks Jeremiah!
I made that change, and will send up another patch version in the next day or so
while I wait on others who may have input.
I'm really appreciative of everyone's feedback!
Caleb
8--
diff --git
Brian,
On Tue, May 27, 2014 at 12:33:42AM +0900, Brian Gesiak wrote:
xcalloc takes two arguments: the number of elements and their size.
run_add_interactive passes the arguments in reverse order, passing the
size of a char*, followed by the number of char* to be allocated.
Rearrgange them so
Brian,
On Tue, May 27, 2014 at 12:33:41AM +0900, Brian Gesiak wrote:
xcalloc takes two arguments: the number of elements and their size.
The vast majority of the Git codebase passes these arguments in the
correct order, but there are some exceptions. This patch series
corrects those
Detect available Apache MPMs and use first available according to
following order of precedence:
mpm_event
mpm_prefork
mpm_worker
Add authz_core module if available to avoid HTTP Error 500 errors.
Signed-off-by: Jonathan McCrohan jmccro...@gmail.com
---
git-instaweb.sh | 12 +++-
1 file
My apologies! I based my work off of maint, branching off of eea591.
My reasoning was that Documentation/SubmittingPatches states that a
bugfix should be based on 'maint'. [1] Now that I think about it,
this is probably not the kind of bug that statement had in mind.
Should I reroll the patch
On Tue, May 27, 2014 at 11:22:00AM +0900, Brian Gesiak wrote:
My apologies! I based my work off of maint, branching off of eea591.
My reasoning was that Documentation/SubmittingPatches states that a
bugfix should be based on 'maint'. [1] Now that I think about it,
this is probably not the
On Mon, May 26, 2014 at 11:33 AM, Brian Gesiak modoca...@gmail.com wrote:
xcalloc takes two arguments: the number of elements and their size.
run_add_interactive passes the arguments in reverse order, passing the
size of a char*, followed by the number of char* to be allocated.
Rearrgange them
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
On Tuesday, May 27, 2014 12:06:34 AM you wrote:
If you don't want an specific file, but you neither the .gitignore,
just use .git/info/exclude file for project specific or
$HOME/.config/git/ignore for user level.
Anyway, this is all in man gitignore
[1] Git ignore man page:
Am 5/26/2014 20:56, schrieb Caleb Thompson:
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 6d778ed..3b06d73 100755
---
52 matches
Mail list logo
