delta/git.git, branch rj/add-chmod-error-message

builtin/add: add detail to a 'cannot chmod' error message

2017-08-09T17:14:45+00:00

In addition to adding the missing newline, add the x-ecutable bit
'mode change' character to the error message. This message now has
the same form as similar messages output by 'update-index'.

Signed-off-by: Ramsay Jones 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

add: modify already added files when --chmod is given

2016-09-15T19:13:54+00:00

When the chmod option was added to git add, it was hooked up to the diff
machinery, meaning that it only works when the version in the index
differs from the version on disk.

As the option was supposed to mirror the chmod option in update-index,
which always changes the mode in the index, regardless of the status of
the file, make sure the option behaves the same way in git add.

Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

read-cache: introduce chmod_index_entry

2016-09-15T19:13:54+00:00

As there are chmod options for both add and update-index, introduce a
new chmod_index_entry function to do the work.  Use it in update-index,
while it will be used in add in the next patch.

Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

update-index: add test for chmod flags

2016-09-14T22:03:49+00:00

Currently there is no test checking the expected behaviour when multiple
chmod flags with different arguments are passed.  As argument handling
is not in line with other git commands it's easy to miss and
accidentally change the current behaviour.

While there, fix the argument type of chmod_path, which takes an int,
but had a char passed in.

Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix

2016-09-14T22:02:25+00:00

Newly added tests to this topic uses helper functions that did not
exist back when the bug being fixed by the topic was introduced.

* ib/t3700-add-chmod-x-updates:
  t3700: add a test_mode_in_index helper function
  t3700: merge two tests into one
  t3700: remove unwanted leftover files before running new tests

add: document the chmod option

2016-09-12T22:03:32+00:00

The git add --chmod option was introduced in 4e55ed3 ("add: add
--chmod=+x / --chmod=-x options", 2016-05-31), but was never
documented.  Document the feature.

Signed-off-by: Thomas Gummerer 
Signed-off-by: Junio C Hamano

t3700: add a test_mode_in_index helper function

2016-08-01T21:25:30+00:00

The case statement to check the file mode of a staged file appears
a number of times.

Simplify the test by utilizing a test_mode_in_index helper function.

Signed-off-by: Ingo BrÃ¼ckl 
Signed-off-by: Junio C Hamano

t3700: merge two tests into one

2016-08-01T21:20:53+00:00

Depending on the underlying platform a chmod may be a noop. Although it
wouldn't harm the result of the '--chmod=-x' test, there is a more
robust way to make sure the --chmod option works both ways.

Merge the two separate tests for the --chmod option into one, checking
both permissions on the same file.

Signed-off-by: Ingo BrÃ¼ckl 
Signed-off-by: Junio C Hamano

t3700: remove unwanted leftover files before running new tests

2016-08-01T21:20:51+00:00

When an earlier test that has prerequisite is skipped, files
used by later tests may be left in the working tree in an
unexpected state.  For example, a test runs this sequence:

        echo foo >xfoo1 && chmod 755 xfoo1

to create an executable file xfoo1, expecting that xfoo1
does not exist before it runs in the test sequence.
However, the absence of this file depends on "git reset
--hard" done in an earlier test, that is skipped when SANITY
prerequisite is not met, and worse yet, xfoo1 originally is
created as a symbolic link, which means the chmod does not
affect the modes of xfoo1 as this test expects.

Fix this by starting the test with "rm -f xfoo1" to make
sure the file is created from scratch, and do the same to
other similar tests.

Signed-off-by: Ingo BrÃ¼ckl 
Signed-off-by: Junio C Hamano

add: add --chmod=+x / --chmod=-x options

2016-06-08T00:43:39+00:00

The executable bit will not be detected (and therefore will not be
set) for paths in a repository with `core.filemode` set to false,
though the users may still wish to add files as executable for
compatibility with other users who _do_ have `core.filemode`
functionality.  For example, Windows users adding shell scripts may
wish to add them as executable for compatibility with users on
non-Windows.

Although this can be done with a plumbing command
(`git update-index --add --chmod=+x foo`), teaching the `git-add`
command allows users to set a file executable with a command that
they're already familiar with.

Signed-off-by: Edward Thomson 
Helped-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano