delta/git.git/wt-status.c, branch sb/submodule-diff-header-fix

Merge branch 'ks/commit-do-not-touch-cut-line'

2017-09-25T06:24:07+00:00

The explanation of the cut-line in the commit log editor has been
slightly tweaked.

* ks/commit-do-not-touch-cut-line:
  commit-template: change a message to be more intuitive

commit-template: change a message to be more intuitive

2017-09-15T03:34:33+00:00

It's not good to use the phrase 'do not touch' to convey the
information that the cut-line should not be modified or removed as
it could possibly be mis-interpreted by a person who doesn't know
that the word 'touch' has the meaning of 'tamper with'. Further, it
could make translations a little difficult as it might not have the
intended meaning in a few languages when translated as such.

So, use more intuitive terms in the sentence.

Signed-off-by: Kaartic Sivaraam 
Helped-by: Jeff King 
Signed-off-by: Junio C Hamano

wt-status: release strbuf after use in wt_longstatus_print_tracking()

2017-09-10T07:38:57+00:00

If format_tracking_info() returns 0, then it didn't touch its strbuf
parameter, so it's OK to exit early in that case.  Clean up sb in the
other case.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

wt-status: release strbuf after use in read_rebase_todolist()

2017-09-06T23:49:29+00:00

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Merge branch 'rs/wt-status-cleanup'

2017-07-12T22:18:23+00:00

Code cleanup.

* rs/wt-status-cleanup:
  wt-status: use separate variable for result of shorten_unambiguous_ref

wt-status: use separate variable for result of shorten_unambiguous_ref

2017-07-10T16:16:37+00:00

Store the pointer to the string allocated by shorten_unambiguous_ref in
a dedicated variable, short_base, and keep base unchanged.  A non-const
variable is more appropriate for such an object.  It avoids having to
cast const away on free and stops redefining the meaning of base, making
the code slightly clearer.

Signed-off-by: Rene Scharfe 
Reviewed-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Merge branch 'ks/status-initial-commit'

2017-06-30T20:45:22+00:00

"git status" has long shown essentially the same message as "git
commit"; the message it gives while preparing for the root commit,
i.e. "Initial commit", was hard to understand for some new users.
Now it says "No commits yet" to stress more on the current status
(rather than the commit the user is preparing for, which is more in
line with the focus of "git commit").

* ks/status-initial-commit:
  status: contextually notify user about an initial commit

status: contextually notify user about an initial commit

2017-06-22T02:10:27+00:00

The existing message, "Initial commit", makes sense for the commit template
notifying users that it's their initial commit, but is confusing when
merely checking the status of a fresh repository (or orphan branch)
without having any commits yet.

Change the output of "status" to say "No commits yet" when "git
status" is run on a fresh repo (or orphan branch), while retaining the
current "Initial commit" message displayed in the template that's
displayed in the editor when the initial commit is being authored.

Correspondingly change the output of "short status" to "No commits yet
on " when "git status -sb" is run on a fresh repo (or orphan branch).

A few alternatives considered were,

 * Waiting for initial commit
 * Your current branch does not have any commits
 * Current branch waiting for initial commit

The most succint one among the alternatives was chosen.

[with help on tests from Ævar]

Helped-by: Junio C Hamano 
Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Kaartic Sivaraam 
Signed-off-by: Junio C Hamano

status: add optional stash count information

2017-06-19T05:17:47+00:00

Introduce '--show-stash' and its configuration option 'status.showStash'
to allow git-status to show information about currently stashed entries.

Signed-off-by: Liam Beguin 
Signed-off-by: Junio C Hamano

Merge branch 'nd/fopen-errors'

2017-06-13T20:47:09+00:00

We often try to open a file for reading whose existence is
optional, and silently ignore errors from open/fopen; report such
errors if they are not due to missing files.

* nd/fopen-errors:
  mingw_fopen: report ENOENT for invalid file names
  mingw: verify that paths are not mistaken for remote nicknames
  log: fix memory leak in open_next_file()
  rerere.c: move error_errno() closer to the source system call
  print errno when reporting a system call error
  wrapper.c: make warn_on_inaccessible() static
  wrapper.c: add and use fopen_or_warn()
  wrapper.c: add and use warn_on_fopen_errors()
  config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, too
  config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSD
  clone: use xfopen() instead of fopen()
  use xfopen() in more places
  git_fopen: fix a sparse 'not declared' warning